Merge branch 'master' of https://github.com/space-wizards/space-stati…

…on-14 into dev
impstation · Oct 3, 2024 · 0198ca9 · 0198ca9
2 parents 748077a + 1c41d33
commit 0198ca9
Show file tree

Hide file tree

Showing 12 changed files with 70 additions and 72 deletions.
diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -98,7 +98,7 @@ public void UpdateMenu()
                 }
             }
 
-            if (EntMan.TryGetComponent<HandsComponent>(Owner, out var handsComp))
+            if (EntMan.TryGetComponent<HandsComponent>(Owner, out var handsComp) && handsComp.CanBeStripped)
             {
                 // good ol hands shit code. there is a GuiHands comparer that does the same thing... but these are hands
                 // and not gui hands... which are different...

diff --git a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
@@ -398,10 +398,6 @@ private void OnActionsUpdated()
     {
         QueueWindowUpdate();
 
-        // TODO ACTIONS allow buttons to persist across state applications
-        // Then we don't have to interrupt drags any time the buttons get rebuilt.
-        _menuDragHelper.EndDrag();
-
         if (_actionsSystem != null)
             _container?.SetActionData(_actionsSystem, _actions.ToArray());
     }

diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs
@@ -28,14 +28,26 @@ public ActionButton this[int index]
         get => (ActionButton) GetChild(index);
     }
 
-    private void BuildActionButtons(int count)
+    public void SetActionData(ActionsSystem system, params EntityUid?[] actionTypes)
     {
+        var uniqueCount = Math.Min(system.GetClientActions().Count(), actionTypes.Length + 1);
         var keys = ContentKeyFunctions.GetHotbarBoundKeys();
 
-        Children.Clear();
-        for (var index = 0; index < count; index++)
+        for (var i = 0; i < uniqueCount; i++)
+        {
+            if (i >= ChildCount)
+            {
+                AddChild(MakeButton(i));
+            }
+
+            if (!actionTypes.TryGetValue(i, out var action))
+                action = null;
+            ((ActionButton) GetChild(i)).UpdateData(action, system);
+        }
+
+        for (var i = ChildCount - 1; i >= uniqueCount; i--)
         {
-            Children.Add(MakeButton(index));
+            RemoveChild(GetChild(i));
         }
 
         ActionButton MakeButton(int index)
@@ -55,20 +67,6 @@ ActionButton MakeButton(int index)
         }
     }
 
-    public void SetActionData(ActionsSystem system, params EntityUid?[] actionTypes)
-    {
-        var uniqueCount = Math.Min(system.GetClientActions().Count(), actionTypes.Length + 1);
-        if (ChildCount != uniqueCount)
-            BuildActionButtons(uniqueCount);
-
-        for (var i = 0; i < uniqueCount; i++)
-        {
-            if (!actionTypes.TryGetValue(i, out var action))
-                action = null;
-            ((ActionButton) GetChild(i)).UpdateData(action, system);
-        }
-    }
-
     public void ClearActionData()
     {
         foreach (var button in Children)

diff --git a/Content.Shared/Hands/Components/HandsComponent.cs b/Content.Shared/Hands/Components/HandsComponent.cs
@@ -80,6 +80,12 @@ public sealed partial class HandsComponent : Component
 
     [DataField]
     public DisplacementData? HandDisplacement;
+
+    /// <summary>
+    /// If false, hands cannot be stripped, and they do not show up in the stripping menu.
+    /// </summary>
+    [DataField]
+    public bool CanBeStripped = true;
 }
 
 [Serializable, NetSerializable]

diff --git a/Content.Shared/Strip/SharedStrippableSystem.cs b/Content.Shared/Strip/SharedStrippableSystem.cs
@@ -118,6 +118,9 @@ private void StripHand(
             !Resolve(target, ref targetStrippable))
             return;
 
+        if (!target.Comp.CanBeStripped)
+            return;
+
         if (!_handsSystem.TryGetHand(target.Owner, handId, out var handSlot))
             return;
 
@@ -349,6 +352,9 @@ private bool CanStripInsertHand(
             !Resolve(target, ref target.Comp))
             return false;
 
+        if (!target.Comp.CanBeStripped)
+            return false;
+
         if (user.Comp.ActiveHand == null)
             return false;
 
