shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5143 from Citadel-Station-13/upstream-merge-34866

Browse Source 
[MIRROR] Fixes the eminence getting spammed by blessed tiles.
This commit is contained in:
LetterJay
2018-01-28 04:01:20 -06:00
committed by GitHub
parent 335bcfaff1 2b03dd5f0f
commit 2d4065e15c
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm
View File

@@ -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("<span class='warning'>[T] suddenly emits a ringing sound!</span>", null, null, null, 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>")
if ((world.time - lastWarning) >= 30)
lastWarning = world.time
to_chat(src, "<span class='warning'>This turf is consecrated and can't be crossed!</span>")
return
if(!GLOB.ratvar_awakens && 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>")
if ((world.time - lastWarning) >= 30)
lastWarning = world.time
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)