Merge branch 'master' into upstream-merge-33246

code/modules/power/singularity/collector.dm

@@ -132,7 +132,7 @@
 	var/obj/item/tank/internals/plasma/Z = src.loaded_tank
 	if (!Z)
 		return
-	Z.loc = get_turf(src)
+	Z.forceMove(drop_location())
 	Z.layer = initial(Z.layer)
 	Z.plane = initial(Z.plane)
 	src.loaded_tank = null

code/modules/power/singularity/field_generator.dm

@@ -285,9 +285,8 @@ field_generator power level display
 		var/field_dir = get_dir(T,get_step(G.loc, NSEW))
 		T = get_step(T, NSEW)
 		if(!locate(/obj/machinery/field/containment) in T)
-			var/obj/machinery/field/containment/CF = new/obj/machinery/field/containment()
+			var/obj/machinery/field/containment/CF = new(T)
 			CF.set_master(src,G)
-			CF.loc = T
 			CF.setDir(field_dir)
 			fields += CF
 			G.fields += CF