cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2452 from Duny-/defficiency

Browse Source 
Defficiency adjustments and anti_ethereal var improvements
This commit is contained in:
d3athrow
2015-01-07 13:52:53 -06:00
parent ed1dc002ba 4aea97604d
commit 55a1024038
7 changed files with 293 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/mob/dead/observer/observer.dm
View File

@@ -435,6 +435,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
var/area/thearea = ghostteleportlocs[A]
if(!thearea) return
if(thearea && thearea.anti_ethereal && !isAdminGhost(usr))
usr << "<span class='sinister'>As you are about to arrive, a strange dark form grabs you and sends you back where you came from.</span>"
return
var/list/L = list()
var/holyblock = 0
@@ -470,6 +474,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/dead/observer/proc/ManualFollow(var/atom/movable/target)
if(target)
var/turf/targetloc = get_turf(target)
var/area/targetarea = get_area(target)
if(targetarea && targetarea.anti_ethereal && !isAdminGhost(usr))
usr << "<span class='sinister'>You can sense a sinister force surrounding that mob, your spooky body itself refuses to follow it.</span>"
return
if(targetloc.holy && ((src.invisibility == 0) || (src.mind in ticker.mode.cult)))
usr << "<span class='warning'>You cannot follow a mob standing on holy grounds!</span>"
return
@@ -510,6 +518,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return
else
var/turf/targetloc = get_turf(target)
var/area/targetarea = get_area(target)
if(targetarea && targetarea.anti_ethereal && !isAdminGhost(usr))
usr << "<span class='sinister'>You can sense a sinister force surrounding that mob, your spooky body itself refuses to jump to it.</span>"
return
if(targetloc && targetloc.holy && ((src.invisibility == 0) || (src.mind in ticker.mode.cult)))
usr << "<span class='warning'>The mob that you are trying to follow is standing on holy grounds, you cannot reach him!</span>"
return

4
code/modules/mob/mob_movement.dm
View File

@@ -370,8 +370,8 @@
if(1)
var/turf/T = get_step(mob, direct)
var/area/A = get_area(T)
if(A && A.anti_ethereal)
mob << "<span class='warning'>A strong force repels you from this area!</span>"
if(A && A.anti_ethereal && !isAdminGhost(mob))
mob << "<span class='sinister'>A dark forcefield prevents you from entering the area.</span>"
else
if((T && T.holy) && isobserver(mob) && ((mob.invisibility == 0) || (ticker.mode && (mob.mind in ticker.mode.cult))))
mob << "<span class='warning'>You cannot get past holy grounds while you are in this plane of existence!</span>"