Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	code/ZAS/Controller.dm
	code/datums/mind.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/living/silicon/pai/pai.dm

code/modules/power/breaker_box.dm

@@ -19,6 +19,11 @@
 	var/RCon_tag = "NO_TAG"
 	var/update_locked = 0
 
+/obj/machinery/power/breakerbox/Destroy()
+	..()
+	for(var/obj/nano_module/rcon/R in world)
+		R.FindDevices()
+
 /obj/machinery/power/breakerbox/activated
 	icon_state = "bbox_on"
 

code/modules/power/power.dm

@@ -17,6 +17,8 @@
 
 /obj/machinery/power/Destroy()
 	disconnect_from_network()
+	disconnect_terminal()
+
 	..()
 
 ///////////////////////////////

code/modules/power/smes.dm

@@ -84,10 +84,12 @@
 	return
 
 
-/obj/machinery/power/smes/Destroy()
+/obj/machinery/power/smes/disconnect_terminal()
 	if(terminal)
-		disconnect_terminal()
-	..()
+		terminal.master = null
+		terminal = null
+		return 1
+	return 0
 
 /obj/machinery/power/smes/update_icon()
 	overlays.Cut()

code/modules/power/smes_construction.dm

@@ -75,6 +75,13 @@
 	charge = 0
 	should_be_mapped = 1
 
+/obj/machinery/power/smes/buildable/Destroy()
+	..()
+	qdel(wires)
+	for(var/obj/nano_module/rcon/R in world)
+		R.FindDevices()
+
+
 // Proc: process()
 // Parameters: None
 // Description: Uses parent process, but if grounding wire is cut causes sparks to fly around.
@@ -343,6 +350,7 @@
 				M.icon_state = "box_1"
 				for(var/obj/I in component_parts)
 					I.loc = src.loc
+					component_parts -= I
 				qdel(src)
 				return