Merge pull request #4482 from Citadel-Station-13/upstream-merge-33584

[MIRROR] Tiles blessed by holy water now block servant warp-in/Eminence snooping

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("<span class='warning'>[T] suddenly emits a ringing sound!</span>", ignore_mob = src)
+				playsound(T, 'sound/machines/clockcult/ark_damage.ogg', 75, FALSE)
+				last_failed_turf = T
+			to_chat(src, "<span class='warning'>This turf is consecrated and can't be crossed!</span>")
+			return
+		if(istype(get_area(T), /area/chapel))
+			to_chat(src, "<span class='warning'>The Chapel is hallowed ground under a heretical deity, and can't be accessed!</span>")
+			return
+		forceMove(T)
 	Moved(OldLoc, direct)
 	if(GLOB.ratvar_awakens)
 		for(var/turf/T in range(5, src))

code/game/machinery/computer/camera_advanced.dm

@@ -300,6 +300,9 @@
 	else if(isspaceturf(T))
 		to_chat(user, "<span class='sevtug_small'>[prob(1) ? "Servant cannot into space." : "You can't teleport into space."]</span>")
 		return
+	else if(T.flags_1 & NOJAUNT_1)
+		to_chat(user, "<span class='sevtug_small'>This tile is blessed by holy water and deflects the warp.</span>")
+		return
 	var/area/AR = get_area(T)
 	if(!AR.clockwork_warp_allowed)
 		to_chat(user, "<span class='sevtug_small'>[AR.clockwork_warp_fail]</span>")

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)