tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix keyboard sounds not playing when opening a computer UI (#24348)

Browse Source 
Fix keyboard sounds not playing on UI open
This commit is contained in:
Nemanja
2024-01-21 02:36:03 -05:00
committed by GitHub
parent fda8035a5e
commit 60dd9f8951
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Sound/EmitSoundSystem.cs
View File

@@ -29,7 +29,7 @@ public sealed class EmitSoundSystem : SharedEmitSoundSystem
{ {
if (soundSpammer.PopUp != null) if (soundSpammer.PopUp != null)
Popup.PopupEntity(Loc.GetString(soundSpammer.PopUp), uid); Popup.PopupEntity(Loc.GetString(soundSpammer.PopUp), uid);
TryEmitSound(uid, soundSpammer); TryEmitSound(uid, soundSpammer, predict: false);
} }
} }
} }
@@ -44,12 +44,12 @@ public sealed class EmitSoundSystem : SharedEmitSoundSystem
private void HandleEmitSoundOnUIOpen(EntityUid uid, EmitSoundOnUIOpenComponent component, AfterActivatableUIOpenEvent args) private void HandleEmitSoundOnUIOpen(EntityUid uid, EmitSoundOnUIOpenComponent component, AfterActivatableUIOpenEvent args)
{ {
TryEmitSound(uid, component, args.User); TryEmitSound(uid, component, args.User, false);
} }
private void HandleEmitSoundOnTrigger(EntityUid uid, EmitSoundOnTriggerComponent component, TriggerEvent args) private void HandleEmitSoundOnTrigger(EntityUid uid, EmitSoundOnTriggerComponent component, TriggerEvent args)
{ {
TryEmitSound(uid, component); TryEmitSound(uid, component, args.User, false);
args.Handled = true; args.Handled = true;
} }
} }

2
Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
View File

@@ -52,6 +52,8 @@
- type: EmitSoundOnUIOpen - type: EmitSoundOnUIOpen
sound: sound:
collection: Keyboard collection: Keyboard
params:
volume: -1
- type: ContainerContainer - type: ContainerContainer
containers: containers:
board: !type:Container board: !type:Container