Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519

[MIRROR] Finishes the forceMove port

code/modules/research/experimentor.dm

@@ -219,8 +219,8 @@
 			return
 		var/turf/dropturf = get_turf(pick(view(1,src)))
 		if(!dropturf) //Failsafe to prevent the object being lost in the void forever.
-			dropturf = get_turf(src)
-		loaded_item.loc = dropturf
+			dropturf = drop_location()
+		loaded_item.forceMove(dropturf)
 		if(delete)
 			qdel(loaded_item)
 		loaded_item = null
@@ -510,7 +510,7 @@
 			throwSmoke(loc)
 			if(trackedRuntime)
 				throwSmoke(trackedRuntime.loc)
-				trackedRuntime.loc = loc
+				trackedRuntime.forceMove(drop_location())
 				investigate_log("Experimentor has stolen Runtime!", INVESTIGATE_EXPERIMENTOR)
 			else
 				new /mob/living/simple_animal/pet/cat(loc)