Revert "Revert "Felinid Thievery" (#1177)"

This reverts commit b14097d.
DeltaV-Station · May 10, 2024 · fd0e5e0 · fd0e5e0
1 parent ac2f119
commit fd0e5e0
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 2 deletions.
diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -19,6 +19,7 @@
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
+using Robust.Client.Player;
 using Robust.Shared.Input;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
@@ -31,6 +32,7 @@ namespace Content.Client.Inventory
     public sealed class StrippableBoundUserInterface : BoundUserInterface
     {
         [Dependency] private readonly IUserInterfaceManager _ui = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
         private readonly ExamineSystem _examine;
         private readonly InventorySystem _inv;
         private readonly SharedCuffableSystem _cuffable;
@@ -198,7 +200,7 @@ private void AddInventoryButton(EntityUid invUid, string slotId, InventoryCompon
             var entity = container.ContainedEntity;
 
             // If this is a full pocket, obscure the real entity
-            if (entity != null && slotDef.StripHidden)
+            if (entity != null && slotDef.StripHidden && !(EntMan.TryGetComponent<ThievingComponent>(_playerManager.LocalEntity, out var thiefcomponent) && thiefcomponent.IgnoreStripHidden))
                 entity = _virtualHiddenEntity;
 
             var button = new SlotButton(new SlotData(slotDef, container));

diff --git a/Content.Shared/Strip/Components/ThievingComponent.cs b/Content.Shared/Strip/Components/ThievingComponent.cs
@@ -19,4 +19,16 @@ public sealed partial class ThievingComponent : Component
     [ViewVariables(VVAccess.ReadWrite)]
     [DataField("stealthy")]
     public bool Stealthy;
+
+    /// <summary>
+    ///  Should the user be able to see hidden items? (i.e pockets)
+    /// </summary>
+    [DataField]
+    public bool IgnoreStripHidden; //DeltaV
+
+    /// <summary>
+    ///  A multiplier coefficient for strip time
+    /// </summary>
+    [DataField]
+    public float StripTimeMultiplier = 1f; //DeltaV
 }
diff --git a/Content.Shared/Strip/ThievingSystem.cs b/Content.Shared/Strip/ThievingSystem.cs
@@ -19,5 +19,6 @@ private void OnBeforeStrip(EntityUid uid, ThievingComponent component, BeforeStr
     {
         args.Stealth |= component.Stealthy;
         args.Additive -= component.StripTimeReduction;
+        args.Multiplier *= component.StripTimeMultiplier;
     }
 }
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -83,8 +83,9 @@
     range: 500
   - type: StationLimitedNetwork
   - type: Thieving
-    stripTimeReduction: 9999
+    stripTimeMultiplier: 0
     stealthy: true
+    ignoreStripHidden: true
   - type: Stripping
   - type: SolutionScanner
   - type: IgnoreUIRange

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
@@ -64,6 +64,11 @@
       Unsexed: MaleFelinid
   - type: Felinid
   - type: NoShoesSilentFootsteps
+  - type: Thieving
+    ignoreStripHidden: true
+    stealthy: false
+    stripTimeReduction: 0
+    stripTimeMultiplier: 0.667
 
 - type: entity
   save: false