Merge pull request #4986 from Citadel-Station-13/upstream-merge-34497

[MIRROR] Adds holy vision (Some mobs can now see blessed tiles)

code/modules/mob/mob_movement.dm

@@ -212,9 +212,13 @@
 						R.stun(20)
 					return
 				if(stepTurf.flags_1 & NOJAUNT_1)
-					to_chat(L, "<span class='warning'>Holy energies block your path.</span>")
-				else
-					L.loc = get_step(L, direct)
+					to_chat(L, "<span class='warning'>Some strange aura is blocking the way.</span>")
+					return
+				if (locate(/obj/effect/blessing, stepTurf))
+					to_chat(L, "<span class='warning'>Holy energies block your path!</span>")
+					return
+
+				L.loc = get_step(L, direct)
 			L.setDir(direct)
 	return TRUE
 

code/modules/spells/spell_types/ethereal_jaunt.dm

@@ -85,12 +85,18 @@
 		return
 	var/turf/newLoc = get_step(src,direction)
 	setDir(direction)
-	if(!(newLoc.flags_1 & NOJAUNT_1))
-		forceMove(newLoc)
-	else
-		to_chat(user, "<span class='warning'>Some strange aura is blocking the way!</span>")
+
 	movedelay = world.time + movespeed
 
+	if(newLoc.flags_1 & NOJAUNT_1)
+		to_chat(user, "<span class='warning'>Some strange aura is blocking the way.</span>")
+		return
+	if (locate(/obj/effect/blessing, newLoc))
+		to_chat(user, "<span class='warning'>Holy energies block your path!</span>")
+		return
+
+	forceMove(newLoc)
+
 /obj/effect/dummy/spell_jaunt/ex_act(blah)
 	return
 /obj/effect/dummy/spell_jaunt/bullet_act(blah)