Polaris sync

code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm

@@ -1,4 +1,4 @@
-obj/machinery/atmospherics/binary
+/obj/machinery/atmospherics/binary
 	dir = SOUTH
 	initialize_directions = SOUTH|NORTH
 	use_power = 1
@@ -9,123 +9,131 @@ obj/machinery/atmospherics/binary
 	var/datum/pipe_network/network1
 	var/datum/pipe_network/network2
 
-	New()
-		..()
-		switch(dir)
-			if(NORTH)
-				initialize_directions = NORTH|SOUTH
-			if(SOUTH)
-				initialize_directions = NORTH|SOUTH
-			if(EAST)
-				initialize_directions = EAST|WEST
-			if(WEST)
-				initialize_directions = EAST|WEST
-		air1 = new
-		air2 = new
+/obj/machinery/atmospherics/binary/New()
+	..()
 
-		air1.volume = 200
-		air2.volume = 200
+	air1 = new
+	air2 = new
+
+	air1.volume = 200
+	air2.volume = 200
+
+/obj/machinery/atmospherics/binary/init_dir()
+	switch(dir)
+		if(NORTH)
+			initialize_directions = NORTH|SOUTH
+		if(SOUTH)
+			initialize_directions = NORTH|SOUTH
+		if(EAST)
+			initialize_directions = EAST|WEST
+		if(WEST)
+			initialize_directions = EAST|WEST
 
 // Housekeeping and pipe network stuff below
-	network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
-		if(reference == node1)
-			network1 = new_network
+/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
+	else if(reference == node2)
+		network2 = new_network
 
-		if(new_network.normal_members.Find(src))
-			return 0
+	if(new_network.normal_members.Find(src))
+		return 0
 
-		new_network.normal_members += src
+	new_network.normal_members += src
 
-		return null
+	return null
 
-	Destroy()
-		. = ..()
+/obj/machinery/atmospherics/binary/Destroy()
+	. = ..()
 
-		if(node1)
-			node1.disconnect(src)
-			qdel(network1)
-		if(node2)
-			node2.disconnect(src)
-			qdel(network2)
+	if(node1)
+		node1.disconnect(src)
+		qdel(network1)
+	if(node2)
+		node2.disconnect(src)
+		qdel(network2)
 
+	node1 = null
+	node2 = null
+
+/obj/machinery/atmospherics/binary/initialize()
+	if(node1 && node2)
+		return
+
+	init_dir()
+
+	var/node2_connect = dir
+	var/node1_connect = turn(dir, 180)
+
+	for(var/obj/machinery/atmospherics/target in get_step(src,node1_connect))
+		target.init_dir()
+		if(target.initialize_directions & get_dir(target,src))
+			if (check_connect_types(target,src))
+				node1 = target
+				break
+
+	for(var/obj/machinery/atmospherics/target in get_step(src,node2_connect))
+		target.init_dir()
+		if(target.initialize_directions & get_dir(target,src))
+			if (check_connect_types(target,src))
+				node2 = target
+				break
+
+	update_icon()
+	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(!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
+
+/obj/machinery/atmospherics/binary/disconnect(obj/machinery/atmospherics/reference)
+	if(reference==node1)
+		qdel(network1)
 		node1 = null
+
+	else if(reference==node2)
+		qdel(network2)
 		node2 = null
 
-	initialize()
-		if(node1 && node2) return
+	update_icon()
+	update_underlays()
 
-		var/node2_connect = dir
-		var/node1_connect = turn(dir, 180)
-
-		for(var/obj/machinery/atmospherics/target in get_step(src,node1_connect))
-			if(target.initialize_directions & get_dir(target,src))
-				if (check_connect_types(target,src))
-					node1 = target
-					break
-
-		for(var/obj/machinery/atmospherics/target in get_step(src,node2_connect))
-			if(target.initialize_directions & get_dir(target,src))
-				if (check_connect_types(target,src))
-					node2 = target
-					break
-
-		update_icon()
-		update_underlays()
-
-	build_network()
-		if(!network1 && node1)
-			network1 = new /datum/pipe_network()
-			network1.normal_members += src
-			network1.build_network(node1, src)
-
-		if(!network2 && node2)
-			network2 = new /datum/pipe_network()
-			network2.normal_members += src
-			network2.build_network(node2, src)
-
-
-	return_network(obj/machinery/atmospherics/reference)
-		build_network()
-
-		if(reference==node1)
-			return network1
-
-		if(reference==node2)
-			return network2
-
-		return null
-
-	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
-
-	return_network_air(datum/pipe_network/reference)
-		var/list/results = list()
-
-		if(network1 == reference)
-			results += air1
-		if(network2 == reference)
-			results += air2
-
-		return results
-
-	disconnect(obj/machinery/atmospherics/reference)
-		if(reference==node1)
-			qdel(network1)
-			node1 = null
-
-		else if(reference==node2)
-			qdel(network2)
-			node2 = null
-
-		update_icon()
-		update_underlays()
-
-		return null
+	return null

code/ATMOSPHERICS/components/binary_devices/passive_gate.dm

@@ -242,10 +242,8 @@
 	if (unlocked)
 		user << "<span class='warning'>You cannot unwrench \the [src], turn it off first.</span>"
 		return 1
-	var/datum/gas_mixture/int_air = return_air()
-	var/datum/gas_mixture/env_air = loc.return_air()
-	if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-		user << "<span class='warning'>You cannot unwrench \the [src], it too exerted due to internal pressure.</span>"
+	if(!can_unwrench())
+		to_chat(user, "<span class='warning'>You cannot unwrench \the [src], it too exerted due to internal pressure.</span>")
 		add_fingerprint(user)
 		return 1
 	playsound(src, W.usesound, 50, 1)

code/ATMOSPHERICS/components/binary_devices/pump.dm

@@ -221,10 +221,8 @@ Thus, the two variables affect pump operation are set in New():
 	if (!(stat & NOPOWER) && use_power)
 		user << "<span class='warning'>You cannot unwrench this [src], turn it off first.</span>"
 		return 1
-	var/datum/gas_mixture/int_air = return_air()
-	var/datum/gas_mixture/env_air = loc.return_air()
-	if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-		user << "<span class='warning'>You cannot unwrench this [src], it too exerted due to internal pressure.</span>"
+	if(!can_unwrench())
+		to_chat(user, "<span class='warning'>You cannot unwrench this [src], it too exerted due to internal pressure.</span>")
 		add_fingerprint(user)
 		return 1
 	playsound(src, W.usesound, 50, 1)