Events all over melee (#16997)

2023-06-07 16:26:45 -04:00
parent 937aae14ff
commit 37d3056809
9 changed files with 170 additions and 34 deletions
--- a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
@@ -62,7 +62,7 @@ public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
        if (!args.CanInteract || !args.CanAccess || component.HideFromExamine)
            return;

-        var damageSpec = GetDamage(uid, component);
+        var damageSpec = GetDamage(uid, args.User, component);

        if (damageSpec.Total == FixedPoint2.Zero)
            return;