From b6150e852500307d738e6d667ca384a9ffdd595c Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 17 Jan 2018 08:09:10 -0500 Subject: [PATCH] Merge pull request #34500 from Xhuis/recallfix fixes a mass recall runtime error that prevented it from working --- .../clock_structures/ark_of_the_clockwork_justicar.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm index 335fd74dba..d66b16f209 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm @@ -123,7 +123,7 @@ /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/mass_recall() for(var/V in SSticker.mode.servants_of_ratvar) var/datum/mind/M = V - if(M.current.stat != DEAD) + if(isliving(M.current) && M.current.stat != DEAD) M.current.forceMove(get_turf(src)) M.current.overlay_fullscreen("flash", /obj/screen/fullscreen/flash) M.current.clear_fullscreen("flash", 5)