Fix Unable to Call Shuttle

Fansana · Nov 9, 2024 · ee75654 · ee75654
1 parent 7d05d1d
commit ee75654
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs
@@ -200,13 +200,11 @@ private bool CanUse(EntityUid user, EntityUid console)
         private bool CanCallOrRecall(CommunicationsConsoleComponent comp)
         {
             // Defer to what the round end system thinks we should be able to do.
-            if (_emergency.EmergencyShuttleArrived || !_roundEndSystem.CanCallOrRecall())
+            if (_emergency.EmergencyShuttleArrived
+                || !_roundEndSystem.CanCallOrRecall()
+                || !comp.CanShuttle)
                 return false;
 
-            // Calling shuttle checks
-            if (_roundEndSystem.ExpectedCountdownEnd is null)
-                return comp.CanShuttle;
-
             // Recalling shuttle checks
             var recallThreshold = _cfg.GetCVar(CCVars.EmergencyRecallTurningPoint);