diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs index 5181ad9149..33f38688ed 100644 --- a/Content.Client/Inventory/StrippableBoundUserInterface.cs +++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs @@ -19,7 +19,6 @@ using JetBrains.Annotations; 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; @@ -32,7 +31,6 @@ 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; @@ -200,7 +198,7 @@ namespace Content.Client.Inventory var entity = container.ContainedEntity; // If this is a full pocket, obscure the real entity - if (entity != null && slotDef.StripHidden && !(EntMan.TryGetComponent(_playerManager.LocalEntity, out var thiefcomponent) && thiefcomponent.IgnoreStripHidden)) + if (entity != null && slotDef.StripHidden) 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 index b387eeab66..a851dd5ef6 100644 --- a/Content.Shared/Strip/Components/ThievingComponent.cs +++ b/Content.Shared/Strip/Components/ThievingComponent.cs @@ -19,16 +19,4 @@ public sealed partial class ThievingComponent : Component [ViewVariables(VVAccess.ReadWrite)] [DataField("stealthy")] public bool Stealthy; - - /// - /// Should the user be able to see hidden items? (i.e pockets) - /// - [DataField] - public bool IgnoreStripHidden; //DeltaV - - /// - /// A multiplier coefficient for strip time - /// - [DataField] - public float StripTimeMultiplier = 1f; //DeltaV } diff --git a/Content.Shared/Strip/ThievingSystem.cs b/Content.Shared/Strip/ThievingSystem.cs index d397f037e4..2b3d3b38a0 100644 --- a/Content.Shared/Strip/ThievingSystem.cs +++ b/Content.Shared/Strip/ThievingSystem.cs @@ -19,6 +19,5 @@ public sealed class ThievingSystem : EntitySystem { 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 index a5731f7905..5cf521264c 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -83,9 +83,8 @@ range: 500 - type: StationLimitedNetwork - type: Thieving - stripTimeMultiplier: 0 + stripTimeReduction: 9999 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 index 94e1111412..d9b25c5dd1 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml @@ -64,11 +64,6 @@ Unsexed: MaleFelinid - type: Felinid - type: NoShoesSilentFootsteps - - type: Thieving - ignoreStripHidden: true - stealthy: false - stripTimeReduction: 0 - stripTimeMultiplier: 0.667 - type: entity save: false