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

[MIRROR] Finishes the forceMove port
2017-12-17 20:28:07 -06:00
parent 9a30c288f0 67e7f62416
commit 3895eb9eac
110 changed files with 364 additions and 372 deletions
@@ -739,7 +739,7 @@ GLOBAL_PROTECT(LastAdminCalledProc)
 				Plasma.air_contents.gases[/datum/gas/plasma][MOLES] = 70
 				Rad.drainratio = 0
 				Rad.loaded_tank = Plasma
-				Plasma.loc = Rad
+				Plasma.forceMove(Rad)

 			if(!Rad.active)
 				Rad.toggle_power()