diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 3d53dd8cbde..f48fce27d2d 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -108,15 +108,14 @@ ..() /atom/movable/proc/forceMove(atom/destination) + if(loc) + loc.Exited(src) + loc = destination if(destination) - if(loc) - loc.Exited(src) - loc = destination loc.Entered(src) for(var/atom/movable/AM in loc) AM.Crossed(src) - return 1 - return 0 + return 1 //called when src is thrown into hit_atom /atom/movable/proc/throw_impact(atom/hit_atom, var/speed)