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

Fix stunbaton stun sounds (#9511)

Browse Source
This commit is contained in:
metalgearsloth
2022-07-07 13:34:17 +10:00
committed by GitHub
parent 3e5ccbafc1
commit d5628fd004
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Damage/Events/StaminaDamageOnHitAttemptEvent.cs
View File

@@ -1,3 +1,5 @@
using Content.Shared.Sound;
namespace Content.Server.Damage.Events; namespace Content.Server.Damage.Events;
/// <summary> /// <summary>
@@ -7,4 +9,5 @@ namespace Content.Server.Damage.Events;
public struct StaminaDamageOnHitAttemptEvent public struct StaminaDamageOnHitAttemptEvent
{ {
public bool Cancelled; public bool Cancelled;
public SoundSpecifier? HitSoundOverride;
} }

1
Content.Server/Damage/Systems/StaminaSystem.cs
View File

@@ -59,6 +59,7 @@ public sealed class StaminaSystem : EntitySystem
if (ev.Cancelled) return; if (ev.Cancelled) return;
args.HitSoundOverride = ev.HitSoundOverride;
var stamQuery = GetEntityQuery<StaminaComponent>(); var stamQuery = GetEntityQuery<StaminaComponent>();
var toHit = new ValueList<StaminaComponent>(); var toHit = new ValueList<StaminaComponent>();

2
Content.Server/Stunnable/Systems/StunbatonSystem.cs
View File

@@ -50,6 +50,8 @@ namespace Content.Server.Stunnable.Systems
return; return;
} }
args.HitSoundOverride = component.StunSound;
if (battery.CurrentCharge < component.EnergyPerUse) if (battery.CurrentCharge < component.EnergyPerUse)
{ {
SoundSystem.Play(component.SparksSound.GetSound(), Filter.Pvs(component.Owner, entityManager: EntityManager), uid, AudioHelpers.WithVariation(0.25f)); SoundSystem.Play(component.SparksSound.GetSound(), Filter.Pvs(component.Owner, entityManager: EntityManager), uid, AudioHelpers.WithVariation(0.25f));