tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Comms Consoles without CanShuttle can no longer recall (#28803)

Browse Source 
Consoles without CanShuttle can no longer recall
This commit is contained in:
Robert V
2024-06-12 06:32:57 -07:00
committed by GitHub
parent a0f709918d
commit 94bf301a8b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Communications/CommunicationsConsoleSystem.cs
View File

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