Pipenet overhaul

code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm

@@ -8,9 +8,9 @@
 
 	var/obj/machinery/atmospherics/node1
 	var/obj/machinery/atmospherics/node2
-
-	var/datum/pipe_network/network1
-	var/datum/pipe_network/network2
+	
+	var/datum/pipeline/parent1
+	var/datum/pipeline/parent2
 
 /obj/machinery/atmospherics/binary/New()
 	..()
@@ -23,6 +23,7 @@
 			initialize_directions = EAST|WEST
 		if(WEST)
 			initialize_directions = EAST|WEST
+		
 	air1 = new
 	air2 = new
 
@@ -30,38 +31,17 @@
 	air2.volume = 200
 
 /obj/machinery/atmospherics/binary/Destroy()
-	loc = null
-
 	if(node1)
 		node1.disconnect(src)
-		qdel(network1)
+		node1 = null
+		nullifyPipenet(parent1)
 	if(node2)
 		node2.disconnect(src)
-		qdel(network2)
-
-	node1 = null
-	node2 = null
-
+		node2 = null
+		nullifyPipenet(parent2)
 	return ..()
 
-// Housekeeping and pipe network stuff below
-/obj/machinery/atmospherics/binary/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
-	if(reference == node1)
-		network1 = new_network
-
-	else if(reference == node2)
-		network2 = new_network
-
-	if(new_network.normal_members.Find(src))
-		return 0
-
-	new_network.normal_members += src
-
-	return null
-
 /obj/machinery/atmospherics/binary/initialize()
-	if(node1 && node2) return
-
 	var/node2_connect = dir
 	var/node1_connect = turn(dir, 180)
 
@@ -70,7 +50,7 @@
 			var/c = check_connect_types(target,src)
 			if (c)
 				target.connected_to = c
-				src.connected_to = c
+				connected_to = c
 				node1 = target
 				break
 
@@ -79,7 +59,7 @@
 			var/c = check_connect_types(target,src)
 			if (c)
 				target.connected_to = c
-				src.connected_to = c
+				connected_to = c
 				node2 = target
 				break
 
@@ -87,56 +67,80 @@
 	update_underlays()
 
 /obj/machinery/atmospherics/binary/build_network()
-	if(!network1 && node1)
-		network1 = new /datum/pipe_network()
-		network1.normal_members += src
-		network1.build_network(node1, src)
+	if(!parent1)
+		parent1 = new /datum/pipeline()
+		parent1.build_pipeline(src)
 
-	if(!network2 && node2)
-		network2 = new /datum/pipe_network()
-		network2.normal_members += src
-		network2.build_network(node2, src)
-
-
-/obj/machinery/atmospherics/binary/return_network(obj/machinery/atmospherics/reference)
-	build_network()
-
-	if(reference==node1)
-		return network1
-
-	if(reference==node2)
-		return network2
-
-	return null
-
-/obj/machinery/atmospherics/binary/reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
-	if(network1 == old_network)
-		network1 = new_network
-	if(network2 == old_network)
-		network2 = new_network
-
-	return 1
-
-/obj/machinery/atmospherics/binary/return_network_air(datum/pipe_network/reference)
-	var/list/results = list()
-
-	if(network1 == reference)
-		results += air1
-	if(network2 == reference)
-		results += air2
-
-	return results
+	if(!parent2)
+		parent2 = new /datum/pipeline()
+		parent2.build_pipeline(src)
 
 /obj/machinery/atmospherics/binary/disconnect(obj/machinery/atmospherics/reference)
-	if(reference==node1)
-		qdel(network1)
+	if(reference == node1)
+		if(istype(node1, /obj/machinery/atmospherics/pipe))
+			qdel(parent1)
 		node1 = null
-
-	else if(reference==node2)
-		qdel(network2)
+	else if(reference == node2)
+		if(istype(node2, /obj/machinery/atmospherics/pipe))
+			qdel(parent2)
 		node2 = null
-
 	update_icon()
-	update_underlays()
 
-	return null
+/obj/machinery/atmospherics/binary/nullifyPipenet(datum/pipeline/P)
+	..()
+	if(P == parent1)
+		parent1.other_airs -= air1
+		parent1 = null
+	else if(P == parent2)
+		parent2.other_airs -= air2
+		parent2 = null
+
+/obj/machinery/atmospherics/binary/returnPipenetAir(datum/pipeline/P)
+	if(P == parent1)
+		return air1
+	else if(P == parent2)
+		return air2
+
+/obj/machinery/atmospherics/binary/pipeline_expansion(datum/pipeline/P)
+	if(P)
+		if(parent1 == P)
+			return list(node1)
+		else if(parent2 == P)
+			return list(node2)
+	else
+		return list(node1, node2)
+
+/obj/machinery/atmospherics/binary/setPipenet(datum/pipeline/P, obj/machinery/atmospherics/A)
+	if(A == node1)
+		parent1 = P
+	else if(A == node2)
+		parent2 = P
+
+/obj/machinery/atmospherics/binary/returnPipenet(obj/machinery/atmospherics/A)
+	if(A == node1)
+		return parent1
+	else if(A == node2)
+		return parent2
+
+/obj/machinery/atmospherics/binary/replacePipenet(datum/pipeline/Old, datum/pipeline/New)
+	if(Old == parent1)
+		parent1 = New
+	else if(Old == parent2)
+		parent2 = New
+	
+/obj/machinery/atmospherics/binary/unsafe_pressure_release(var/mob/user,var/pressures)
+	..()
+
+	var/turf/T = get_turf(src)
+	if(T)
+		//Remove the gas from air1+air2 and assume it
+		var/datum/gas_mixture/environment = T.return_air()
+		var/lost = pressures*environment.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
+		lost += pressures*environment.volume/(air2.temperature * R_IDEAL_GAS_EQUATION)
+		var/shared_loss = lost/2
+
+		var/datum/gas_mixture/to_release = air1.remove(shared_loss)
+		to_release.merge(air2.remove(shared_loss))
+		T.assume_air(to_release)
+		air_update_turf(1)
+