@@ -449,6 +455,9 @@ private bool CanStripRemoveHand(
         if (!Resolve(target, ref target.Comp))
             return false;
 
+        if (!target.Comp.CanBeStripped)
+            return false;
+
         if (!_handsSystem.TryGetHand(target, handName, out var handSlot, target.Comp))
         {
             _popupSystem.PopupCursor(Loc.GetString("strippable-component-item-slot-free-message", ("owner", Identity.Name(target, EntityManager, user))));

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -1,42 +1,4 @@
 Entries:
-- author: Timur2011
-  changes:
-  - message: Space adders are now butcherable.
-    type: Add
-  - message: Snakes now drop snake meat when butchered.
-    type: Fix
-  - message: Snakes now appear lying when in critical state.
-    type: Tweak
-  id: 6980
-  time: '2024-07-25T10:52:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29629
-- author: Plykiya
-  changes:
-  - message: You can now build atmos gas pipes through things like walls.
-    type: Tweak
-  id: 6981
-  time: '2024-07-25T23:26:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28707
-- author: Ilya246
-  changes:
-  - message: Nuclear operative reinforcements now come with full nuclear operative
-      gear (and a toy carp) at no additional cost.
-    type: Tweak
-  - message: Nuclear operative reinforcements now get nuclear operative names.
-    type: Tweak
-  id: 6982
-  time: '2024-07-25T23:37:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30173
-- author: Cojoke-dot
-  changes:
-  - message: Engineering goggles and other similar-looking eyewear now help block
-      identity.
-    type: Tweak
-  - message: Radiation suit's hood now blocks identity.
-    type: Fix
-  id: 6983
-  time: '2024-07-26T05:26:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30305
 - author: Moomoobeef
   changes:
   - message: Some radio channel colors have been tweaked in order to be more easily
@@ -3945,3 +3907,33 @@
   id: 7479
   time: '2024-10-02T13:52:14.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/32561
+- author: PJB3005
+  changes:
+  - message: Fixed borg "hands" showing up in their stripping menu.
+    type: Fix
+  id: 7480
+  time: '2024-10-03T00:11:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32606
+- author: ArtisticRoomba
+  changes:
+  - message: X-ray cannons and stinger grenades are now security restricted. HoS's
+      armored trench coat and its variants are security and command restricted.
+    type: Fix
+  id: 7481
+  time: '2024-10-03T10:01:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32614
+- author: Myra
+  changes:
+  - message: Medibots and Janibots can no longer become sentient via the sentience
+      event.
+    type: Remove
+  id: 7482
+  time: '2024-10-03T10:32:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32383
+- author: eoineoineoin
+  changes:
+  - message: Action bar can be reconfigured again
+    type: Fix
+  id: 7483
+  time: '2024-10-03T14:01:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32552
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -90,7 +90,7 @@
     damageCoefficient: 0.9
 
 - type: entity
-  parent: [ClothingOuterArmorHoS, ClothingOuterStorageBase]
+  parent: [ClothingOuterArmorHoS, ClothingOuterStorageBase, BaseSecurityCommandContraband]
   id: ClothingOuterCoatHoSTrench
   name: head of security's armored trenchcoat
   description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence.
@@ -376,7 +376,7 @@
     sprite: Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [ClothingOuterStorageBase, BaseSyndicateContraband]
   id: ClothingOuterCoatSyndieCap
   name: syndicate's coat
   description: The syndicate's coat is made of durable fabric, with gilded patterns.
@@ -387,7 +387,7 @@
     sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi
 
 - type: entity
-  parent: ClothingOuterCoatHoSTrench
+  parent: [BaseSyndicateContraband, ClothingOuterCoatHoSTrench] # BaseSyndicateContraband as first parent so contraband system takes that as priority, yeah I know
   id: ClothingOuterCoatSyndieCapArmored
   name: syndicate's armored coat
   description: The syndicate's armored coat is made of durable fabric, with gilded patterns.

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -382,7 +382,7 @@
 
 ##########################################################
 - type: entity
-  parent: [ClothingOuterArmorHoS, ClothingOuterWinterCoatToggleable, BaseCommandContraband]
+  parent: [ClothingOuterArmorHoS, ClothingOuterWinterCoatToggleable, BaseSecurityCommandContraband]
   id: ClothingOuterWinterHoS
   name: head of security's armored winter coat
   description: A sturdy, utilitarian winter coat designed to protect a head of security from any brig-bound threats and hypothermic events.
@@ -396,7 +396,7 @@
 ##########################################################
 
 - type: entity
-  parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband]
+  parent: [ClothingOuterWinterCoatToggleable, BaseSecurityCommandContraband]
   id: ClothingOuterWinterHoSUnarmored
   name: head of security's winter coat
   description: A sturdy coat, a warm coat, but not an armored coat.

diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -85,6 +85,7 @@
   - type: Hands
     showInHands: false
     disableExplosionRecursion: true
+    canBeStripped: false
   - type: ComplexInteraction
   - type: IntrinsicRadioReceiver
   - type: IntrinsicRadioTransmitter

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -261,8 +261,6 @@
   - type: Construction
     graph: CleanBot
     node: bot
-  - type: SentienceTarget
-    flavorKind: station-event-random-sentience-flavor-mechanical
   - type: Absorbent
     pickupAmount: 10
   - type: UseDelay
@@ -334,8 +332,6 @@
   - type: Construction
     graph: MediBot
     node: bot
-  - type: SentienceTarget
-    flavorKind: station-event-random-sentience-flavor-mechanical
   - type: Anchorable
   - type: InteractionPopup
     interactSuccessString: petting-success-medibot

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -380,7 +380,7 @@
 
 - type: entity
   name: x-ray cannon
-  parent: [BaseWeaponBattery, BaseGunWieldable]
+  parent: [BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband]
   id: WeaponXrayCannon
   description: An experimental weapon that uses concentrated x-ray energy against its target.
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml
@@ -116,7 +116,7 @@
       cluster-payload: !type:Container
 
 - type: entity
-  parent: [GrenadeBase, BaseSyndicateContraband]
+  parent: [GrenadeBase, BaseSecurityContraband]
   id: GrenadeStinger
   name: stinger grenade
   description: Nothing to see here, please disperse.