From 2fc0544e35f6272db09b6c90383d63b40f1663bb Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 24 Aug 2020 00:52:05 +0200 Subject: [PATCH] [MIRROR] fixes shuttle catastrophe working when shuttle docked or is flying to centcom (#486) * fixes shuttle catastrophe working when shuttle docked or is flying to centcom (#53139) * fixes shuttle catastrophe working when shuttle docked or is flying to centcom Co-authored-by: Fikou --- code/modules/events/shuttle_catastrophe.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/events/shuttle_catastrophe.dm b/code/modules/events/shuttle_catastrophe.dm index d948b39d3bf..5bb61f559e3 100644 --- a/code/modules/events/shuttle_catastrophe.dm +++ b/code/modules/events/shuttle_catastrophe.dm @@ -7,6 +7,8 @@ /datum/round_event_control/shuttle_catastrophe/canSpawnEvent(players, gamemode) if(SSshuttle.emergency.name == "Build your own shuttle kit") return FALSE //don't undo manual player engineering, it also would unload people and ghost them, there's just a lot of problems + if(EMERGENCY_AT_LEAST_DOCKED) + return FALSE //don't remove all players when its already on station or going to centcom return ..()