Self-attack nerfs (#17845)

2023-07-07 18:45:37 +10:00
parent c1fe000a7b
commit ee2a3216d6
6 changed files with 18 additions and 2 deletions
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -460,6 +460,11 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
            case LightAttackEvent light:
                if (!Blocker.CanAttack(user, light.Target))
                    return false;
+
+                // Can't self-attack if you're the weapon
+                if (weaponUid == light.Target)
+                    return false;
+
                break;
            case DisarmAttackEvent disarm:
                if (!Blocker.CanAttack(user, disarm.Target))