From e1324fff19e1f402d2fa7015ea62abe4c12d7fef Mon Sep 17 00:00:00 2001 From: FL-OZ <58238103+FL-OZ@users.noreply.github.com> Date: Wed, 20 May 2020 12:11:38 -0500 Subject: [PATCH] Fix RND console keyboard sound being global. (#933) * global keyboard * e * fixes microwave while im at it Co-authored-by: FL-OZ --- .../Components/Kitchen/KitchenMicrowaveComponent.cs | 6 +++--- .../Components/Research/ResearchConsoleComponent.cs | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs b/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs index 36a52aa7a5..d5e4aa8191 100644 --- a/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs +++ b/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs @@ -274,7 +274,7 @@ namespace Content.Server.GameObjects.Components.Kitchen (_currentCookTimerTime == (uint)recipeToCook.CookTime) ? true : false; SetAppearance(MicrowaveVisualState.Cooking); - _audioSystem.Play(_startCookingSound, AudioParams.Default); + _audioSystem.Play(_startCookingSound,Owner, AudioParams.Default); Timer.Spawn((int)(_currentCookTimerTime * _cookTimeMultiplier), () => { @@ -290,7 +290,7 @@ namespace Content.Server.GameObjects.Components.Kitchen var entityToSpawn = goodMeal ? recipeToCook.Result : _badRecipeName; _entityManager.SpawnEntity(entityToSpawn, Owner.Transform.GridPosition); - _audioSystem.Play(_cookingCompleteSound, AudioParams.Default); + _audioSystem.Play(_cookingCompleteSound,Owner, AudioParams.Default); SetAppearance(MicrowaveVisualState.Idle); _busy = false; UpdateUserInterface(); @@ -395,7 +395,7 @@ namespace Content.Server.GameObjects.Components.Kitchen private void ClickSound() { - _audioSystem.Play("/Audio/machines/machine_switch.ogg", AudioParams.Default.WithVolume(-2f)); + _audioSystem.Play("/Audio/machines/machine_switch.ogg",Owner, AudioParams.Default.WithVolume(-2f)); } diff --git a/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs b/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs index 9b10ad832a..89f3d2ddd4 100644 --- a/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs +++ b/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs @@ -7,6 +7,7 @@ using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.Player; +using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; @@ -33,7 +34,7 @@ namespace Content.Server.GameObjects.Components.Research private const string _soundCollectionName = "keyboard"; private bool Powered => _powerDevice.Powered; - + public override void Initialize() { base.Initialize(); @@ -119,7 +120,7 @@ namespace Content.Server.GameObjects.Components.Research var soundCollection = _prototypeManager.Index(_soundCollectionName); var file = _random.Pick(soundCollection.PickFiles); var audioSystem = _entitySystemManager.GetEntitySystem(); - audioSystem.Play(file); + audioSystem.Play(file,Owner,AudioParams.Default); }