From 0bc876423a4bc59edb3f8b9d579db3e8bcb5ed08 Mon Sep 17 00:00:00 2001 From: Kylerace Date: Fri, 14 May 2021 13:46:59 -0700 Subject: [PATCH] fixes issue with ghosts being able to affect the world, oversight from the crossed refactor (#59010) * as anything in _SendSignal * Revert "as anything in _SendSignal" This reverts commit 350c4b33d975d25003afb2cab2458a3026676559. * ghosts can no longer affect the world (hopefully) --- code/modules/mob/dead/observer/observer.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 01e562c78c2..da5cc94e0f5 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -123,7 +123,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) else T = SSmapping.get_station_center() - forceMove(T) + abstract_move(T) if(!name) //To prevent nameless ghosts name = random_unique_name(gender) @@ -334,10 +334,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(glide_size_override) set_glide_size(glide_size_override) if(NewLoc) - forceMove(NewLoc) + abstract_move(NewLoc) update_parallax_contents() else - forceMove(get_turf(src)) //Get out of closets and such as a ghost + abstract_move(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) @@ -439,7 +439,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp to_chat(usr, "No area available.") return - usr.forceMove(pick(L)) + usr.abstract_move(pick(L)) update_parallax_contents() /mob/dead/observer/verb/follow() @@ -510,7 +510,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/turf/T = get_turf(M) //Turf of the destination mob if(T && isturf(T)) //Make sure the turf exists, then move the source to that destination. - A.forceMove(T) + A.abstract_move(T) A.update_parallax_contents() else to_chat(A, "This mob is not located in the game world.") @@ -705,7 +705,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/tz = text2num(href_list["z"]) var/turf/target = locate(tx, ty, tz) if(istype(target)) - forceMove(target) + abstract_move(target) return if(href_list["reenter"]) reenter_corpse()