]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
fix: don't do emergency shuttle stuff in lobby (#38732)
authorPerry Fraser <perryprog@users.noreply.github.com>
Wed, 20 Aug 2025 06:52:52 +0000 (02:52 -0400)
committerGitHub <noreply@github.com>
Wed, 20 Aug 2025 06:52:52 +0000 (23:52 -0700)
Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs

index 53714c846a3d1ac10244ed090a72136e9aea67ab..e0bbc9d090ce3a0172eb66d21a65bf2546de65f3 100644 (file)
@@ -7,6 +7,7 @@ using Content.Server.Administration.Managers;
 using Content.Server.Chat.Systems;
 using Content.Server.Communications;
 using Content.Server.DeviceNetwork.Systems;
+using Content.Server.GameTicking;
 using Content.Server.GameTicking.Events;
 using Content.Server.Pinpointer;
 using Content.Server.Popups;
@@ -57,6 +58,7 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
     [Dependency] private readonly CommunicationsConsoleSystem _commsConsole = default!;
     [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!;
     [Dependency] private readonly DockingSystem _dock = default!;
+    [Dependency] private readonly GameTicker _ticker = default!;
     [Dependency] private readonly IdCardSystem _idSystem = default!;
     [Dependency] private readonly NavMapSystem _navMap = default!;
     [Dependency] private readonly MapLoaderSystem _loader = default!;
@@ -157,7 +159,9 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
-        UpdateEmergencyConsole(frameTime);
+        // Don't handle any of this logic if in lobby
+        if (_ticker.RunLevel != GameRunLevel.PreRoundLobby)
+            UpdateEmergencyConsole(frameTime);
     }
 
     /// <summary>