Allow Pacifists to Use Bola (#37188)

diff --git a/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs b/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs
index a8aca9dca01390bac97e143da83a485f1e1c8caa..a4c736838abf6b7cd42c1e7a5e294fc10d2c3baa 100644 (file)
--- a/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs
+++ b/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs
@@ -52,7 +52,6 @@ public abstract class SharedEnsnareableSystem : EntitySystem
         SubscribeLocalEvent<EnsnaringComponent, StepTriggerAttemptEvent>(AttemptStepTrigger);
         SubscribeLocalEvent<EnsnaringComponent, StepTriggeredOffEvent>(OnStepTrigger);
         SubscribeLocalEvent<EnsnaringComponent, ThrowDoHitEvent>(OnThrowHit);
-        SubscribeLocalEvent<EnsnaringComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
     }
 
     protected virtual void OnEnsnareInit(Entity<EnsnareableComponent> ent, ref ComponentInit args)
@@ -187,11 +186,6 @@ public abstract class SharedEnsnareableSystem : EntitySystem
         }
     }
 
-    private void OnAttemptPacifiedThrow(Entity<EnsnaringComponent> ent, ref AttemptPacifiedThrowEvent args)
-    {
-        args.Cancel("pacified-cannot-throw-snare");
-    }
-
     private void OnRemoveEnsnareAlert(Entity<EnsnareableComponent> 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 e0a0e9d1c3d0b71085a1008ac0f3a017e3b8a85c..8e51a5ecb0c71e82f072bc355c91ec8764248332 100644 (file)
--- 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!