diff --git a/Content.Shared/StepTrigger/Systems/StepTriggerImmuneSystem.cs b/Content.Shared/StepTrigger/Systems/StepTriggerImmuneSystem.cs index ca72a20ae9cd..7cdb01db71d9 100644 --- a/Content.Shared/StepTrigger/Systems/StepTriggerImmuneSystem.cs +++ b/Content.Shared/StepTrigger/Systems/StepTriggerImmuneSystem.cs @@ -12,19 +12,20 @@ public sealed class StepTriggerImmuneSystem : EntitySystem /// public override void Initialize() { - SubscribeLocalEvent(OnStepTriggerAttempt); + // SubscribeLocalEvent(OnStepTriggerAttempt); 220 borg shard fix SubscribeLocalEvent(OnStepTriggerClothingAttempt); SubscribeLocalEvent(OnExamined); } - - private void OnStepTriggerAttempt(Entity ent, ref StepTriggerAttemptEvent args) - { - args.Cancelled = true; - } - + // start 220 borg shard fix + // private void OnStepTriggerAttempt(Entity ent, ref StepTriggerAttemptEvent args) + // { + // args.Cancelled = true; + // } + // end 220 borg shard fix private void OnStepTriggerClothingAttempt(EntityUid uid, ClothingRequiredStepTriggerComponent component, ref StepTriggerAttemptEvent args) { - if (_inventory.TryGetInventoryEntity(args.Tripper, out _)) + if (_inventory.TryGetInventoryEntity(args.Tripper, out _) + || TryComp(args.Tripper, out _)) // 220 borg shard fix { args.Cancelled = true; }