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

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
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -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);