Add CanAttack to IActionBlocker, prevent using guns when dead (#769)

Content.Server/GameObjects/Components/Mobs/DamageStates.cs

@@ -72,6 +72,11 @@ namespace Content.Server.GameObjects
         {
             return true;
         }
+
+        bool IActionBlocker.CanAttack()
+        {
+            return true;
+        }
     }
 
     /// <summary>
@@ -128,6 +133,11 @@ namespace Content.Server.GameObjects
         {
             return false;
         }
+
+        bool IActionBlocker.CanAttack()
+        {
+            return false;
+        }
     }
 
     /// <summary>
@@ -204,5 +214,10 @@ namespace Content.Server.GameObjects
         {
             return false;
         }
+
+        bool IActionBlocker.CanAttack()
+        {
+            return false;
+        }
     }
 }

Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs

@@ -117,6 +117,11 @@ namespace Content.Server.GameObjects
             return CurrentDamageState.CanEmote();
         }
 
+        bool IActionBlocker.CanAttack()
+        {
+            return CurrentDamageState.CanAttack();
+        }
+
         List<DamageThreshold> IOnDamageBehavior.GetAllDamageThresholds()
         {
             var thresholdlist = DamageTemplate.DamageThresholds;

Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs

@@ -1,5 +1,6 @@
 using System;
 using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.Components.Weapons.Ranged;
 using Robust.Server.Interfaces.Player;
 using Robust.Shared.GameObjects;
@@ -30,7 +31,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged
 
         private bool UserCanFire(IEntity user)
         {
-            return UserCanFireHandler == null || UserCanFireHandler(user);
+            return (UserCanFireHandler == null || UserCanFireHandler(user)) && ActionBlockerSystem.CanAttack(user);
         }
 
         private void Fire(IEntity user, GridCoordinates clickLocation)

Content.Server/GameObjects/EntitySystems/ActionBlockerSystem.cs

@@ -20,6 +20,8 @@ namespace Content.Server.GameObjects.EntitySystems
         bool CanPickup();
 
         bool CanEmote();
+
+        bool CanAttack();
     }
 
     public class ActionBlockerSystem : EntitySystem
@@ -105,5 +107,17 @@ namespace Content.Server.GameObjects.EntitySystems
 
             return canemote;
         }
+
+        public static bool CanAttack(IEntity entity)
+        {
+            bool canattack = true;
+
+            foreach (var actionblockercomponents in entity.GetAllComponents<IActionBlocker>())
+            {
+                canattack &= actionblockercomponents.CanAttack();
+            }
+
+            return canattack;
+        }
     }
 }

Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs

@@ -853,7 +853,7 @@ namespace Content.Server.GameObjects.EntitySystems
             var item = hands.GetActiveHand?.Owner;
 
             // TODO: If item is null we need some kinda unarmed combat.
-            if (!ActionBlockerSystem.CanInteract(player) || item == null)
+            if (!ActionBlockerSystem.CanAttack(player) || item == null)
             {
                 return;
             }