From ff1e2de209311b7aaf1d2037f1888b5aa0413e7b Mon Sep 17 00:00:00 2001 From: VampyrBytes Date: Thu, 25 Feb 2016 08:55:24 +0000 Subject: [PATCH] Allows forceMove to move objects to nullspace as discussed with @tigercat2000 [here](https://github.com/ParadiseSS13/Paradise/pull/2903/files#r54054665) forceMove now works when the destination is null --- code/game/atoms_movable.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index d88ce84ae37..2dcd9d8fad5 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -109,15 +109,14 @@ return /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)