Merge pull request #3283 from Citadel-Station-13/upstream-merge-31504

[MIRROR] Fixes Clock Cult ending with dead cultists
This commit is contained in:
LetterJay
2017-10-10 22:28:36 -04:00
committed by GitHub
@@ -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