Don't remove borg access without power (#41844)

* init

* comment

diff --git a/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs b/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs
index a6c63bc602827b916fbe85253810d0e514dd63ed..d7b90a1ac2cc05c7df0c198a58cdb6c7117eb91e 100644 (file)
--- 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
     /// <summary>
     /// 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 3f86abb5682a7a4f49309ee7e48784386e59e0aa..842fcedf70c772541a3772735c7f50cf17eb0e4c 100644 (file)
--- 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
     /// <summary>
     /// Activates or deactivates a borg.
     /// If active the borg
-    /// - has door access,
     /// - can use modules and
     /// - has full movement speed.
     /// </summary>
@@ -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 71818ca211d7300bda5925ea62e72b564abd1a1c..9c28f5eb0437f15c7d9dfcb0a08b3e5e95e8ec10 100644 (file)
--- 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<HandheldLightComponent>(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);
     }