Pacification Prevents Throwing Weapons

Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs

@@ -1,4 +1,5 @@
 using Content.Shared.Camera;
+using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Events;
@@ -30,13 +31,13 @@ public override void Initialize()
         {
             base.Initialize();
 
-            SubscribeLocalEvent<StaminaComponent, BeforeThrowEvent>(OnBeforeThrow);
+            SubscribeLocalEvent<StaminaComponent, BeforeThrowEvent>(OnBeforeThrow, after: [typeof(PacificationSystem)]);
             SubscribeLocalEvent<DamageOtherOnHitComponent, DamageExamineEvent>(OnDamageExamine);
         }
 
         private void OnBeforeThrow(EntityUid uid, StaminaComponent component, ref BeforeThrowEvent args)
         {
-            if (!TryComp<DamageOtherOnHitComponent>(args.ItemUid, out var damage))
+            if (args.Cancelled || !TryComp<DamageOtherOnHitComponent>(args.ItemUid, out var damage))
                 return;
 
             if (component.CritThreshold - component.StaminaDamage <= damage.StaminaCost)

Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs

@@ -1,5 +1,6 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.Camera;
+using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Contests;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
@@ -39,6 +40,7 @@ public override void Initialize()
             SubscribeLocalEvent<DamageOtherOnHitComponent, MapInitEvent>(OnMapInit);
             SubscribeLocalEvent<DamageOtherOnHitComponent, ThrowDoHitEvent>(OnDoHit);
             SubscribeLocalEvent<DamageOtherOnHitComponent, ThrownEvent>(OnThrown);
+            SubscribeLocalEvent<DamageOtherOnHitComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
 
             SubscribeLocalEvent<ItemToggleDamageOtherOnHitComponent, MapInitEvent>(OnItemToggleMapInit);
             SubscribeLocalEvent<DamageOtherOnHitComponent, ItemToggledEvent>(OnItemToggle);
@@ -181,6 +183,16 @@ private void OnThrown(EntityUid uid, DamageOtherOnHitComponent component, Thrown
             component.HitQuantity = 0;
         }
 
+        /// <summary>
+        /// Prevent Pacified entities from throwing damaging items.
+        /// </summary>
+        private void OnAttemptPacifiedThrow(EntityUid uid, DamageOtherOnHitComponent comp, ref AttemptPacifiedThrowEvent args)
+        {
+            // Allow healing projectiles, forbid any that do damage
+            if (comp.Damage.AnyPositive())
+                args.Cancel("pacified-cannot-throw");
+        }
+
         /// <summary>
         ///   Gets the total damage a throwing weapon does.
         /// </summary>

Content.Shared/Projectiles/EmbedPassiveDamageSystem.cs

@@ -1,3 +1,4 @@
+using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Events;
@@ -24,6 +25,7 @@ public override void Initialize()
         SubscribeLocalEvent<EmbedPassiveDamageComponent, EmbedEvent>(OnEmbed);
         SubscribeLocalEvent<EmbedPassiveDamageComponent, RemoveEmbedEvent>(OnRemoveEmbed);
         SubscribeLocalEvent<EmbedPassiveDamageComponent, ItemToggledEvent>(OnItemToggle);
+        SubscribeLocalEvent<EmbedPassiveDamageComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
     }
 
     /// <summary>
@@ -92,6 +94,16 @@ private void OnItemToggle(EntityUid uid, EmbedPassiveDamageComponent component,
             component.Damage = deactivatedDamage;
     }
 
+    /// <summary>
+    /// Prevent Pacified entities from throwing items that deal passive damage when embedded.
+    /// </summary>
+    private void OnAttemptPacifiedThrow(EntityUid uid, EmbedPassiveDamageComponent comp, ref AttemptPacifiedThrowEvent args)
+    {
+        // Allow healing projectiles, forbid any that do damage
+        if (comp.Damage.AnyPositive())
+            args.Cancel("pacified-cannot-throw");
+    }
+
     public override void Update(float frameTime)
     {
         base.Update(frameTime);

Content.Shared/Projectiles/SharedProjectileSystem.cs

@@ -1,6 +1,5 @@
 using System.Numerics;
 using Content.Shared.Body.Systems;
-using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
 using Content.Shared.Examine;
@@ -47,7 +46,6 @@ public override void Initialize()
         SubscribeLocalEvent<EmbeddableProjectileComponent, ThrowDoHitEvent>(OnEmbedThrowDoHit);
         SubscribeLocalEvent<EmbeddableProjectileComponent, ActivateInWorldEvent>(OnEmbedActivate);
         SubscribeLocalEvent<EmbeddableProjectileComponent, RemoveEmbeddedProjectileEvent>(OnEmbedRemove);
-        SubscribeLocalEvent<EmbeddableProjectileComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
         SubscribeLocalEvent<EmbeddableProjectileComponent, ExaminedEvent>(OnExamined);
     }
 
@@ -211,14 +209,6 @@ public void SetShooter(EntityUid id, ProjectileComponent component, EntityUid sh
         Dirty(id, component);
     }
 
-    /// <summary>
-    /// Prevent players with the Pacified status effect from throwing embeddable projectiles.
-    /// </summary>
-    private void OnAttemptPacifiedThrow(Entity<EmbeddableProjectileComponent> ent, ref AttemptPacifiedThrowEvent args)
-    {
-        args.Cancel("pacified-cannot-throw-embed");
-    }
-
     private void OnExamined(EntityUid uid, EmbeddableProjectileComponent component, ExaminedEvent args)
     {
         if (!(component.Target is {} target))