From 4b06cf82f0385d5c665a98bce7eb30e702f8b64a Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 4 Jul 2014 17:34:30 +0930 Subject: [PATCH] Fixes #5491 --- code/game/gamemodes/heist/heist.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm index 63953b4a697..11fec0b1c0b 100644 --- a/code/game/gamemodes/heist/heist.dm +++ b/code/game/gamemodes/heist/heist.dm @@ -272,9 +272,9 @@ datum/game_mode/proc/auto_declare_completion_heist() return 1 /datum/game_mode/heist/check_finished() - // DO NOT FORGET TO FIX THIS. - //if (!(is_raider_crew_alive()) || (vox_shuttle_location && (vox_shuttle_location == "start"))) - // return 1 + var/datum/shuttle/multi_shuttle/skipjack = shuttle_controller.shuttles["Vox Skipjack"] + if (!(is_raider_crew_alive()) || (skipjack && skipjack.at_origin)) + return 1 return ..() /datum/game_mode/heist/cleanup()