From ba174aa0decc92b249378fb377ed66c32cdb221e Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 20 Apr 2024 13:47:09 +0300 Subject: [PATCH] Upstream --- Content.Server/Sound/EmitSoundSystem.cs | 3 ++- Content.Shared/Sound/SharedEmitSoundSystem.cs | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Content.Server/Sound/EmitSoundSystem.cs b/Content.Server/Sound/EmitSoundSystem.cs index f4788e31ce4..fc10d951e76 100644 --- a/Content.Server/Sound/EmitSoundSystem.cs +++ b/Content.Server/Sound/EmitSoundSystem.cs @@ -3,7 +3,8 @@ using Content.Shared.UserInterface; using Content.Shared.Sound; using Content.Shared.Sound.Components; -using Robust.Shared.Random; +using Robust.Shared.Timing; +using Robust.Shared.Network; namespace Content.Server.Sound; diff --git a/Content.Shared/Sound/SharedEmitSoundSystem.cs b/Content.Shared/Sound/SharedEmitSoundSystem.cs index 0d36a83de31..a9a50698d7d 100644 --- a/Content.Shared/Sound/SharedEmitSoundSystem.cs +++ b/Content.Shared/Sound/SharedEmitSoundSystem.cs @@ -31,8 +31,8 @@ public abstract class SharedEmitSoundSystem : EntitySystem [Dependency] private readonly INetManager _netMan = default!; [Dependency] private readonly ITileDefinitionManager _tileDefMan = default!; [Dependency] protected readonly IRobustRandom Random = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambient = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; + [Dependency] private readonly SharedAmbientSoundSystem _ambient = default!; + [Dependency] private readonly SharedAudioSystem _audioSystem = default!; [Dependency] protected readonly SharedPopupSystem Popup = default!; public override void Initialize() @@ -64,9 +64,6 @@ private void OnMobState(Entity entity, ref MobStateCha _ambient.SetAmbience(entity.Owner, args.NewMobState != MobState.Dead); } - _ambient.SetAmbience(entity.Owner, args.NewMobState != MobState.Dead); - } - private void OnEmitSpawnOnInit(EntityUid uid, EmitSoundOnSpawnComponent component, MapInitEvent args) { TryEmitSound(uid, component, predict: false);