fix govno system

Lemirda · Apr 12, 2024 · 949fbe0 · 949fbe0
1 parent 2bc9593
commit 949fbe0
Showing 1 changed file with 9 additions and 14 deletions.
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
@@ -160,22 +160,16 @@ private void UpdateEmergencyConsole(float frameTime)
             if (!EarlyLaunchAuthorized)
                 AnnounceLaunch();
         }
-
-        // Andromeda Emergency
-        if (!_launchedShuttles && _consoleAccumulator <= _AndromedaEmergency60 && trashcheck60 == 0)
+        // Andromeda Emergency start
+        if (!_launchedShuttles && !_announced && _consoleAccumulator <= _AndromedaEmergency60 && trashcheck60 == 0)
         {
-            if (_announced == false)
-            {
-                _chatSystem.DispatchGlobalAnnouncement(
-                    Loc.GetString("emergency-shuttle-andromeda-60", ("AndromedaEmergency60", $"{_AndromedaEmergency60:0}")),
-                    playSound: false,
-                    colorOverride: DangerColor);
-                _audio.PlayGlobal("/Audio/Announcements/announce.ogg", Filter.Broadcast(), recordReplay: true);
-                trashcheck60++;
-            }
+            _chatSystem.DispatchGlobalAnnouncement(
+                Loc.GetString("emergency-shuttle-andromeda-60", ("AndromedaEmergency60", $"{_AndromedaEmergency60:0}")),
+                playSound: false,
+                colorOverride: DangerColor);
+            _audio.PlayGlobal("/Audio/Announcements/announce.ogg", Filter.Broadcast(), recordReplay: true);
+            trashcheck60++;
         }
-
-        // Andromeda Emergency
         if (!_launchedShuttles && _consoleAccumulator <= _AndromedaEmergency30 && trashcheck30 == 0)
         {
             if (_announced == false)
@@ -188,6 +182,7 @@ private void UpdateEmergencyConsole(float frameTime)
                 trashcheck30++;
             }
         }
+        // Andromeda Emergency end
 
         // Imminent departure
         if (!_launchedShuttles && _consoleAccumulator <= ShuttleSystem.DefaultStartupTime)