From b317d7514f34c56a989c661668290857fdef6f57 Mon Sep 17 00:00:00 2001 From: Perry Fraser Date: Wed, 20 Aug 2025 02:52:52 -0400 Subject: [PATCH] fix: don't do emergency shuttle stuff in lobby (#38732) --- Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs index 53714c846a..e0bbc9d090 100644 --- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs +++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs @@ -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); } /// -- 2.51.2