Merge pull request #3252 from Citadel-Station-13/upstream-merge-31441

[MIRROR] Fixes a forceMove(null)
2017-10-09 23:01:51 -04:00
parent d0335ebba6 4b9d832a73
commit 95031ae187
1 changed files with 2 additions and 2 deletions
@@ -100,8 +100,8 @@
 	if(do_after(user, 30, target = AM))
 		if(!user.temporarilyRemoveItemFromInventory(src))
 			return
-		src.target = AM
-		forceMove(null)	//Yep
+		target = AM
+		moveToNullspace()	//Yep

 		if(istype(AM, /obj/item)) //your crappy throwing star can't fly so good with a giant brick of c4 on it.
 			var/obj/item/I = AM