diff --git a/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs b/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs index a8aca9dca0..a4c736838a 100644 --- a/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs +++ b/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs @@ -52,7 +52,6 @@ public abstract class SharedEnsnareableSystem : EntitySystem SubscribeLocalEvent(AttemptStepTrigger); SubscribeLocalEvent(OnStepTrigger); SubscribeLocalEvent(OnThrowHit); - SubscribeLocalEvent(OnAttemptPacifiedThrow); } protected virtual void OnEnsnareInit(Entity ent, ref ComponentInit args) @@ -187,11 +186,6 @@ public abstract class SharedEnsnareableSystem : EntitySystem } } - private void OnAttemptPacifiedThrow(Entity ent, ref AttemptPacifiedThrowEvent args) - { - args.Cancel("pacified-cannot-throw-snare"); - } - private void OnRemoveEnsnareAlert(Entity ent, ref RemoveEnsnareAlertEvent args) { if (args.Handled) diff --git a/Resources/Locale/en-US/pacified/pacified.ftl b/Resources/Locale/en-US/pacified/pacified.ftl index e0a0e9d1c3..8e51a5ecb0 100644 --- a/Resources/Locale/en-US/pacified/pacified.ftl +++ b/Resources/Locale/en-US/pacified/pacified.ftl @@ -7,8 +7,6 @@ pacified-cannot-throw = I can't bring myself to throw { THE($projectile) }, that pacified-cannot-throw-embed = No way I could throw { THE($projectile) }, that could get lodged inside someone! # With liquid-spilling projectiles: pacified-cannot-throw-spill = I can't possibly throw { THE($projectile) }, that could spill nasty stuff on someone! -# With bolas and snares: -pacified-cannot-throw-snare = I can't throw { THE($projectile) }, what if someone trips?! pacified-cannot-harm-directly = I can't bring myself to hurt { THE($entity) }! pacified-cannot-harm-indirect = I can't damage { THE($entity) }, it could hurt someone!