Merge branch 'master' into upstream-merge-33498

code/modules/atmospherics/machinery/portable/pump.dm

@@ -135,7 +135,7 @@
 				investigate_log("was set to [pump.target_pressure] kPa by [key_name(usr)].", INVESTIGATE_ATMOS)
 		if("eject")
 			if(holding)
-				holding.loc = get_turf(src)
+				holding.forceMove(drop_location())
 				holding = null
 				. = TRUE
 	update_icon()

code/modules/atmospherics/machinery/portable/scrubber.dm

@@ -96,7 +96,7 @@
 			. = TRUE
 		if("eject")
 			if(holding)
-				holding.loc = get_turf(src)
+				holding.forceMove(drop_location())
 				holding = null
 				. = TRUE
 		if("toggle_filter")