From 008eedfedca9f5d9fb05e03b22ee3eaa9efb9e20 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sun, 12 Feb 2023 17:12:52 -0800 Subject: [PATCH] Fix shuttle catastrophe happening during transit --- 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 2e431a8a34..18b9dc61ca 100644 --- a/code/modules/events/shuttle_catastrophe.dm +++ b/code/modules/events/shuttle_catastrophe.dm @@ -9,6 +9,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(SSshuttle.emergency.in_flight()) + return FALSE //ditto, problems return ..()