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

Fix bang, ded (#10768)

Browse Source
This commit is contained in:
metalgearsloth
2022-08-23 12:28:31 +10:00
committed by GitHub
parent ae7ba491f5
commit d2f1981172
3 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Server/Weapon/Ranged/Systems/GunSystem.cs
View File

@@ -225,6 +225,9 @@ public sealed partial class GunSystem : SharedGunSystem
public void PlayImpactSound(EntityUid otherEntity, DamageSpecifier? modifiedDamage, SoundSpecifier? weaponSound, bool forceWeaponSound)
{
if (Deleted(otherEntity))
return;
// Like projectiles and melee,
// 1. Entity specific sound
// 2. Ammo's sound
@@ -237,24 +240,20 @@ public sealed partial class GunSystem : SharedGunSystem
if (type != null && rangedSound.SoundTypes?.TryGetValue(type, out var damageSoundType) == true)
{
SoundSystem.Play(damageSoundType!.GetSound(),
Filter.Pvs(otherEntity, entityManager: EntityManager),
otherEntity, AudioHelpers.WithVariation(DamagePitchVariation));
Audio.PlayPvs(damageSoundType, otherEntity, AudioParams.Default.WithVariation(DamagePitchVariation));
playedSound = true;
}
else if (type != null && rangedSound.SoundGroups?.TryGetValue(type, out var damageSoundGroup) == true)
{
SoundSystem.Play(damageSoundGroup!.GetSound(),
Filter.Pvs(otherEntity, entityManager: EntityManager),
otherEntity, AudioHelpers.WithVariation(DamagePitchVariation));
Audio.PlayPvs(damageSoundGroup, otherEntity, AudioParams.Default.WithVariation(DamagePitchVariation));
playedSound = true;
}
}
if (!playedSound && weaponSound != null)
SoundSystem.Play(weaponSound.GetSound(), Filter.Pvs(otherEntity, entityManager: EntityManager), otherEntity);
{
Audio.PlayPvs(weaponSound, otherEntity);
}
}
// TODO: Pseudo RNG so the client can predict these.