From 308b68627694741f6a9728996e468248ea51ee23 Mon Sep 17 00:00:00 2001 From: iertis Date: Mon, 25 Nov 2024 14:30:25 +0300 Subject: [PATCH] =?UTF-8?q?=D0=91=D0=BE=D1=80=D0=B3=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Server/_Sunrise/Execution/ExecutionSystem.cs | 5 +++++ .../Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Content.Server/_Sunrise/Execution/ExecutionSystem.cs b/Content.Server/_Sunrise/Execution/ExecutionSystem.cs index 7dcc56a2a3f..5966c0d2ad1 100644 --- a/Content.Server/_Sunrise/Execution/ExecutionSystem.cs +++ b/Content.Server/_Sunrise/Execution/ExecutionSystem.cs @@ -23,6 +23,7 @@ using Robust.Shared.Player; using Robust.Shared.Prototypes; using Robust.Shared.Containers; +using Content.Shared.Silicons.Borgs.Components; namespace Content.Server._Sunrise.Execution; @@ -131,6 +132,10 @@ private bool CanExecuteWithAny(EntityUid weapon, EntityUid victim, EntityUid att if (!TryComp(victim, out var mobState)) return false; + // You can't execute borgs + if (TryComp(victim, out var borgChassis)) + return false; + // You're not allowed to execute dead people (no fun allowed) if (_mobStateSystem.IsDead(victim, mobState)) return false; diff --git a/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml index f596e024f81..e0ca4553c4c 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml @@ -3094,7 +3094,7 @@ - type: listing id: UplinkSunrisePlayerBorgGeneric name: uplink-sunrise-player-borg-generic-name - productEntity: BorgChassisGeneric + productEntity: PlayerBorgBattery cost: Suntick: 100 categories: