From 1c2c9421ba12ed760a7cfbde2c8d8007526b54db Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Sun, 2 Apr 2017 22:46:34 +0100 Subject: [PATCH] Emergency shuttles forget early launch authorizations if stranded :cl: coiax fix: Emergency shuttles will now forget early launch authorizations if they cannot launch due to a hostile environment. /:cl: This isn't intended behaviour. And it's kind of punishing people for leaving the shuttle to go deal with the hostile environment, and then fucking off without them. --- code/modules/shuttle/emergency.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 7addfe25fe7..4c9ce07d6f9 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -118,7 +118,14 @@ // Launch check is in process in case auth_need changes for some reason // probably external. . = FALSE - if(!SSshuttle.emergency || ENGINES_STARTED || (!IS_DOCKED)) + if(!SSshuttle.emergency) + return + + if(SSshuttle.emergency.mode == SHUTTLE_STRANDED) + authorized.Cut() + emagged = FALSE + + if(ENGINES_STARTED || (!IS_DOCKED)) return . // Check to see if we've reached criteria for early launch