Comms Console Announcer Fixes (#610)

# Description Cherry-Picks Fansana/floofstation1#50 This fixes some mistakes in the code for Michael's announcements. --------- Co-authored-by: Fansana <[email protected]>
Simple-Station · Jul 31, 2024 · 80eb456 · 80eb456
1 parent b15d096
commit 80eb456
Show file tree

Hide file tree

Showing 15 changed files with 3 additions and 3 deletions.
diff --git a/Content.Server/AlertLevel/AlertLevelSystem.cs b/Content.Server/AlertLevel/AlertLevelSystem.cs
@@ -150,7 +150,7 @@ public void SetLevel(EntityUid station, string level, bool playSound, bool annou
         if (Loc.TryGetString(detail.Announcement, out var locAnnouncement))
             announcement = locAnnouncement;
 
-        var alert = _announcer.GetAnnouncementId($"Alert{level}");
+        var alert = $"alert{char.ToUpperInvariant(level[0]) + level[1..]}";
         if (playSound)
             _announcer.SendAnnouncementAudio(alert, _stationSystem.GetInOwningStation(station));
         if (announce)

diff --git a/Resources/Audio/Announcers/Michael/alerts/delta.ogg b/Resources/Audio/Announcers/Michael/alerts/delta.ogg
diff --git a/...uncers/Michael/shuttle/shuttle_called.ogg → ...dio/Announcers/Michael/shuttle/called.ogg b/...uncers/Michael/shuttle/shuttle_called.ogg → ...dio/Announcers/Michael/shuttle/called.ogg
diff --git a/...nouncers/Michael/shuttle/shuttle_dock.ogg → ...Audio/Announcers/Michael/shuttle/dock.ogg b/...nouncers/Michael/shuttle/shuttle_dock.ogg → ...Audio/Announcers/Michael/shuttle/dock.ogg
diff --git a/...cers/Michael/shuttle/shuttle_recalled.ogg → ...o/Announcers/Michael/shuttle/recalled.ogg b/...cers/Michael/shuttle/shuttle_recalled.ogg → ...o/Announcers/Michael/shuttle/recalled.ogg
diff --git a/...udio/Announcers/NEIL/alerts/code_blue.ogg → ...ces/Audio/Announcers/NEIL/alerts/blue.ogg b/...udio/Announcers/NEIL/alerts/code_blue.ogg → ...ces/Audio/Announcers/NEIL/alerts/blue.ogg
diff --git a/...dio/Announcers/NEIL/alerts/code_delta.ogg → ...es/Audio/Announcers/NEIL/alerts/delta.ogg b/...dio/Announcers/NEIL/alerts/code_delta.ogg → ...es/Audio/Announcers/NEIL/alerts/delta.ogg
diff --git a/...o/Announcers/NEIL/alerts/code_epsilon.ogg → .../Audio/Announcers/NEIL/alerts/epsilon.ogg b/...o/Announcers/NEIL/alerts/code_epsilon.ogg → .../Audio/Announcers/NEIL/alerts/epsilon.ogg
diff --git a/...dio/Announcers/NEIL/alerts/code_gamma.ogg → ...es/Audio/Announcers/NEIL/alerts/gamma.ogg b/...dio/Announcers/NEIL/alerts/code_gamma.ogg → ...es/Audio/Announcers/NEIL/alerts/gamma.ogg
diff --git a/...dio/Announcers/NEIL/alerts/code_green.ogg → ...es/Audio/Announcers/NEIL/alerts/green.ogg b/...dio/Announcers/NEIL/alerts/code_green.ogg → ...es/Audio/Announcers/NEIL/alerts/green.ogg
diff --git a/...Audio/Announcers/NEIL/alerts/code_red.ogg → ...rces/Audio/Announcers/NEIL/alerts/red.ogg b/...Audio/Announcers/NEIL/alerts/code_red.ogg → ...rces/Audio/Announcers/NEIL/alerts/red.ogg
diff --git a/...io/Announcers/NEIL/alerts/code_violet.ogg → ...s/Audio/Announcers/NEIL/alerts/violet.ogg b/...io/Announcers/NEIL/alerts/code_violet.ogg → ...s/Audio/Announcers/NEIL/alerts/violet.ogg
diff --git a/...dio/Announcers/NEIL/alerts/code_white.ogg → ...es/Audio/Announcers/NEIL/alerts/white.ogg b/...dio/Announcers/NEIL/alerts/code_white.ogg → ...es/Audio/Announcers/NEIL/alerts/white.ogg
diff --git a/...io/Announcers/NEIL/alerts/code_yellow.ogg → ...s/Audio/Announcers/NEIL/alerts/yellow.ogg b/...io/Announcers/NEIL/alerts/code_yellow.ogg → ...s/Audio/Announcers/NEIL/alerts/yellow.ogg
diff --git a/Resources/Prototypes/Announcers/michael.yml b/Resources/Prototypes/Announcers/michael.yml
@@ -37,8 +37,8 @@
       path: alerts/red.ogg
     - id: alertGamma # There is a massive immediate threat to the station, listen to Central Command
       path: alerts/gamma.ogg
-    # - id: alertDelta # The station is being or about to be massively destroyed, run for your life
-    #   path: alerts/delta.ogg
+    - id: alertDelta # The station is being or about to be massively destroyed, run for your life
+      path: alerts/delta.ogg
     - id: alertEpsilon # The station has been terminated, good luck survivors!
       path: alerts/epsilon.ogg
       audioParams: