From b530e9401975af67c2b7d2f01e9db284895efc24 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 10 Sep 2020 04:50:26 +0200 Subject: [PATCH] [MIRROR] Fixes shuttle catastrophe triggering when Build Your Own Shuttle kit has been purchased (#724) * Fixes shuttle catastrophe triggering when Build Your Own Shuttle kit purchased and ghosting people (#53532) The Shuttle Catastrophe event now checks for the /obj/docking_port/mobile/emergency/shuttle_build subtype rather than checking for a specific mobile docking port name when checking to see if it should spawn. This should keep Shuttle Catastrophe from triggering when Build Your Own Shuttle has been purchased and ghosting/qdeling everyone and everything onboard. * Fixes shuttle catastrophe triggering when Build Your Own Shuttle kit has been purchased Co-authored-by: msgerbs --- code/modules/events/shuttle_catastrophe.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/shuttle_catastrophe.dm b/code/modules/events/shuttle_catastrophe.dm index e9587c76d8d..80f10593d83 100644 --- a/code/modules/events/shuttle_catastrophe.dm +++ b/code/modules/events/shuttle_catastrophe.dm @@ -5,7 +5,7 @@ max_occurrences = 1 /datum/round_event_control/shuttle_catastrophe/canSpawnEvent(players, gamemode) - if(SSshuttle.emergency.name == "Build your own shuttle kit") + if(istype(SSshuttle.emergency, /obj/docking_port/mobile/emergency/shuttle_build)) 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