Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use hitsound for 0 damage weapons (#14508)

Browse Source
This commit is contained in:
metalgearsloth
2023-03-09 19:28:57 +11:00
committed by GitHub
parent 2aa495a922
commit f9aaadcfc5
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
View File

@@ -463,6 +463,10 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
{ {
Audio.PlayPredicted(hitEvent.HitSoundOverride, meleeUid, user); Audio.PlayPredicted(hitEvent.HitSoundOverride, meleeUid, user);
} }
else if (component.Damage.Total.Equals(FixedPoint2.Zero) && component.HitSound != null)
{
Audio.PlayPredicted(component.HitSound, meleeUid, user);
}
else else
{ {
Audio.PlayPredicted(component.NoDamageSound, meleeUid, user); Audio.PlayPredicted(component.NoDamageSound, meleeUid, user);