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

[MIRROR] Tiles blessed by holy water now block servant warp-in/Eminence snooping
This commit is contained in:
LetterJay
2017-12-25 21:27:17 -06:00
committed by GitHub
3 changed files with 19 additions and 1 deletions
@@ -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>")