From 0f61a5a5eea0673febb8cd98f03cb1014aee6b14 Mon Sep 17 00:00:00 2001 From: Robustin Date: Tue, 10 Oct 2017 13:38:24 -0400 Subject: [PATCH] Fixes Clock Cult ending with dead cultists (#31504) * Probably fixes premature CC ending * I should make this commit into a 2nd PR for GBP --- code/game/gamemodes/clock_cult/clock_cult.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index 261a258101..462daefd86 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -183,6 +183,12 @@ Credit where due: return TRUE return FALSE +/datum/game_mode/clockwork_cult/check_finished() + var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar + if(G && !GLOB.ratvar_awakens) // Doesn't end until the Ark is destroyed or completed + return FALSE + . = ..() + /datum/game_mode/clockwork_cult/proc/check_clockwork_victory() if(GLOB.clockwork_gateway_activated || SSshuttle.emergency.mode == SHUTTLE_ESCAPE) SSticker.news_report = CLOCK_SUMMON