diff --git a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm index 8416e4651d..baf149093c 100644 --- a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm +++ b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm @@ -12,6 +12,7 @@ layer = FLY_LAYER faction = list("ratvar") lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + var/turf/last_failed_turf var/static/superheated_walls = 0 /mob/camera/eminence/CanPass(atom/movable/mover, turf/target) @@ -20,7 +21,18 @@ /mob/camera/eminence/Move(NewLoc, direct) var/OldLoc = loc if(NewLoc && !istype(NewLoc, /turf/open/indestructible/reebe_void)) - forceMove(get_turf(NewLoc)) + var/turf/T = get_turf(NewLoc) + if(T.flags_1 & NOJAUNT_1) + if(last_failed_turf != T) + T.visible_message("[T] suddenly emits a ringing sound!", ignore_mob = 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!") + return + if(istype(get_area(T), /area/chapel)) + to_chat(src, "The Chapel is hallowed ground under a heretical deity, and can't be accessed!") + return + forceMove(T) Moved(OldLoc, direct) if(GLOB.ratvar_awakens) for(var/turf/T in range(5, src)) diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 44d6d5abe4..786deaa56a 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -300,6 +300,9 @@ else if(isspaceturf(T)) to_chat(user, "[prob(1) ? "Servant cannot into space." : "You can't teleport into space."]") return + else if(T.flags_1 & NOJAUNT_1) + to_chat(user, "This tile is blessed by holy water and deflects the warp.") + return var/area/AR = get_area(T) if(!AR.clockwork_warp_allowed) to_chat(user, "[AR.clockwork_warp_fail]") diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index 3e7540cdf6..634767c98b 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -146,6 +146,9 @@ var/uses_overlay = TRUE var/obj/effect/clockwork/overlay/floor/realappearence +/turf/open/floor/clockwork/Bless() //Who needs holy blessings when you have DADDY RATVAR? + return + /turf/open/floor/clockwork/Initialize() . = ..() if(uses_overlay)