diff --git a/Content.Server/AlertLevel/AlertLevelSystem.cs b/Content.Server/AlertLevel/AlertLevelSystem.cs index 8b78dbe9da..6fcafdaf7f 100644 --- a/Content.Server/AlertLevel/AlertLevelSystem.cs +++ b/Content.Server/AlertLevel/AlertLevelSystem.cs @@ -173,7 +173,8 @@ public sealed class AlertLevelSystem : EntitySystem { 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 index 3b8af8bf80..22c7e279ac 100644 --- a/Content.Server/Nuke/NukeSystem.cs +++ b/Content.Server/Nuke/NukeSystem.cs @@ -418,7 +418,7 @@ namespace Content.Server.Nuke // 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