From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 9 Mar 2023 08:28:57 +0000 (+1100)
Subject: Use hitsound for 0 damage weapons (#14508)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f9aaadcfc5eb24c663e5499215201ff400ebee8d;p=space-station-14.git

Use hitsound for 0 damage weapons (#14508)
---

diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 362756a52c..a96699260e 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -463,6 +463,10 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
             {
                 Audio.PlayPredicted(hitEvent.HitSoundOverride, meleeUid, user);
             }
+            else if (component.Damage.Total.Equals(FixedPoint2.Zero) && component.HitSound != null)
+            {
+                Audio.PlayPredicted(component.HitSound, meleeUid, user);
+            }
             else
             {
                 Audio.PlayPredicted(component.NoDamageSound, meleeUid, user);