From 08339940c154377c1df5884351ed5ea414b1cafd Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 11 Jan 2018 19:24:11 -0800 Subject: [PATCH] Update ark_of_the_clockwork_justicar.dm (#34297) --- .../ark_of_the_clockwork_justicar.dm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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 36a74ec62b..15dd038cf6 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 @@ -146,12 +146,15 @@ countdown = null for(var/mob/L in GLOB.player_list) if(L.z == z) - L.forceMove(get_turf(pick(GLOB.generic_event_spawns))) + var/atom/movable/target = L + if(isobj(L.loc)) + target = L.loc + target.forceMove(get_turf(pick(GLOB.generic_event_spawns))) L.overlay_fullscreen("flash", /obj/screen/fullscreen/flash/static) - L.clear_fullscreen("flash", 30) - if(isliving(L)) - var/mob/living/LI = L - LI.Stun(50) + L.clear_fullscreen("flash", 30) + if(isliving(L)) + var/mob/living/LI = L + LI.Stun(50) for(var/obj/effect/clockwork/city_of_cogs_rift/R in GLOB.all_clockwork_objects) qdel(R) if(GLOB.ark_of_the_clockwork_justiciar == src)