From 94bf301a8bbf975763904121d5f5dfa5c15ec7f6 Mon Sep 17 00:00:00 2001
From: Robert V <vincerob@oregonstate.edu>
Date: Wed, 12 Jun 2024 06:32:57 -0700
Subject: [PATCH] Comms Consoles without CanShuttle can no longer recall
 (#28803)

Consoles without CanShuttle can no longer recall
---
 .../Communications/CommunicationsConsoleSystem.cs           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs
index 61a18fe3d5..7502c889e1 100644
--- a/Content.Server/Communications/CommunicationsConsoleSystem.cs
+++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs
@@ -199,9 +199,13 @@ namespace Content.Server.Communications
             if (_emergency.EmergencyShuttleArrived || !_roundEndSystem.CanCallOrRecall())
                 return false;
 
+            // Ensure that we can communicate with the shuttle (either call or recall)
+            if (!comp.CanShuttle)
+                return false;
+
             // Calling shuttle checks
             if (_roundEndSystem.ExpectedCountdownEnd is null)
-                return comp.CanShuttle;
+                return true;
 
             // Recalling shuttle checks
             var recallThreshold = _cfg.GetCVar(CCVars.EmergencyRecallTurningPoint);