mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Movement fixes.
Ensures observers use Process_Incorpmove() despite being dead, while disallowing the once living from doing the same. Ensures incorporeal creatures denied moving unto holy ground don't keep calling more movement code.
This commit is contained in:
@@ -175,7 +175,7 @@
|
||||
|
||||
if(mob.control_object) Move_object(direct)
|
||||
|
||||
if(mob.incorporeal_move)
|
||||
if(mob.incorporeal_move && isobserver(mob))
|
||||
Process_Incorpmove(direct)
|
||||
return
|
||||
|
||||
@@ -200,6 +200,9 @@
|
||||
|
||||
if(isliving(mob))
|
||||
var/mob/living/L = mob
|
||||
if(L.incorporeal_move)//Move though walls
|
||||
Process_Incorpmove(direct)
|
||||
return
|
||||
if(mob.client)
|
||||
if(mob.client.view != world.view) // If mob moves while zoomed in with device, unzoom them.
|
||||
for(var/obj/item/item in mob.contents)
|
||||
@@ -371,6 +374,7 @@
|
||||
var/turf/T = get_step(mob, direct)
|
||||
if(mob.check_holy(T))
|
||||
mob << "<span class='warning'>You cannot get past holy grounds while you are in this plane of existence!</span>"
|
||||
return
|
||||
else
|
||||
mob.loc = get_step(mob, direct)
|
||||
mob.dir = direct
|
||||
|
||||
Reference in New Issue
Block a user