Adds station filter for alert level change sound (#9533)

space-wizards · Jul 8, 2022 · 07c6224 · 07c6224
1 parent 1466a80
commit 07c6224
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Content.Server/AlertLevel/AlertLevelSystem.cs b/Content.Server/AlertLevel/AlertLevelSystem.cs
@@ -173,7 +173,8 @@ public void SetLevel(EntityUid station, string level, bool playSound, bool annou
         {
             if (detail.Sound != null)
             {
-                SoundSystem.Play(detail.Sound.GetSound(), Filter.Broadcast(), detail.Sound.Params);
+                var filter = _stationSystem.GetInStation(station);
+                SoundSystem.Play(detail.Sound.GetSound(), filter, detail.Sound.Params);
             }
             else
             {

diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs
@@ -418,7 +418,7 @@ public void ArmBomb(EntityUid uid, NukeComponent? component = null)
             // Otherwise, you could set every station to whatever AlertLevelOnActivate is.
             if (stationUid != null)
             {
-                _alertLevel.SetLevel(stationUid.Value, component.AlertLevelOnActivate, false, true, true, true);
+                _alertLevel.SetLevel(stationUid.Value, component.AlertLevelOnActivate, true, true, true, true);
             }
 
             // warn a crew