Revert "Felinid Thievery" (#1177)

Revert "Felinid Thievery (#1102)"

This reverts commit 9b763f3758.
This commit is contained in:
Null 2024-05-09 14:59:48 +02:00 committed by GitHub
parent ff13c3b81b
commit b14097d0b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 2 additions and 23 deletions

View File

@ -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<ThievingComponent>(_playerManager.LocalEntity, out var thiefcomponent) && thiefcomponent.IgnoreStripHidden))
if (entity != null && slotDef.StripHidden)
entity = _virtualHiddenEntity;
var button = new SlotButton(new SlotData(slotDef, container));

View File

@ -19,16 +19,4 @@ 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
}

View File

@ -19,6 +19,5 @@ public sealed class ThievingSystem : EntitySystem
{
args.Stealth |= component.Stealthy;
args.Additive -= component.StripTimeReduction;
args.Multiplier *= component.StripTimeMultiplier;
}
}

View File

@ -83,9 +83,8 @@
range: 500
- type: StationLimitedNetwork
- type: Thieving
stripTimeMultiplier: 0
stripTimeReduction: 9999
stealthy: true
ignoreStripHidden: true
- type: Stripping
- type: SolutionScanner
- type: IgnoreUIRange

View File

@ -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