Self-attack nerfs (#17845)

This commit is contained in:
metalgearsloth
2023-07-07 18:45:37 +10:00
committed by GitHub
parent c1fe000a7b
commit ee2a3216d6
6 changed files with 18 additions and 2 deletions

View File

@@ -103,7 +103,7 @@ public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem
}
// If it's an unarmed attack then do a disarm
if (weaponUid == entity)
if (weapon.AltDisarm && weaponUid == entity)
{
EntityUid? target = null;
@@ -128,7 +128,7 @@ public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem
return;
}
// Otherwise do heavy attack if it's a weapon.
// Otherwise do heavy attack.
// Start a windup
if (weapon.WindUpStart == null)