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

[MIRROR] Adds holy vision (Some mobs can now see blessed tiles)
This commit is contained in:
LetterJay
2018-01-21 11:55:52 -06:00
committed by GitHub
11 changed files with 59 additions and 13 deletions
@@ -26,7 +26,7 @@
var/OldLoc = loc
if(NewLoc && !istype(NewLoc, /turf/open/indestructible/reebe_void))
var/turf/T = get_turf(NewLoc)
if(T.flags_1 & NOJAUNT_1)
for(var/obj/effect/blessing/B in T)
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)
@@ -224,7 +224,6 @@
invisibility = INVISIBILITY_ABSTRACT
revealed = FALSE
ghostize(0)//Don't re-enter invisible corpse
return
//reveal, stun, icon updates, cast checks, and essence changing
@@ -238,9 +238,10 @@
INVOKE_ASYNC(src, .proc/defile, T)
/obj/effect/proc_holder/spell/aoe_turf/revenant/defile/proc/defile(turf/T)
if(T.flags_1 & NOJAUNT_1)
T.flags_1 &= ~NOJAUNT_1
for(var/obj/effect/blessing/B in T)
qdel(B)
new /obj/effect/temp_visual/revenant(T)
if(!isplatingturf(T) && !istype(T, /turf/open/floor/engine/cult) && isfloorturf(T) && prob(15))
var/turf/open/floor/floor = T
if(floor.intact && floor.floor_tile)