From c5d35839ba47b21c6f843ec4bb2db54dac80b9d0 Mon Sep 17 00:00:00 2001 From: cib Date: Mon, 19 Nov 2012 12:24:14 +0100 Subject: [PATCH] Fixes issue #1959 Crew transfer shuttles now force the mode to finish, even if the mode has other finish conditions. --- code/game/gamemodes/gameticker.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 8dce6c6e441..fbdc336282d 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -300,7 +300,8 @@ var/global/datum/controller/gameticker/ticker emergency_shuttle.process() - if(!mode.explosion_in_progress && mode.check_finished()) + var/mode_finished = mode.check_finished() || (emergency_shuttle.location == 2 && emergency_shuttle.alert == 1) + if(!mode.explosion_in_progress && mode_finished) current_state = GAME_STATE_FINISHED spawn