fix: don't do emergency shuttle stuff in lobby (#38732)

This commit is contained in:
Perry Fraser
2025-08-20 02:52:52 -04:00
committed by GitHub
parent d0b0a4a926
commit b317d7514f

View 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>