Merge branch 'Fansana:FoxxoTrystan-shuttle-patch' into FoxxoTrystan-s…

…huttle-patch
Fansana · Nov 9, 2024 · 86259a7 · 86259a7
2 parents 108d2ac + 53e7942
commit 86259a7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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);