From 643e58714e70f5fc198dc63b7a7cc05f8225e427 Mon Sep 17 00:00:00 2001 From: Dax Dupont Date: Sat, 27 Jan 2018 21:35:34 +0100 Subject: [PATCH 1/2] Fixes the eminence getting spammed by blessed tiles. (#34866) * Fixes the eminence getting spammed by blessed tiles. * Forgot to commit this * world time meme --- .../game/gamemodes/clock_cult/clock_mobs/_eminence.dm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm index 440ad85397..6f6dc69461 100644 --- a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm +++ b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm @@ -18,6 +18,7 @@ lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE var/turf/last_failed_turf var/static/superheated_walls = 0 + var/lastWarning = 0 /mob/camera/eminence/CanPass(atom/movable/mover, turf/target) return TRUE @@ -26,15 +27,19 @@ var/OldLoc = loc if(NewLoc && !istype(NewLoc, /turf/open/indestructible/reebe_void)) var/turf/T = get_turf(NewLoc) - for(var/obj/effect/blessing/B in T) + if (locate(/obj/effect/blessing, T)) if(last_failed_turf != T) T.visible_message("[T] suddenly emits a ringing sound!", null, null, null, src) playsound(T, 'sound/machines/clockcult/ark_damage.ogg', 75, FALSE) last_failed_turf = T - to_chat(src, "This turf is consecrated and can't be crossed!") + if ((world.time - lastWarning) >= 30) + lastWarning = world.time + to_chat(src, "This turf is consecrated and can't be crossed!") return if(!GLOB.ratvar_awakens && istype(get_area(T), /area/chapel)) - to_chat(src, "The Chapel is hallowed ground under a heretical deity, and can't be accessed!") + if ((world.time - lastWarning) >= 30) + lastWarning = world.time + to_chat(src, "The Chapel is hallowed ground under a heretical deity, and can't be accessed!") return forceMove(T) Moved(OldLoc, direct)