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

Remove Move modification for now (readd later bits by bits.

Browse Source
This commit is contained in:
ESwordTheCat
2014-07-11 01:47:41 -08:00
parent 73e768c923
commit ec2b4154f5
9 changed files with 137 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -288,11 +288,34 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/dead/observer/proc/reset_poltergeist_cooldown()
next_poltergeist=0
/mob/dead/observer/Move(NewLoc,Dir=0,step_x=0,step_y=0)
. = ..()
/mob/dead/observer/Move(NewLoc, direct)
dir = direct
if(NewLoc)
loc = NewLoc
for(var/obj/effect/step_trigger/S in NewLoc)
S.HasEntered(src)
//for(var/obj/effect/step_trigger/step_trigger in loc)
//step_trigger.HasEntered(src)
var/area/A = get_area_master(src)
if(A)
A.Entered(src)
return
loc = get_turf(src) //Get out of closets and such as a ghost
if((direct & NORTH) && y < world.maxy)
y++
else if((direct & SOUTH) && y > 1)
y--
if((direct & EAST) && x < world.maxx)
x++
else if((direct & WEST) && x > 1)
x--
for(var/obj/effect/step_trigger/S in locate(x, y, z)) //<-- this is dumb
S.HasEntered(src)
var/area/A = get_area_master(src)
if(A)
A.Entered(src)
/mob/dead/observer/examine()
if(usr)