diff --git a/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs index 7f3013e2b8..72ccae1bef 100644 --- a/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs +++ b/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs @@ -112,7 +112,9 @@ namespace Content.Server.Weapon.Melee } else { - SoundSystem.Play(comp.NoDamageSound.GetSound(), Filter.Pvs(owner, entityManager: EntityManager), owner); + SoundSystem.Play((hitEvent.HitSoundOverride != null) + ? hitEvent.HitSoundOverride.GetSound() + : comp.NoDamageSound.GetSound(), Filter.Pvs(owner, entityManager: EntityManager), owner); } } } @@ -208,7 +210,9 @@ namespace Content.Server.Weapon.Melee } else { - SoundSystem.Play(comp.NoDamageSound.GetSound(), Filter.Pvs(owner, entityManager: EntityManager), owner); + SoundSystem.Play((hitEvent.HitSoundOverride != null) + ? hitEvent.HitSoundOverride.GetSound() + : comp.NoDamageSound.GetSound(), Filter.Pvs(owner, entityManager: EntityManager), owner); } } else