Upstream

new-frontiers-14 · Apr 20, 2024 · ba174aa · ba174aa
1 parent 0629a00
commit ba174aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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<SoundWhileAliveComponent> 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);