Merge pull request #7766 from Sindorman/Sindorman/GC

Fixing GC issues with pipes

code/ATMOSPHERICS/atmospherics.dm

@@ -45,10 +45,6 @@ Pipelines + Other Objects -> Pipe network
 	if (mapload)
 		return INITIALIZE_HINT_LATELOAD
 
-/obj/machinery/atmospherics/Destroy()
-	..()
-	return QDEL_HINT_HARDDEL	// fuck it
-
 /obj/machinery/atmospherics/proc/atmos_init()
 
 // atmos_init() and Initialize() must be separate, as atmos_init() can be called multiple times after the machine has been initialized.

code/ATMOSPHERICS/components/unary/vent_scrubber.dm

@@ -54,6 +54,10 @@
 
 /obj/machinery/atmospherics/unary/vent_scrubber/Destroy()
 	unregister_radio(src, frequency)
+	if(initial_loc)
+		initial_loc.air_scrub_info -= id_tag
+		initial_loc.air_scrub_names -= id_tag
+
 	return ..()
 
 /obj/machinery/atmospherics/unary/vent_scrubber/update_icon(var/safety = 0)
@@ -310,9 +314,4 @@
 	if(welded)
 		to_chat(user, "It seems welded shut.")
 
-/obj/machinery/atmospherics/unary/vent_scrubber/Destroy()
-	if(initial_loc)
-		initial_loc.air_scrub_info -= id_tag
-		initial_loc.air_scrub_names -= id_tag
 
-	return ..()

code/ATMOSPHERICS/datum_pipe_network.dm

@@ -84,7 +84,7 @@
 	line_members = null
 
 	for (var/obj/machinery/atmospherics/thing in normal_members)
-		thing.remove_network(src)
+		thing.reassign_network(src, null)
 
 	normal_members = null
 

code/ATMOSPHERICS/datum_pipeline.dm

@@ -20,6 +20,8 @@
 	for (var/obj/machinery/atmospherics/pipe/thing in members)
 		thing.parent = null
 
+	members = null
+
 	return ..()
 
 /datum/pipeline/process()//This use to be called called from the pipe networks

code/ATMOSPHERICS/pipes.dm

@@ -67,7 +67,6 @@
 	QDEL_NULL(parent)
 	if(air_temporary)
 		loc.assume_air(air_temporary)
-		QDEL_NULL(air_temporary)
 
 	return ..()
 
@@ -233,11 +232,10 @@
 /obj/machinery/atmospherics/pipe/simple/Destroy()
 	if(node1)
 		node1.disconnect(src)
+		node1 = null
 	if(node2)
 		node2.disconnect(src)
-
-	node1 = null
-	node2 = null
+		node2 = null
 
 	return ..()
 
@@ -467,14 +465,13 @@
 /obj/machinery/atmospherics/pipe/manifold/Destroy()
 	if(node1)
 		node1.disconnect(src)
+		node1 = null
 	if(node2)
 		node2.disconnect(src)
+		node2 = null
 	if(node3)
 		node3.disconnect(src)
-
-	node1 = null
-	node2 = null
-	node3 = null
+		node3 = null
 
 	return ..()
 
@@ -712,17 +709,16 @@
 /obj/machinery/atmospherics/pipe/manifold4w/Destroy()
 	if(node1)
 		node1.disconnect(src)
+		node1 = null
 	if(node2)
 		node2.disconnect(src)
+		node2 = null
 	if(node3)
 		node3.disconnect(src)
+		node3 = null
 	if(node4)
 		node4.disconnect(src)
-
-	node1 = null
-	node2 = null
-	node3 = null
-	node4 = null
+		node4 = null
 
 	return ..()