From 15968acdf6ce71aaca0b8e26aa0cab0ef98d4a7a Mon Sep 17 00:00:00 2001 From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Date: Sun, 14 Dec 2025 01:42:54 +0100 Subject: [PATCH] Don't remove borg access without power (#41844) * init * comment --- .../Silicons/Borgs/Components/BorgChassisComponent.cs | 1 - Content.Shared/Silicons/Borgs/SharedBorgSystem.API.cs | 2 -- Content.Shared/Silicons/Borgs/SharedBorgSystem.cs | 3 +++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs b/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs index a6c63bc602..d7b90a1ac2 100644 --- a/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs +++ b/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs @@ -21,7 +21,6 @@ public sealed partial class BorgChassisComponent : Component /// /// Is this borg currently activated? /// If activated the borg - /// - has door access, /// - can use modules and /// - has full movement speed. /// To be activated the borg diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.API.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.API.cs index 3f86abb568..842fcedf70 100644 --- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.API.cs +++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.API.cs @@ -50,7 +50,6 @@ public abstract partial class SharedBorgSystem /// /// Activates or deactivates a borg. /// If active the borg - /// - has door access, /// - can use modules and /// - has full movement speed. /// @@ -67,7 +66,6 @@ public abstract partial class SharedBorgSystem else DisableAllModules(chassis.AsNullable()); - _access.SetAccessEnabled(chassis.Owner, active); // Needs a player so that scientists can't drag around an empty borg for free AA. _powerCell.SetDrawEnabled(chassis.Owner, active); _movementSpeedModifier.RefreshMovementSpeedModifiers(chassis); diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs index 71818ca211..9c28f5eb04 100644 --- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs +++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs @@ -199,6 +199,7 @@ public abstract partial class SharedBorgSystem : EntitySystem TryActivate(chassis); + _access.SetAccessEnabled(chassis.Owner, true); // Needs a player so that scientists can't drag around an empty borg for free AA. _appearance.SetData(chassis.Owner, BorgVisuals.HasPlayer, true); } @@ -211,6 +212,8 @@ public abstract partial class SharedBorgSystem : EntitySystem // Turn off the light so that the no-player visuals can be seen. if (TryComp(chassis.Owner, out var light)) _handheldLight.TurnOff((chassis.Owner, light), makeNoise: false); // Already plays a sound when toggling the borg off. + + _access.SetAccessEnabled(chassis.Owner, false); // Needs a player so that scientists can't drag around an empty borg for free AA. _appearance.SetData(chassis.Owner, BorgVisuals.HasPlayer, false); } -- 2.52.0