Merge pull request #15970 from Putnam3145/fix-shuttle-event-2

Fix shuttle catastrophe happening during transit
2023-02-12 22:20:31 -03:00
parent 5f6e204866 008eedfedc
commit 6c0aedeb4c
1 changed files with 2 additions and 0 deletions
@@ -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 ..()