From 5dabd9cb058eb5d968fcac75a40a11b48039a130 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 26 Mar 2018 04:31:59 -0500 Subject: [PATCH] [MIRROR] Prevents sparks from passing through clockcult rifts (#6111) * Prevents sparks from passing through clockcult rifts * Prevents sparks from passing through clockcult rifts (#36692) * Prevents sparks from passing through clockcult rifts * Update city_of_cogs_rift.dm --- .../antagonists/clockcult/clock_effects/city_of_cogs_rift.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm b/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm index c0cbca14a5..5e327bf720 100644 --- a/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm +++ b/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm @@ -48,7 +48,8 @@ "You begin climbing through [src]...") if(!do_after(L, 30, target = L)) return - beckon(AM) + if(!istype(AM, /obj/effect/)) + beckon(AM) /obj/effect/clockwork/city_of_cogs_rift/proc/beckon(atom/movable/AM) var/turf/T = get_turf(pick(GLOB.city_of_cogs_spawns))