From 6056aba24c14d88cf9fb25ad95ebb165d3506792 Mon Sep 17 00:00:00 2001 From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Date: Sat, 9 Nov 2024 20:30:59 -0400 Subject: [PATCH] Fix Call Shuttle (#1199) # Description Fixes the call shuttle button. --- Content.Server/Communications/CommunicationsConsoleSystem.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs index 0fcac27c19..0cdcb3a47f 100644 --- a/Content.Server/Communications/CommunicationsConsoleSystem.cs +++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs @@ -205,6 +205,10 @@ private bool CanCallOrRecall(CommunicationsConsoleComponent comp) || !comp.CanShuttle) return false; + // Calling shuttle checks + if (_roundEndSystem.ExpectedCountdownEnd is null) + return comp.CanShuttle; + // Recalling shuttle checks var recallThreshold = _cfg.GetCVar(CCVars.EmergencyRecallTurningPoint);