Merge branch 'master' into upstream-merge-33498

code/modules/power/antimatter/control.dm

@@ -339,7 +339,7 @@
 
 	if(href_list["ejectjar"])
 		if(fueljar)
-			fueljar.loc = src.loc
+			fueljar.forceMove(drop_location())
 			fueljar = null
 			//fueljar.control_unit = null currently it does not care where it is
 			//update_icon() when we have the icon for it

code/modules/power/apc.dm

@@ -972,7 +972,7 @@
 	else
 		to_chat(occupier, "<span class='danger'>Primary core damaged, unable to return core processes.</span>")
 		if(forced)
-			occupier.loc = src.loc
+			occupier.forceMove(drop_location())
 			occupier.death()
 			occupier.gib()
 			for(var/obj/item/pinpointer/nuke/P in GLOB.pinpointer_list)

code/modules/power/cable.dm

@@ -427,7 +427,7 @@ By design, d1 is the smallest direction and d2 is the highest
 	var/obj/O = P_list[1]
 	// remove the cut cable from its turf and powernet, so that it doesn't get count in propagate_network worklist
 	if(remove)
-		loc = null
+		moveToNullspace()
 	powernet.remove_cable(src) //remove the cut cable from its powernet
 
 	addtimer(CALLBACK(O, .proc/auto_propogate_cut_cable, O), 0) //so we don't rebuild the network X times when singulo/explosion destroys a line of X cables
@@ -472,6 +472,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 	attack_verb = list("whipped", "lashed", "disciplined", "flogged")
 	singular_name = "cable piece"
 	full_w_class = WEIGHT_CLASS_SMALL
+	grind_results = list("copper" = 2) //2 copper per cable in the coil
 
 /obj/item/stack/cable_coil/cyborg
 	is_cyborg = 1

code/modules/power/cell.dm

@@ -14,6 +14,7 @@
 	var/charge = 0	// note %age conveted to actual charge in New
 	var/maxcharge = 1000
 	materials = list(MAT_METAL=700, MAT_GLASS=50)
+	grind_results = list("lithium" = 15, "iron" = 5, "silicon" = 5)
 	var/rigged = 0		// true if rigged to explode
 	var/chargerate = 100 //how much power is given every tick in a recharger
 	var/self_recharge = 0 //does it self recharge, over time, or not?
@@ -107,6 +108,7 @@
 		to_chat(user, "<span class='notice'>You inject the solution into the power cell.</span>")
 		if(S.reagents.has_reagent("plasma", 5))
 			rigged = 1
+			grind_results["plasma"] = 5
 		S.reagents.clear_reagents()
 
 

code/modules/power/lighting.dm

@@ -680,6 +680,7 @@
 	var/base_state
 	var/switchcount = 0	// number of times switched
 	materials = list(MAT_GLASS=100)
+	grind_results = list("silicon" = 5, "nitrogen" = 10) //Nitrogen is used as a cheaper alternative to argon in incandescent lighbulbs
 	var/rigged = 0		// true if rigged to explode
 	var/brightness = 2 //how much light it gives off
 

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

code/modules/power/solar.dm

@@ -419,7 +419,7 @@
 				new /obj/item/shard( src.loc )
 				var/obj/item/circuitboard/computer/solar_control/M = new /obj/item/circuitboard/computer/solar_control( A )
 				for (var/obj/C in src)
-					C.loc = src.loc
+					C.forceMove(drop_location())
 				A.circuit = M
 				A.state = 3
 				A.icon_state = "3"
@@ -430,7 +430,7 @@
 				var/obj/structure/frame/computer/A = new /obj/structure/frame/computer( src.loc )
 				var/obj/item/circuitboard/computer/solar_control/M = new /obj/item/circuitboard/computer/solar_control( A )
 				for (var/obj/C in src)
-					C.loc = src.loc
+					C.forceMove(drop_location())
 				A.circuit = M
 				A.state = 4
 				A.icon_state = "4"

code/modules/power/tracker.dm

@@ -47,7 +47,7 @@
 		S.glass_type = /obj/item/stack/sheet/glass
 		S.tracker = 1
 		S.anchored = TRUE
-	S.loc = src
+	S.forceMove(src)
 	update_icon()
 
 //updates the tracker icon and the facing angle for the control computer
@@ -94,4 +94,4 @@
 // Tracker Electronic
 
 /obj/item/electronics/tracker
-	name = "tracker electronics"
+	name = "tracker electronics"