Initial Commit

code/ATMOSPHERICS/atmospherics.dm

@@ -0,0 +1,57 @@
+/*
+Quick overview:
+
+Pipes combine to form pipelines
+Pipelines and other atmospheric objects combine to form pipe_networks
+	Note: A single pipe_network represents a completely open space
+
+Pipes -> Pipelines
+Pipelines + Other Objects -> Pipe network
+
+*/
+
+obj/machinery/atmospherics
+	anchored = 1
+	idle_power_usage = 0
+	active_power_usage = 0
+	power_channel = ENVIRON
+	var/nodealert = 0
+
+
+
+obj/machinery/atmospherics/var/initialize_directions = 0
+obj/machinery/atmospherics/var/pipe_color
+
+obj/machinery/atmospherics/process()
+	build_network()
+
+obj/machinery/atmospherics/proc/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+	// Check to see if should be added to network. Add self if so and adjust variables appropriately.
+	// Note don't forget to have neighbors look as well!
+
+	return null
+
+obj/machinery/atmospherics/proc/build_network()
+	// Called to build a network from this node
+
+	return null
+
+obj/machinery/atmospherics/proc/return_network(obj/machinery/atmospherics/reference)
+	// Returns pipe_network associated with connection to reference
+	// Notes: should create network if necessary
+	// Should never return null
+
+	return null
+
+obj/machinery/atmospherics/proc/reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
+	// Used when two pipe_networks are combining
+
+obj/machinery/atmospherics/proc/return_network_air(datum/network/reference)
+	// Return a list of gas_mixture(s) in the object
+	//		associated with reference pipe_network for use in rebuilding the networks gases list
+	// Is permitted to return null
+
+obj/machinery/atmospherics/proc/disconnect(obj/machinery/atmospherics/reference)
+
+obj/machinery/atmospherics/update_icon()
+	return null

code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm

@@ -0,0 +1,130 @@
+obj/machinery/atmospherics/binary
+	dir = SOUTH
+	initialize_directions = SOUTH|NORTH
+	use_power = 1
+
+	var/datum/gas_mixture/air1
+	var/datum/gas_mixture/air2
+
+	var/obj/machinery/atmospherics/node1
+	var/obj/machinery/atmospherics/node2
+
+	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
+
+		air1.volume = 200
+		air2.volume = 200
+
+// Housekeeping and pipe network stuff below
+	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
+
+	Del()
+		loc = null
+
+		if(node1)
+			node1.disconnect(src)
+			del(network1)
+		if(node2)
+			node2.disconnect(src)
+			del(network2)
+
+		node1 = null
+		node2 = null
+
+		..()
+
+	initialize()
+		if(node1 && node2) return
+
+		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))
+				node1 = target
+				break
+
+		for(var/obj/machinery/atmospherics/target in get_step(src,node2_connect))
+			if(target.initialize_directions & get_dir(target,src))
+				node2 = target
+				break
+
+		update_icon()
+
+	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)
+			del(network1)
+			node1 = null
+
+		else if(reference==node2)
+			del(network2)
+			node2 = null
+
+		return null

code/ATMOSPHERICS/components/binary_devices/circulator.dm

@@ -0,0 +1,127 @@
+//node1, air1, network1 correspond to input
+//node2, air2, network2 correspond to output
+
+/obj/machinery/atmospherics/binary/circulator
+	name = "circulator/heat exchanger"
+	desc = "A gas circulator pump and heat exchanger."
+	icon = 'icons/obj/pipes.dmi'
+	icon_state = "circ-off"
+	anchored = 0
+
+	var/recent_moles_transferred = 0
+	var/last_heat_capacity = 0
+	var/last_temperature = 0
+	var/last_pressure_delta = 0
+	var/last_worldtime_transfer = 0
+
+	density = 1
+
+/obj/machinery/atmospherics/binary/circulator/New()
+	..()
+	desc = initial(desc) + "  Its outlet port is to the [dir2text(dir)]."
+
+/obj/machinery/atmospherics/binary/circulator/proc/return_transfer_air()
+	var/datum/gas_mixture/removed
+	if(anchored && !(stat&BROKEN) )
+		var/input_starting_pressure = air1.return_pressure()
+		var/output_starting_pressure = air2.return_pressure()
+		last_pressure_delta = max(input_starting_pressure - output_starting_pressure + 10, 0)
+
+		//only circulate air if there is a pressure difference (plus 10 kPa to represent friction in the machine)
+		if(air1.temperature > 0 && last_pressure_delta > 0)
+
+			//Calculate necessary moles to transfer using PV = nRT
+			recent_moles_transferred = last_pressure_delta*air2.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
+
+			//Actually transfer the gas
+			removed = air1.remove(recent_moles_transferred)
+			if(removed)
+				last_heat_capacity = removed.heat_capacity()
+				last_temperature = removed.temperature
+
+				//Update the gas networks.
+				if(network1)
+					network1.update = 1
+
+				last_worldtime_transfer = world.time
+		else
+			recent_moles_transferred = 0
+
+		update_icon()
+		return removed
+
+/obj/machinery/atmospherics/binary/circulator/process()
+	..()
+
+	if(last_worldtime_transfer < world.time - 50)
+		recent_moles_transferred = 0
+		update_icon()
+
+/obj/machinery/atmospherics/binary/circulator/update_icon()
+	if(stat & (BROKEN|NOPOWER) || !anchored)
+		icon_state = "circ-p"
+	else if(last_pressure_delta > 0 && recent_moles_transferred > 0)
+		if(last_pressure_delta > 5*ONE_ATMOSPHERE)
+			icon_state = "circ-run"
+		else
+			icon_state = "circ-slow"
+	else
+		icon_state = "circ-off"
+
+	return 1
+
+/obj/machinery/atmospherics/binary/circulator/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/wrench))
+		anchored = !anchored
+		user << "\blue You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor."
+
+		if(anchored)
+			if(dir & (NORTH|SOUTH))
+				initialize_directions = NORTH|SOUTH
+			else if(dir & (EAST|WEST))
+				initialize_directions = EAST|WEST
+
+			initialize()
+			build_network()
+			if (node1)
+				node1.initialize()
+				node1.build_network()
+			if (node2)
+				node2.initialize()
+				node2.build_network()
+		else
+			if(node1)
+				node1.disconnect(src)
+				del(network1)
+			if(node2)
+				node2.disconnect(src)
+				del(network2)
+
+			node1 = null
+			node2 = null
+
+	else
+		..()
+
+/obj/machinery/atmospherics/binary/circulator/verb/rotate_clockwise()
+	set category = "Object"
+	set name = "Rotate Circulator (Clockwise)"
+	set src in view(1)
+
+	if (usr.stat || usr.restrained() || anchored)
+		return
+
+	src.dir = turn(src.dir, 90)
+	desc = initial(desc) + " Its outlet port is to the [dir2text(dir)]."
+
+
+/obj/machinery/atmospherics/binary/circulator/verb/rotate_anticlockwise()
+	set category = "Object"
+	set name = "Rotate Circulator (Counterclockwise)"
+	set src in view(1)
+
+	if (usr.stat || usr.restrained() || anchored)
+		return
+
+	src.dir = turn(src.dir, -90)
+	desc = initial(desc) + " Its outlet port is to the [dir2text(dir)]."

code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm

@@ -0,0 +1,199 @@
+/obj/machinery/atmospherics/binary/dp_vent_pump
+	icon = 'icons/obj/atmospherics/dp_vent_pump.dmi'
+	icon_state = "off"
+
+	//node2 is output port
+	//node1 is input port
+
+	name = "Dual Port Air Vent"
+	desc = "Has a valve and pump attached to it. There are two ports."
+
+	level = 1
+
+	high_volume
+		name = "Large Dual Port Air Vent"
+
+		New()
+			..()
+
+			air1.volume = 1000
+			air2.volume = 1000
+
+	var/on = 0
+	var/pump_direction = 1 //0 = siphoning, 1 = releasing
+
+	var/external_pressure_bound = ONE_ATMOSPHERE
+	var/input_pressure_min = 0
+	var/output_pressure_max = 0
+
+	var/pressure_checks = 1
+	//1: Do not pass external_pressure_bound
+	//2: Do not pass input_pressure_min
+	//4: Do not pass output_pressure_max
+
+	update_icon()
+		if(on)
+			if(pump_direction)
+				icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]out"
+			else
+				icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]in"
+		else
+			icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off"
+			on = 0
+
+		return
+
+	hide(var/i) //to make the little pipe section invisible, the icon changes.
+		if(on)
+			if(pump_direction)
+				icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]out"
+			else
+				icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]in"
+		else
+			icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off"
+			on = 0
+		return
+
+	process()
+		..()
+
+		if(!on)
+			return 0
+
+		var/datum/gas_mixture/environment = loc.return_air()
+		var/environment_pressure = environment.return_pressure()
+
+		if(pump_direction) //input -> external
+			var/pressure_delta = 10000
+
+			if(pressure_checks&1)
+				pressure_delta = min(pressure_delta, (external_pressure_bound - environment_pressure))
+			if(pressure_checks&2)
+				pressure_delta = min(pressure_delta, (air1.return_pressure() - input_pressure_min))
+
+			if(pressure_delta > 0)
+				if(air1.temperature > 0)
+					var/transfer_moles = pressure_delta*environment.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
+
+					var/datum/gas_mixture/removed = air1.remove(transfer_moles)
+
+					loc.assume_air(removed)
+
+					if(network1)
+						network1.update = 1
+
+		else //external -> output
+			var/pressure_delta = 10000
+
+			if(pressure_checks&1)
+				pressure_delta = min(pressure_delta, (environment_pressure - external_pressure_bound))
+			if(pressure_checks&4)
+				pressure_delta = min(pressure_delta, (output_pressure_max - air2.return_pressure()))
+
+			if(pressure_delta > 0)
+				if(environment.temperature > 0)
+					var/transfer_moles = pressure_delta*air2.volume/(environment.temperature * R_IDEAL_GAS_EQUATION)
+
+					var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
+
+					air2.merge(removed)
+
+					if(network2)
+						network2.update = 1
+
+		return 1
+
+	//Radio remote control
+
+	proc
+		set_frequency(new_frequency)
+			radio_controller.remove_object(src, frequency)
+			frequency = new_frequency
+			if(frequency)
+				radio_connection = radio_controller.add_object(src, frequency, filter = RADIO_ATMOSIA)
+
+		broadcast_status()
+			if(!radio_connection)
+				return 0
+
+			var/datum/signal/signal = new
+			signal.transmission_method = 1 //radio signal
+			signal.source = src
+
+			signal.data = list(
+				"tag" = id,
+				"device" = "ADVP",
+				"power" = on,
+				"direction" = pump_direction?("release"):("siphon"),
+				"checks" = pressure_checks,
+				"input" = input_pressure_min,
+				"output" = output_pressure_max,
+				"external" = external_pressure_bound,
+				"sigtype" = "status"
+			)
+			radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
+
+			return 1
+
+	var/frequency = 0
+	var/id = null
+	var/datum/radio_frequency/radio_connection
+
+	initialize()
+		..()
+		if(frequency)
+			set_frequency(frequency)
+
+	receive_signal(datum/signal/signal)
+
+		if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
+			return 0
+		if("power" in signal.data)
+			on = text2num(signal.data["power"])
+
+		if("power_toggle" in signal.data)
+			on = !on
+
+		if("set_direction" in signal.data)
+			pump_direction = text2num(signal.data["set_direction"])
+
+		if("checks" in signal.data)
+			pressure_checks = text2num(signal.data["checks"])
+
+		if("purge" in signal.data)
+			pressure_checks &= ~1
+			pump_direction = 0
+
+		if("stabalize" in signal.data)
+			pressure_checks |= 1
+			pump_direction = 1
+
+		if("set_input_pressure" in signal.data)
+			input_pressure_min = between(
+				0,
+				text2num(signal.data["set_input_pressure"]),
+				ONE_ATMOSPHERE*50
+			)
+
+		if("set_output_pressure" in signal.data)
+			output_pressure_max = between(
+				0,
+				text2num(signal.data["set_output_pressure"]),
+				ONE_ATMOSPHERE*50
+			)
+
+		if("set_external_pressure" in signal.data)
+			external_pressure_bound = between(
+				0,
+				text2num(signal.data["set_external_pressure"]),
+				ONE_ATMOSPHERE*50
+			)
+
+		if("status" in signal.data)
+			spawn(2)
+				broadcast_status()
+			return //do not update_icon
+		//if(signal.data["tag"])
+		spawn(2)
+			broadcast_status()
+		update_icon()

code/ATMOSPHERICS/components/binary_devices/passive_gate.dm

@@ -0,0 +1,188 @@
+obj/machinery/atmospherics/binary/passive_gate
+	//Tries to achieve target pressure at output (like a normal pump) except
+	//	Uses no power but can not transfer gases from a low pressure area to a high pressure area
+	icon = 'icons/obj/atmospherics/passive_gate.dmi'
+	icon_state = "intact_off"
+
+	name = "Passive gate"
+	desc = "A one-way air valve that does not require power"
+
+	var/on = 0
+	var/target_pressure = ONE_ATMOSPHERE
+
+	var/frequency = 0
+	var/id = null
+	var/datum/radio_frequency/radio_connection
+
+	update_icon()
+		if(stat & NOPOWER)
+			icon_state = "intact_off"
+		else if(node1 && node2)
+			icon_state = "intact_[on?("on"):("off")]"
+		else
+			if(node1)
+				icon_state = "exposed_1_off"
+			else if(node2)
+				icon_state = "exposed_2_off"
+			else
+				icon_state = "exposed_3_off"
+		return
+
+	process()
+		..()
+		if(!on)
+			return 0
+
+		var/output_starting_pressure = air2.return_pressure()
+		var/input_starting_pressure = air1.return_pressure()
+
+		if(output_starting_pressure >= min(target_pressure,input_starting_pressure-10))
+			//No need to pump gas if target is already reached or input pressure is too low
+			//Need at least 10 KPa difference to overcome friction in the mechanism
+			return 1
+
+		//Calculate necessary moles to transfer using PV = nRT
+		if((air1.total_moles() > 0) && (air1.temperature>0))
+			var/pressure_delta = min(target_pressure - output_starting_pressure, (input_starting_pressure - output_starting_pressure)/2)
+			//Can not have a pressure delta that would cause output_pressure > input_pressure
+
+			var/transfer_moles = pressure_delta*air2.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
+
+			//Actually transfer the gas
+			var/datum/gas_mixture/removed = air1.remove(transfer_moles)
+			air2.merge(removed)
+
+			if(network1)
+				network1.update = 1
+
+			if(network2)
+				network2.update = 1
+
+
+	//Radio remote control
+
+	proc
+		set_frequency(new_frequency)
+			radio_controller.remove_object(src, frequency)
+			frequency = new_frequency
+			if(frequency)
+				radio_connection = radio_controller.add_object(src, frequency, filter = RADIO_ATMOSIA)
+
+		broadcast_status()
+			if(!radio_connection)
+				return 0
+
+			var/datum/signal/signal = new
+			signal.transmission_method = 1 //radio signal
+			signal.source = src
+
+			signal.data = list(
+				"tag" = id,
+				"device" = "AGP",
+				"power" = on,
+				"target_output" = target_pressure,
+				"sigtype" = "status"
+			)
+
+			radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
+
+			return 1
+
+	interact(mob/user as mob)
+		var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
+					<b>Desirable output pressure: </b>
+					[round(target_pressure,0.1)]kPa | <a href='?src=\ref[src];set_press=1'>Change</a>
+					"}
+
+		user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
+		onclose(user, "atmo_pump")
+
+	initialize()
+		..()
+		if(frequency)
+			set_frequency(frequency)
+
+	receive_signal(datum/signal/signal)
+		if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
+			return 0
+
+		if("power" in signal.data)
+			on = text2num(signal.data["power"])
+
+		if("power_toggle" in signal.data)
+			on = !on
+
+		if("set_output_pressure" in signal.data)
+			target_pressure = between(
+				0,
+				text2num(signal.data["set_output_pressure"]),
+				ONE_ATMOSPHERE*50
+			)
+
+		if("status" in signal.data)
+			spawn(2)
+				broadcast_status()
+			return //do not update_icon
+
+		spawn(2)
+			broadcast_status()
+		update_icon()
+		return
+
+
+
+	attack_hand(user as mob)
+		if(..())
+			return
+		src.add_fingerprint(usr)
+		if(!src.allowed(user))
+			user << "\red Access denied."
+			return
+		usr.set_machine(src)
+		interact(user)
+		return
+
+	Topic(href,href_list)
+		if(..()) return
+		if(href_list["power"])
+			on = !on
+		if(href_list["set_press"])
+			var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",src.target_pressure) as num
+			src.target_pressure = max(0, min(4500, new_pressure))
+		usr.set_machine(src)
+		src.update_icon()
+		src.updateUsrDialog()
+		return
+
+	power_change()
+		..()
+		update_icon()
+
+
+
+	attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+		if (!istype(W, /obj/item/weapon/wrench))
+			return ..()
+		if (on)
+			user << "\red You cannot unwrench this [src], turn it off first."
+			return 1
+		var/turf/T = src.loc
+		if (level==1 && isturf(T) && T.intact)
+			user << "\red You must remove the plating first."
+			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 << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+			add_fingerprint(user)
+			return 1
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+		user << "\blue You begin to unfasten \the [src]..."
+		if (do_after(user, 40))
+			user.visible_message( \
+				"[user] unfastens \the [src].", \
+				"\blue You have unfastened \the [src].", \
+				"You hear ratchet.")
+			new /obj/item/pipe(loc, make_from=src)
+			del(src)
+

code/ATMOSPHERICS/components/binary_devices/pump.dm

@@ -0,0 +1,205 @@
+/*
+Every cycle, the pump uses the air in air_in to try and make air_out the perfect pressure.
+
+node1, air1, network1 correspond to input
+node2, air2, network2 correspond to output
+
+Thus, the two variables affect pump operation are set in New():
+	air1.volume
+		This is the volume of gas available to the pump that may be transfered to the output
+	air2.volume
+		Higher quantities of this cause more air to be perfected later
+			but overall network volume is also increased as this increases...
+*/
+
+obj/machinery/atmospherics/binary/pump
+	icon = 'icons/obj/atmospherics/pump.dmi'
+	icon_state = "intact_off"
+
+	name = "Gas pump"
+	desc = "A pump"
+
+	var/on = 0
+	var/target_pressure = ONE_ATMOSPHERE
+
+	var/frequency = 0
+	var/id = null
+	var/datum/radio_frequency/radio_connection
+
+	highcap
+		name = "High capacity gas pump"
+		desc = "A high capacity pump"
+
+		target_pressure = 15000000
+
+	on
+		on = 1
+		icon_state = "intact_on"
+
+	update_icon()
+		if(stat & NOPOWER)
+			icon_state = "intact_off"
+		else if(node1 && node2)
+			icon_state = "intact_[on?("on"):("off")]"
+		else
+			if(node1)
+				icon_state = "exposed_1_off"
+			else if(node2)
+				icon_state = "exposed_2_off"
+			else
+				icon_state = "exposed_3_off"
+		return
+
+	process()
+//		..()
+		if(stat & (NOPOWER|BROKEN))
+			return
+		if(!on)
+			return 0
+
+		var/output_starting_pressure = air2.return_pressure()
+
+		if( (target_pressure - output_starting_pressure) < 0.01)
+			//No need to pump gas if target is already reached!
+			return 1
+
+		//Calculate necessary moles to transfer using PV=nRT
+		if((air1.total_moles() > 0) && (air1.temperature>0))
+			var/pressure_delta = target_pressure - output_starting_pressure
+			var/transfer_moles = pressure_delta*air2.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
+
+			//Actually transfer the gas
+			var/datum/gas_mixture/removed = air1.remove(transfer_moles)
+			air2.merge(removed)
+
+			if(network1)
+				network1.update = 1
+
+			if(network2)
+				network2.update = 1
+
+		return 1
+
+	//Radio remote control
+
+	proc
+		set_frequency(new_frequency)
+			radio_controller.remove_object(src, frequency)
+			frequency = new_frequency
+			if(frequency)
+				radio_connection = radio_controller.add_object(src, frequency, filter = RADIO_ATMOSIA)
+
+		broadcast_status()
+			if(!radio_connection)
+				return 0
+
+			var/datum/signal/signal = new
+			signal.transmission_method = 1 //radio signal
+			signal.source = src
+
+			signal.data = list(
+				"tag" = id,
+				"device" = "AGP",
+				"power" = on,
+				"target_output" = target_pressure,
+				"sigtype" = "status"
+			)
+
+			radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
+
+			return 1
+
+	interact(mob/user as mob)
+		var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
+					<b>Desirable output pressure: </b>
+					[round(target_pressure,0.1)]kPa | <a href='?src=\ref[src];set_press=1'>Change</a>
+					"}
+
+		user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
+		onclose(user, "atmo_pump")
+
+	initialize()
+		..()
+		if(frequency)
+			set_frequency(frequency)
+
+	receive_signal(datum/signal/signal)
+		if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
+			return 0
+
+		if("power" in signal.data)
+			on = text2num(signal.data["power"])
+
+		if("power_toggle" in signal.data)
+			on = !on
+
+		if("set_output_pressure" in signal.data)
+			target_pressure = between(
+				0,
+				text2num(signal.data["set_output_pressure"]),
+				ONE_ATMOSPHERE*50
+			)
+
+		if("status" in signal.data)
+			spawn(2)
+				broadcast_status()
+			return //do not update_icon
+
+		spawn(2)
+			broadcast_status()
+		update_icon()
+		return
+
+
+	attack_hand(user as mob)
+		if(..())
+			return
+		src.add_fingerprint(usr)
+		if(!src.allowed(user))
+			user << "\red Access denied."
+			return
+		usr.set_machine(src)
+		interact(user)
+		return
+
+	Topic(href,href_list)
+		if(..()) return
+		if(href_list["power"])
+			on = !on
+		if(href_list["set_press"])
+			var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",src.target_pressure) as num
+			src.target_pressure = max(0, min(4500, new_pressure))
+		usr.set_machine(src)
+		src.update_icon()
+		src.updateUsrDialog()
+		return
+
+	power_change()
+		..()
+		update_icon()
+
+	attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+		if (!istype(W, /obj/item/weapon/wrench))
+			return ..()
+		if (!(stat & NOPOWER) && on)
+			user << "\red You cannot unwrench this [src], turn it off first."
+			return 1
+		var/turf/T = src.loc
+		if (level==1 && isturf(T) && T.intact)
+			user << "\red You must remove the plating first."
+			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 << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+			add_fingerprint(user)
+			return 1
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+		user << "\blue You begin to unfasten \the [src]..."
+		if (do_after(user, 40))
+			user.visible_message( \
+				"[user] unfastens \the [src].", \
+				"\blue You have unfastened \the [src].", \
+				"You hear ratchet.")
+			new /obj/item/pipe(loc, make_from=src)
+			del(src)

code/ATMOSPHERICS/components/binary_devices/volume_pump.dm

@@ -0,0 +1,199 @@
+/*
+Every cycle, the pump uses the air in air_in to try and make air_out the perfect pressure.
+
+node1, air1, network1 correspond to input
+node2, air2, network2 correspond to output
+
+Thus, the two variables affect pump operation are set in New():
+	air1.volume
+		This is the volume of gas available to the pump that may be transfered to the output
+	air2.volume
+		Higher quantities of this cause more air to be perfected later
+			but overall network volume is also increased as this increases...
+*/
+
+obj/machinery/atmospherics/binary/volume_pump
+	icon = 'icons/obj/atmospherics/volume_pump.dmi'
+	icon_state = "intact_off"
+
+	name = "Volumetric gas pump"
+	desc = "A volumetric pump"
+
+	var/on = 0
+	var/transfer_rate = 200
+
+	var/frequency = 0
+	var/id = null
+	var/datum/radio_frequency/radio_connection
+
+	on
+		on = 1
+		icon_state = "intact_on"
+
+	update_icon()
+		if(stat & NOPOWER)
+			icon_state = "intact_off"
+		else if(node1 && node2)
+			icon_state = "intact_[on?("on"):("off")]"
+		else
+			if(node1)
+				icon_state = "exposed_1_off"
+			else if(node2)
+				icon_state = "exposed_2_off"
+			else
+				icon_state = "exposed_3_off"
+		return
+
+	process()
+//		..()
+		if(stat & (NOPOWER|BROKEN))
+			return
+		if(!on)
+			return 0
+
+// Pump mechanism just won't do anything if the pressure is too high/too low
+
+		var/input_starting_pressure = air1.return_pressure()
+		var/output_starting_pressure = air2.return_pressure()
+
+		if((input_starting_pressure < 0.01) || (output_starting_pressure > 9000))
+			return 1
+
+		var/transfer_ratio = max(1, transfer_rate/air1.volume)
+
+		var/datum/gas_mixture/removed = air1.remove_ratio(transfer_ratio)
+
+		air2.merge(removed)
+
+		if(network1)
+			network1.update = 1
+
+		if(network2)
+			network2.update = 1
+
+		return 1
+
+	proc
+		set_frequency(new_frequency)
+			radio_controller.remove_object(src, frequency)
+			frequency = new_frequency
+			if(frequency)
+				radio_connection = radio_controller.add_object(src, frequency)
+
+		broadcast_status()
+			if(!radio_connection)
+				return 0
+
+			var/datum/signal/signal = new
+			signal.transmission_method = 1 //radio signal
+			signal.source = src
+
+			signal.data = list(
+				"tag" = id,
+				"device" = "APV",
+				"power" = on,
+				"transfer_rate" = transfer_rate,
+				"sigtype" = "status"
+			)
+			radio_connection.post_signal(src, signal)
+
+			return 1
+
+	interact(mob/user as mob)
+		var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
+					<b>Desirable output flow: </b>
+					[round(transfer_rate,1)]l/s | <a href='?src=\ref[src];set_transfer_rate=1'>Change</a>
+					"}
+
+		user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
+		onclose(user, "atmo_pump")
+
+
+
+	initialize()
+		..()
+
+		set_frequency(frequency)
+
+	receive_signal(datum/signal/signal)
+		if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
+			return 0
+
+		if("power" in signal.data)
+			on = text2num(signal.data["power"])
+
+		if("power_toggle" in signal.data)
+			on = !on
+
+		if("set_transfer_rate" in signal.data)
+			transfer_rate = between(
+				0,
+				text2num(signal.data["set_transfer_rate"]),
+				air1.volume
+			)
+
+		if("status" in signal.data)
+			spawn(2)
+				broadcast_status()
+			return //do not update_icon
+
+		spawn(2)
+			broadcast_status()
+		update_icon()
+
+
+	attack_hand(user as mob)
+		if(..())
+			return
+		src.add_fingerprint(usr)
+		if(!src.allowed(user))
+			user << "\red Access denied."
+			return
+		usr.set_machine(src)
+		interact(user)
+		return
+
+	Topic(href,href_list)
+		if(..()) return
+		if(href_list["power"])
+			on = !on
+		if(href_list["set_transfer_rate"])
+			var/new_transfer_rate = input(usr,"Enter new output volume (0-200l/s)","Flow control",src.transfer_rate) as num
+			src.transfer_rate = max(0, min(200, new_transfer_rate))
+		usr.set_machine(src)
+		src.update_icon()
+		src.updateUsrDialog()
+		return
+
+	power_change()
+		..()
+		update_icon()
+
+
+
+	attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+		if (!istype(W, /obj/item/weapon/wrench))
+			return ..()
+		if (!(stat & NOPOWER) && on)
+			user << "\red You cannot unwrench this [src], turn it off first."
+			return 1
+		var/turf/T = src.loc
+		if (level==1 && isturf(T) && T.intact)
+			user << "\red You must remove the plating first."
+			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 << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+			add_fingerprint(user)
+			return 1
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+		user << "\blue You begin to unfasten \the [src]..."
+		if (do_after(user, 40))
+			user.visible_message( \
+				"[user] unfastens \the [src].", \
+				"\blue You have unfastened \the [src].", \
+				"You hear ratchet.")
+			new /obj/item/pipe(loc, make_from=src)
+			del(src)
+

code/ATMOSPHERICS/components/portables_connector.dm

@@ -0,0 +1,157 @@
+/obj/machinery/atmospherics/portables_connector
+	icon = 'icons/obj/atmospherics/portables_connector.dmi'
+	icon_state = "intact"
+
+	name = "Connector Port"
+	desc = "For connecting portables devices related to atmospherics control."
+
+	dir = SOUTH
+	initialize_directions = SOUTH
+
+	var/obj/machinery/portable_atmospherics/connected_device
+
+	var/obj/machinery/atmospherics/node
+
+	var/datum/pipe_network/network
+
+	var/on = 0
+	use_power = 0
+	level = 0
+
+
+	New()
+		initialize_directions = dir
+		..()
+
+	update_icon()
+		if(node)
+			icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]intact"
+			dir = get_dir(src, node)
+		else
+			icon_state = "exposed"
+
+		return
+
+	hide(var/i) //to make the little pipe section invisible, the icon changes.
+		if(node)
+			icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]intact"
+			dir = get_dir(src, node)
+		else
+			icon_state = "exposed"
+
+	process()
+		..()
+		if(!on)
+			return
+		if(!connected_device)
+			on = 0
+			return
+		if(network)
+			network.update = 1
+		return 1
+
+// Housekeeping and pipe network stuff below
+	network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+		if(reference == node)
+			network = new_network
+
+		if(new_network.normal_members.Find(src))
+			return 0
+
+		new_network.normal_members += src
+
+		return null
+
+	Del()
+		loc = null
+
+		if(connected_device)
+			connected_device.disconnect()
+
+		if(node)
+			node.disconnect(src)
+			del(network)
+
+		node = null
+
+		..()
+
+	initialize()
+		if(node) return
+
+		var/node_connect = dir
+
+		for(var/obj/machinery/atmospherics/target in get_step(src,node_connect))
+			if(target.initialize_directions & get_dir(target,src))
+				node = target
+				break
+
+		update_icon()
+
+	build_network()
+		if(!network && node)
+			network = new /datum/pipe_network()
+			network.normal_members += src
+			network.build_network(node, src)
+
+
+	return_network(obj/machinery/atmospherics/reference)
+		build_network()
+
+		if(reference==node)
+			return network
+
+		if(reference==connected_device)
+			return network
+
+		return null
+
+	reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
+		if(network == old_network)
+			network = new_network
+
+		return 1
+
+	return_network_air(datum/pipe_network/reference)
+		var/list/results = list()
+
+		if(connected_device)
+			results += connected_device.air_contents
+
+		return results
+
+	disconnect(obj/machinery/atmospherics/reference)
+		if(reference==node)
+			del(network)
+			node = null
+
+		return null
+
+
+	attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+		if (!istype(W, /obj/item/weapon/wrench))
+			return ..()
+		if (connected_device)
+			user << "\red You cannot unwrench this [src], dettach [connected_device] first."
+			return 1
+		if (locate(/obj/machinery/portable_atmospherics, src.loc))
+			return 1
+		var/turf/T = src.loc
+		if (level==1 && isturf(T) && T.intact)
+			user << "\red You must remove the plating first."
+			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 << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+			add_fingerprint(user)
+			return 1
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+		user << "\blue You begin to unfasten \the [src]..."
+		if (do_after(user, 40))
+			user.visible_message( \
+				"[user] unfastens \the [src].", \
+				"\blue You have unfastened \the [src].", \
+				"You hear ratchet.")
+			new /obj/item/pipe(loc, make_from=src)
+			del(src)

code/ATMOSPHERICS/components/trinary_devices/filter.dm

@@ -0,0 +1,239 @@
+obj/machinery/atmospherics/trinary/filter
+	icon = 'icons/obj/atmospherics/filter.dmi'
+	icon_state = "intact_off"
+	density = 1
+
+	name = "Gas filter"
+
+	req_access = list(access_atmospherics)
+
+	var/on = 0
+	var/temp = null // -- TLE
+
+	var/target_pressure = ONE_ATMOSPHERE
+
+	var/filter_type = 0
+/*
+Filter types:
+-1: Nothing
+ 0: Carbon Molecules: Plasma Toxin, Oxygen Agent B
+ 1: Oxygen: Oxygen ONLY
+ 2: Nitrogen: Nitrogen ONLY
+ 3: Carbon Dioxide: Carbon Dioxide ONLY
+ 4: Sleeping Agent (N2O)
+*/
+
+	var/frequency = 0
+	var/datum/radio_frequency/radio_connection
+
+	proc
+		set_frequency(new_frequency)
+			radio_controller.remove_object(src, frequency)
+			frequency = new_frequency
+			if(frequency)
+				radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
+
+	New()
+		if(radio_controller)
+			initialize()
+		..()
+
+	update_icon()
+		if(stat & NOPOWER)
+			icon_state = "intact_off"
+		else if(node2 && node3 && node1)
+			icon_state = "intact_[on?("on"):("off")]"
+		else
+			icon_state = "intact_off"
+			on = 0
+
+		return
+
+	power_change()
+		var/old_stat = stat
+		..()
+		if(old_stat != stat)
+			update_icon()
+
+	process()
+		..()
+		if(!on)
+			return 0
+
+		var/output_starting_pressure = air3.return_pressure()
+
+		if(output_starting_pressure >= target_pressure || air2.return_pressure() >= target_pressure )
+			//No need to mix if target is already full!
+			return 1
+
+		//Calculate necessary moles to transfer using PV=nRT
+
+		var/pressure_delta = target_pressure - output_starting_pressure
+		var/transfer_moles
+
+		if(air1.temperature > 0)
+			transfer_moles = pressure_delta*air3.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
+
+		//Actually transfer the gas
+
+		if(transfer_moles > 0)
+			var/datum/gas_mixture/removed = air1.remove(transfer_moles)
+
+			if(!removed)
+				return
+			var/datum/gas_mixture/filtered_out = new
+			filtered_out.temperature = removed.temperature
+
+			switch(filter_type)
+				if(0) //removing hydrocarbons
+					filtered_out.toxins = removed.toxins
+					removed.toxins = 0
+
+					if(removed.trace_gases.len>0)
+						for(var/datum/gas/trace_gas in removed.trace_gases)
+							if(istype(trace_gas, /datum/gas/oxygen_agent_b))
+								removed.trace_gases -= trace_gas
+								filtered_out.trace_gases += trace_gas
+
+				if(1) //removing O2
+					filtered_out.oxygen = removed.oxygen
+					removed.oxygen = 0
+
+				if(2) //removing N2
+					filtered_out.nitrogen = removed.nitrogen
+					removed.nitrogen = 0
+
+				if(3) //removing CO2
+					filtered_out.carbon_dioxide = removed.carbon_dioxide
+					removed.carbon_dioxide = 0
+
+				if(4)//removing N2O
+					if(removed.trace_gases.len>0)
+						for(var/datum/gas/trace_gas in removed.trace_gases)
+							if(istype(trace_gas, /datum/gas/sleeping_agent))
+								removed.trace_gases -= trace_gas
+								filtered_out.trace_gases += trace_gas
+
+				else
+					filtered_out = null
+
+
+			air2.merge(filtered_out)
+			air3.merge(removed)
+
+		if(network2)
+			network2.update = 1
+
+		if(network3)
+			network3.update = 1
+
+		if(network1)
+			network1.update = 1
+
+		return 1
+
+	initialize()
+		set_frequency(frequency)
+		..()
+
+	attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+		if (!istype(W, /obj/item/weapon/wrench))
+			return ..()
+		var/turf/T = src.loc
+		if (level==1 && isturf(T) && T.intact)
+			user << "\red You must remove the plating first."
+			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 << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+			add_fingerprint(user)
+			return 1
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+		user << "\blue You begin to unfasten \the [src]..."
+		if (do_after(user, 40))
+			user.visible_message( \
+				"[user] unfastens \the [src].", \
+				"\blue You have unfastened \the [src].", \
+				"You hear ratchet.")
+			new /obj/item/pipe(loc, make_from=src)
+			del(src)
+
+
+obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE
+	if(..())
+		return
+
+	if(!src.allowed(user))
+		user << "\red Access denied."
+		return
+
+	var/dat
+	var/current_filter_type
+	switch(filter_type)
+		if(0)
+			current_filter_type = "Carbon Molecules"
+		if(1)
+			current_filter_type = "Oxygen"
+		if(2)
+			current_filter_type = "Nitrogen"
+		if(3)
+			current_filter_type = "Carbon Dioxide"
+		if(4)
+			current_filter_type = "Nitrous Oxide"
+		if(-1)
+			current_filter_type = "Nothing"
+		else
+			current_filter_type = "ERROR - Report this bug to the admin, please!"
+
+	dat += {"
+			<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
+			<b>Filtering: </b>[current_filter_type]<br><HR>
+			<h4>Set Filter Type:</h4>
+			<A href='?src=\ref[src];filterset=0'>Carbon Molecules</A><BR>
+			<A href='?src=\ref[src];filterset=1'>Oxygen</A><BR>
+			<A href='?src=\ref[src];filterset=2'>Nitrogen</A><BR>
+			<A href='?src=\ref[src];filterset=3'>Carbon Dioxide</A><BR>
+			<A href='?src=\ref[src];filterset=4'>Nitrous Oxide</A><BR>
+			<A href='?src=\ref[src];filterset=-1'>Nothing</A><BR>
+			<HR><B>Desirable output pressure:</B>
+			[src.target_pressure]kPa | <a href='?src=\ref[src];set_press=1'>Change</a>
+			"}
+/*
+		user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD>[dat]","window=atmo_filter")
+		onclose(user, "atmo_filter")
+		return
+
+	if (src.temp)
+		dat = text("<TT>[]</TT><BR><BR><A href='?src=\ref[];temp=1'>Clear Screen</A>", src.temp, src)
+	//else
+	//	src.on != src.on
+*/
+	user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_filter")
+	onclose(user, "atmo_filter")
+	return
+
+obj/machinery/atmospherics/trinary/filter/Topic(href, href_list) // -- TLE
+	if(..())
+		return
+	usr.set_machine(src)
+	src.add_fingerprint(usr)
+	if(href_list["filterset"])
+		src.filter_type = text2num(href_list["filterset"])
+	if (href_list["temp"])
+		src.temp = null
+	if(href_list["set_press"])
+		var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",src.target_pressure) as num
+		src.target_pressure = max(0, min(4500, new_pressure))
+	if(href_list["power"])
+		on=!on
+	src.update_icon()
+	src.updateUsrDialog()
+/*
+	for(var/mob/M in viewers(1, src))
+		if ((M.client && M.machine == src))
+			src.attack_hand(M)
+*/
+	return
+
+

code/ATMOSPHERICS/components/trinary_devices/mixer.dm

@@ -0,0 +1,164 @@
+obj/machinery/atmospherics/trinary/mixer
+	icon = 'icons/obj/atmospherics/mixer.dmi'
+	icon_state = "intact_off"
+	density = 1
+
+	name = "Gas mixer"
+
+	req_access = list(access_atmospherics)
+
+	var/on = 0
+
+	var/target_pressure = ONE_ATMOSPHERE
+	var/node1_concentration = 0.5
+	var/node2_concentration = 0.5
+
+	//node 3 is the outlet, nodes 1 & 2 are intakes
+
+	update_icon()
+		if(stat & NOPOWER)
+			icon_state = "intact_off"
+		else if(node2 && node3 && node1)
+			icon_state = "intact_[on?("on"):("off")]"
+		else
+			icon_state = "intact_off"
+			on = 0
+
+		return
+
+	power_change()
+		var/old_stat = stat
+		..()
+		if(old_stat != stat)
+			update_icon()
+
+	New()
+		..()
+		air3.volume = 300
+
+	process()
+		..()
+		if(!on)
+			return 0
+
+		var/output_starting_pressure = air3.return_pressure()
+
+		if(output_starting_pressure >= target_pressure)
+			//No need to mix if target is already full!
+			return 1
+
+		//Calculate necessary moles to transfer using PV=nRT
+
+		var/pressure_delta = target_pressure - output_starting_pressure
+		var/transfer_moles1 = 0
+		var/transfer_moles2 = 0
+
+		if(air1.temperature > 0)
+			transfer_moles1 = (node1_concentration*pressure_delta)*air3.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
+
+		if(air2.temperature > 0)
+			transfer_moles2 = (node2_concentration*pressure_delta)*air3.volume/(air2.temperature * R_IDEAL_GAS_EQUATION)
+
+		var/air1_moles = air1.total_moles()
+		var/air2_moles = air2.total_moles()
+
+		if((air1_moles < transfer_moles1) || (air2_moles < transfer_moles2))
+			if(!transfer_moles1 || !transfer_moles2) return
+			var/ratio = min(air1_moles/transfer_moles1, air2_moles/transfer_moles2)
+
+			transfer_moles1 *= ratio
+			transfer_moles2 *= ratio
+
+		//Actually transfer the gas
+
+		if(transfer_moles1 > 0)
+			var/datum/gas_mixture/removed1 = air1.remove(transfer_moles1)
+			air3.merge(removed1)
+
+		if(transfer_moles2 > 0)
+			var/datum/gas_mixture/removed2 = air2.remove(transfer_moles2)
+			air3.merge(removed2)
+
+		if(network1 && transfer_moles1)
+			network1.update = 1
+
+		if(network2 && transfer_moles2)
+			network2.update = 1
+
+		if(network3)
+			network3.update = 1
+
+		return 1
+
+	attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+		if (!istype(W, /obj/item/weapon/wrench))
+			return ..()
+		var/turf/T = src.loc
+		if (level==1 && isturf(T) && T.intact)
+			user << "\red You must remove the plating first."
+			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 << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+			add_fingerprint(user)
+			return 1
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+		user << "\blue You begin to unfasten \the [src]..."
+		if (do_after(user, 40))
+			user.visible_message( \
+				"[user] unfastens \the [src].", \
+				"\blue You have unfastened \the [src].", \
+				"You hear ratchet.")
+			new /obj/item/pipe(loc, make_from=src)
+			del(src)
+
+	attack_hand(user as mob)
+		if(..())
+			return
+		src.add_fingerprint(usr)
+		if(!src.allowed(user))
+			user << "\red Access denied."
+			return
+		usr.set_machine(src)
+		var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
+					<b>Desirable output pressure: </b>
+					[target_pressure]kPa | <a href='?src=\ref[src];set_press=1'>Change</a>
+					<br>
+					<b>Node 1 Concentration:</b>
+					<a href='?src=\ref[src];node1_c=-0.1'><b>-</b></a>
+					<a href='?src=\ref[src];node1_c=-0.01'>-</a>
+					[node1_concentration]([node1_concentration*100]%)
+					<a href='?src=\ref[src];node1_c=0.01'><b>+</b></a>
+					<a href='?src=\ref[src];node1_c=0.1'>+</a>
+					<br>
+					<b>Node 2 Concentration:</b>
+					<a href='?src=\ref[src];node2_c=-0.1'><b>-</b></a>
+					<a href='?src=\ref[src];node2_c=-0.01'>-</a>
+					[node2_concentration]([node2_concentration*100]%)
+					<a href='?src=\ref[src];node2_c=0.01'><b>+</b></a>
+					<a href='?src=\ref[src];node2_c=0.1'>+</a>
+					"}
+
+		user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_mixer")
+		onclose(user, "atmo_mixer")
+		return
+
+	Topic(href,href_list)
+		if(..()) return
+		if(href_list["power"])
+			on = !on
+		if(href_list["set_press"])
+			var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",src.target_pressure) as num
+			src.target_pressure = max(0, min(4500, new_pressure))
+		if(href_list["node1_c"])
+			var/value = text2num(href_list["node1_c"])
+			src.node1_concentration = max(0, min(1, src.node1_concentration + value))
+			src.node2_concentration = max(0, min(1, src.node2_concentration - value))
+		if(href_list["node2_c"])
+			var/value = text2num(href_list["node2_c"])
+			src.node2_concentration = max(0, min(1, src.node2_concentration + value))
+			src.node1_concentration = max(0, min(1, src.node1_concentration - value))
+		src.update_icon()
+		src.updateUsrDialog()
+		return

code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm

@@ -0,0 +1,164 @@
+obj/machinery/atmospherics/trinary
+	dir = SOUTH
+	initialize_directions = SOUTH|NORTH|WEST
+	use_power = 1
+
+	var/datum/gas_mixture/air1
+	var/datum/gas_mixture/air2
+	var/datum/gas_mixture/air3
+
+	var/obj/machinery/atmospherics/node1
+	var/obj/machinery/atmospherics/node2
+	var/obj/machinery/atmospherics/node3
+
+	var/datum/pipe_network/network1
+	var/datum/pipe_network/network2
+	var/datum/pipe_network/network3
+
+	New()
+		..()
+		switch(dir)
+			if(NORTH)
+				initialize_directions = EAST|NORTH|SOUTH
+			if(SOUTH)
+				initialize_directions = SOUTH|WEST|NORTH
+			if(EAST)
+				initialize_directions = EAST|WEST|SOUTH
+			if(WEST)
+				initialize_directions = WEST|NORTH|EAST
+		air1 = new
+		air2 = new
+		air3 = new
+
+		air1.volume = 200
+		air2.volume = 200
+		air3.volume = 200
+
+// Housekeeping and pipe network stuff below
+	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 == node3)
+			network3 = new_network
+
+		if(new_network.normal_members.Find(src))
+			return 0
+
+		new_network.normal_members += src
+
+		return null
+
+	Del()
+		loc = null
+
+		if(node1)
+			node1.disconnect(src)
+			del(network1)
+		if(node2)
+			node2.disconnect(src)
+			del(network2)
+		if(node3)
+			node3.disconnect(src)
+			del(network3)
+
+		node1 = null
+		node2 = null
+		node3 = null
+
+		..()
+
+	initialize()
+		if(node1 && node2 && node3) return
+
+		var/node1_connect = turn(dir, -180)
+		var/node2_connect = turn(dir, -90)
+		var/node3_connect = dir
+
+		for(var/obj/machinery/atmospherics/target in get_step(src,node1_connect))
+			if(target.initialize_directions & get_dir(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))
+				node2 = target
+				break
+
+		for(var/obj/machinery/atmospherics/target in get_step(src,node3_connect))
+			if(target.initialize_directions & get_dir(target,src))
+				node3 = target
+				break
+
+		update_icon()
+
+	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)
+
+		if(!network3 && node3)
+			network3 = new /datum/pipe_network()
+			network3.normal_members += src
+			network3.build_network(node3, src)
+
+
+	return_network(obj/machinery/atmospherics/reference)
+		build_network()
+
+		if(reference==node1)
+			return network1
+
+		if(reference==node2)
+			return network2
+
+		if(reference==node3)
+			return network3
+
+		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
+		if(network3 == old_network)
+			network3 = 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
+		if(network3 == reference)
+			results += air3
+
+		return results
+
+	disconnect(obj/machinery/atmospherics/reference)
+		if(reference==node1)
+			del(network1)
+			node1 = null
+
+		else if(reference==node2)
+			del(network2)
+			node2 = null
+
+		else if(reference==node3)
+			del(network3)
+			node3 = null
+
+		return null

code/ATMOSPHERICS/components/tvalve.dm

@@ -0,0 +1,433 @@
+obj/machinery/atmospherics/tvalve
+	icon = 'icons/obj/atmospherics/valve.dmi'
+	icon_state = "tvalve0"
+
+	name = "manual switching valve"
+	desc = "A pipe valve"
+
+	dir = SOUTH
+	initialize_directions = SOUTH|NORTH|WEST
+
+	var/state = 0 // 0 = go straight, 1 = go to side
+
+	// like a trinary component, node1 is input, node2 is side output, node3 is straight output
+	var/obj/machinery/atmospherics/node1
+	var/obj/machinery/atmospherics/node2
+	var/obj/machinery/atmospherics/node3
+
+	var/datum/pipe_network/network_node1
+	var/datum/pipe_network/network_node2
+	var/datum/pipe_network/network_node3
+
+	update_icon(animation)
+		if(animation)
+			flick("tvalve[src.state][!src.state]",src)
+		else
+			icon_state = "tvalve[state]"
+
+	New()
+		initialize_directions()
+		..()
+
+	proc/initialize_directions()
+		switch(dir)
+			if(NORTH)
+				initialize_directions = SOUTH|NORTH|EAST
+			if(SOUTH)
+				initialize_directions = NORTH|SOUTH|WEST
+			if(EAST)
+				initialize_directions = WEST|EAST|SOUTH
+			if(WEST)
+				initialize_directions = EAST|WEST|NORTH
+
+	network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+		if(reference == node1)
+			network_node1 = new_network
+			if(state)
+				network_node2 = new_network
+			else
+				network_node3 = new_network
+		else if(reference == node2)
+			network_node2 = new_network
+			if(state)
+				network_node1 = new_network
+		else if(reference == node3)
+			network_node3 = new_network
+			if(!state)
+				network_node1 = new_network
+
+		if(new_network.normal_members.Find(src))
+			return 0
+
+		new_network.normal_members += src
+
+		if(state)
+			if(reference == node1)
+				if(node2)
+					return node2.network_expand(new_network, src)
+			else if(reference == node2)
+				if(node1)
+					return node1.network_expand(new_network, src)
+		else
+			if(reference == node1)
+				if(node3)
+					return node3.network_expand(new_network, src)
+			else if(reference == node3)
+				if(node1)
+					return node1.network_expand(new_network, src)
+
+		return null
+
+	Del()
+		loc = null
+
+		if(node1)
+			node1.disconnect(src)
+			del(network_node1)
+		if(node2)
+			node2.disconnect(src)
+			del(network_node2)
+		if(node3)
+			node3.disconnect(src)
+			del(network_node3)
+
+		node1 = null
+		node2 = null
+		node3 = null
+
+		..()
+
+	proc/go_to_side()
+
+		if(state) return 0
+
+		state = 1
+		update_icon()
+
+		if(network_node1)
+			del(network_node1)
+		if(network_node3)
+			del(network_node3)
+		build_network()
+
+		if(network_node1&&network_node2)
+			network_node1.merge(network_node2)
+			network_node2 = network_node1
+
+		if(network_node1)
+			network_node1.update = 1
+		else if(network_node2)
+			network_node2.update = 1
+
+		return 1
+
+	proc/go_straight()
+
+		if(!state)
+			return 0
+
+		state = 0
+		update_icon()
+
+		if(network_node1)
+			del(network_node1)
+		if(network_node2)
+			del(network_node2)
+		build_network()
+
+		if(network_node1&&network_node3)
+			network_node1.merge(network_node3)
+			network_node3 = network_node1
+
+		if(network_node1)
+			network_node1.update = 1
+		else if(network_node3)
+			network_node3.update = 1
+
+		return 1
+
+	attack_ai(mob/user as mob)
+		return
+
+	attack_paw(mob/user as mob)
+		return attack_hand(user)
+
+	attack_hand(mob/user as mob)
+		src.add_fingerprint(usr)
+		update_icon(1)
+		sleep(10)
+		if (src.state)
+			src.go_straight()
+		else
+			src.go_to_side()
+
+	process()
+		..()
+		machines.Remove(src)
+
+/*		if(open && (!node1 || !node2))
+			close()
+		if(!node1)
+			if(!nodealert)
+				//world << "Missing node from [src] at [src.x],[src.y],[src.z]"
+				nodealert = 1
+		else if (!node2)
+			if(!nodealert)
+				//world << "Missing node from [src] at [src.x],[src.y],[src.z]"
+				nodealert = 1
+		else if (nodealert)
+			nodealert = 0
+*/
+
+		return
+
+	initialize()
+		var/node1_dir
+		var/node2_dir
+		var/node3_dir
+
+		node1_dir = turn(dir, 180)
+		node2_dir = turn(dir, -90)
+		node3_dir = dir
+
+		for(var/obj/machinery/atmospherics/target in get_step(src,node1_dir))
+			if(target.initialize_directions & get_dir(target,src))
+				node1 = target
+				break
+		for(var/obj/machinery/atmospherics/target in get_step(src,node2_dir))
+			if(target.initialize_directions & get_dir(target,src))
+				node2 = target
+				break
+		for(var/obj/machinery/atmospherics/target in get_step(src,node3_dir))
+			if(target.initialize_directions & get_dir(target,src))
+				node3 = target
+				break
+
+	build_network()
+		if(!network_node1 && node1)
+			network_node1 = new /datum/pipe_network()
+			network_node1.normal_members += src
+			network_node1.build_network(node1, src)
+
+		if(!network_node2 && node2)
+			network_node2 = new /datum/pipe_network()
+			network_node2.normal_members += src
+			network_node2.build_network(node2, src)
+
+		if(!network_node3 && node3)
+			network_node3 = new /datum/pipe_network()
+			network_node3.normal_members += src
+			network_node3.build_network(node3, src)
+
+
+	return_network(obj/machinery/atmospherics/reference)
+		build_network()
+
+		if(reference==node1)
+			return network_node1
+
+		if(reference==node2)
+			return network_node2
+
+		if(reference==node3)
+			return network_node3
+
+		return null
+
+	reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
+		if(network_node1 == old_network)
+			network_node1 = new_network
+		if(network_node2 == old_network)
+			network_node2 = new_network
+		if(network_node3 == old_network)
+			network_node3 = new_network
+
+		return 1
+
+	return_network_air(datum/network/reference)
+		return null
+
+	disconnect(obj/machinery/atmospherics/reference)
+		if(reference==node1)
+			del(network_node1)
+			node1 = null
+
+		else if(reference==node2)
+			del(network_node2)
+			node2 = null
+
+		else if(reference==node3)
+			del(network_node3)
+			node2 = null
+
+		return null
+
+	digital		// can be controlled by AI
+		name = "digital switching valve"
+		desc = "A digitally controlled valve."
+		icon = 'icons/obj/atmospherics/digital_valve.dmi'
+
+		attack_ai(mob/user as mob)
+			return src.attack_hand(user)
+
+		attack_hand(mob/user as mob)
+			if(!src.allowed(user))
+				user << "\red Access denied."
+				return
+			..()
+
+		//Radio remote control
+
+		proc
+			set_frequency(new_frequency)
+				radio_controller.remove_object(src, frequency)
+				frequency = new_frequency
+				if(frequency)
+					radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
+
+		var/frequency = 0
+		var/id = null
+		var/datum/radio_frequency/radio_connection
+
+		initialize()
+			..()
+			if(frequency)
+				set_frequency(frequency)
+
+		receive_signal(datum/signal/signal)
+			if(!signal.data["tag"] || (signal.data["tag"] != id))
+				return 0
+
+			switch(signal.data["command"])
+				if("valve_open")
+					if(!state)
+						go_to_side()
+
+				if("valve_close")
+					if(state)
+						go_straight()
+
+				if("valve_toggle")
+					if(state)
+						go_straight()
+					else
+						go_to_side()
+
+	attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+		if (!istype(W, /obj/item/weapon/wrench))
+			return ..()
+		if (istype(src, /obj/machinery/atmospherics/tvalve/digital))
+			user << "\red You cannot unwrench this [src], it's too complicated."
+			return 1
+		var/turf/T = src.loc
+		if (level==1 && isturf(T) && T.intact)
+			user << "\red You must remove the plating first."
+			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 << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+			add_fingerprint(user)
+			return 1
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+		user << "\blue You begin to unfasten \the [src]..."
+		if (do_after(user, 40))
+			user.visible_message( \
+				"[user] unfastens \the [src].", \
+				"\blue You have unfastened \the [src].", \
+				"You hear ratchet.")
+			new /obj/item/pipe(loc, make_from=src)
+			del(src)
+
+obj/machinery/atmospherics/tvalve/mirrored
+	icon_state = "tvalvem0"
+
+	initialize_directions()
+		switch(dir)
+			if(NORTH)
+				initialize_directions = SOUTH|NORTH|WEST
+			if(SOUTH)
+				initialize_directions = NORTH|SOUTH|EAST
+			if(EAST)
+				initialize_directions = WEST|EAST|NORTH
+			if(WEST)
+				initialize_directions = EAST|WEST|SOUTH
+
+	initialize()
+		var/node1_dir
+		var/node2_dir
+		var/node3_dir
+
+		node1_dir = turn(dir, 180)
+		node2_dir = turn(dir, 90)
+		node3_dir = dir
+
+		for(var/obj/machinery/atmospherics/target in get_step(src,node1_dir))
+			if(target.initialize_directions & get_dir(target,src))
+				node1 = target
+				break
+		for(var/obj/machinery/atmospherics/target in get_step(src,node2_dir))
+			if(target.initialize_directions & get_dir(target,src))
+				node2 = target
+				break
+		for(var/obj/machinery/atmospherics/target in get_step(src,node3_dir))
+			if(target.initialize_directions & get_dir(target,src))
+				node3 = target
+				break
+
+	update_icon(animation)
+		if(animation)
+			flick("tvalvem[src.state][!src.state]",src)
+		else
+			icon_state = "tvalvem[state]"
+
+	digital		// can be controlled by AI
+		name = "digital switching valve"
+		desc = "A digitally controlled valve."
+		icon = 'icons/obj/atmospherics/digital_valve.dmi'
+
+		attack_ai(mob/user as mob)
+			return src.attack_hand(user)
+
+		attack_hand(mob/user as mob)
+			if(!src.allowed(user))
+				user << "\red Access denied."
+				return
+			..()
+
+		//Radio remote control -eh?
+
+		proc
+			set_frequency(new_frequency)
+				radio_controller.remove_object(src, frequency)
+				frequency = new_frequency
+				if(frequency)
+					radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
+
+		var/frequency = 0
+		var/id = null
+		var/datum/radio_frequency/radio_connection
+
+		initialize()
+			..()
+			if(frequency)
+				set_frequency(frequency)
+
+		receive_signal(datum/signal/signal)
+			if(!signal.data["tag"] || (signal.data["tag"] != id))
+				return 0
+
+			switch(signal.data["command"])
+				if("valve_open")
+					if(!state)
+						go_to_side()
+
+				if("valve_close")
+					if(state)
+						go_straight()
+
+				if("valve_toggle")
+					if(state)
+						go_straight()
+					else
+						go_to_side()

code/ATMOSPHERICS/components/unary/cold_sink.dm

@@ -0,0 +1,41 @@
+/obj/machinery/atmospherics/unary/cold_sink
+	icon = 'icons/obj/atmospherics/cold_sink.dmi'
+	icon_state = "intact_off"
+	density = 1
+	use_power = 1
+
+	name = "Cold Sink"
+	desc = "Cools gas when connected to pipe network"
+
+	var/on = 0
+
+	var/current_temperature = T20C
+	var/current_heat_capacity = 50000 //totally random
+
+	update_icon()
+		if(node)
+			icon_state = "intact_[on?("on"):("off")]"
+		else
+			icon_state = "exposed"
+
+			on = 0
+
+		return
+
+	process()
+		..()
+		if(!on || !network)
+			return 0
+		var/air_heat_capacity = air_contents.heat_capacity()
+		var/combined_heat_capacity = current_heat_capacity + air_heat_capacity
+		var/old_temperature = air_contents.temperature
+
+		if(combined_heat_capacity > 0)
+			var/combined_energy = current_temperature*current_heat_capacity + air_heat_capacity*air_contents.temperature
+			air_contents.temperature = combined_energy/combined_heat_capacity
+
+		//todo: have current temperature affected. require power to bring down current temperature again
+
+		if(abs(old_temperature-air_contents.temperature) > 1)
+			network.update = 1
+		return 1

code/ATMOSPHERICS/components/unary/generator_input.dm

@@ -0,0 +1,21 @@
+/obj/machinery/atmospherics/unary/generator_input
+	icon = 'icons/obj/atmospherics/heat_exchanger.dmi'
+	icon_state = "intact"
+	density = 1
+
+	name = "Generator Input"
+	desc = "Placeholder"
+
+	var/update_cycle
+
+	update_icon()
+		if(node)
+			icon_state = "intact"
+		else
+			icon_state = "exposed"
+
+		return
+
+	proc
+		return_exchange_air()
+			return air_contents

code/ATMOSPHERICS/components/unary/heat_exchanger.dm

@@ -0,0 +1,89 @@
+/obj/machinery/atmospherics/unary/heat_exchanger
+
+	icon = 'icons/obj/atmospherics/heat_exchanger.dmi'
+	icon_state = "intact"
+	density = 1
+
+	name = "Heat Exchanger"
+	desc = "Exchanges heat between two input gases. Setup for fast heat transfer"
+
+	var/obj/machinery/atmospherics/unary/heat_exchanger/partner = null
+	var/update_cycle
+
+	update_icon()
+		if(node)
+			icon_state = "intact"
+		else
+			icon_state = "exposed"
+
+		return
+
+	initialize()
+		if(!partner)
+			var/partner_connect = turn(dir,180)
+
+			for(var/obj/machinery/atmospherics/unary/heat_exchanger/target in get_step(src,partner_connect))
+				if(target.dir & get_dir(src,target))
+					partner = target
+					partner.partner = src
+					break
+
+		..()
+
+	process()
+		..()
+		if(!partner)
+			return 0
+
+		if(!air_master || air_master.current_cycle <= update_cycle)
+			return 0
+
+		update_cycle = air_master.current_cycle
+		partner.update_cycle = air_master.current_cycle
+
+		var/air_heat_capacity = air_contents.heat_capacity()
+		var/other_air_heat_capacity = partner.air_contents.heat_capacity()
+		var/combined_heat_capacity = other_air_heat_capacity + air_heat_capacity
+
+		var/old_temperature = air_contents.temperature
+		var/other_old_temperature = partner.air_contents.temperature
+
+		if(combined_heat_capacity > 0)
+			var/combined_energy = partner.air_contents.temperature*other_air_heat_capacity + air_heat_capacity*air_contents.temperature
+
+			var/new_temperature = combined_energy/combined_heat_capacity
+			air_contents.temperature = new_temperature
+			partner.air_contents.temperature = new_temperature
+
+		if(network)
+			if(abs(old_temperature-air_contents.temperature) > 1)
+				network.update = 1
+
+		if(partner.network)
+			if(abs(other_old_temperature-partner.air_contents.temperature) > 1)
+				partner.network.update = 1
+
+		return 1
+
+	attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+		if (!istype(W, /obj/item/weapon/wrench))
+			return ..()
+		var/turf/T = src.loc
+		if (level==1 && isturf(T) && T.intact)
+			user << "\red You must remove the plating first."
+			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 << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+			add_fingerprint(user)
+			return 1
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+		user << "\blue You begin to unfasten \the [src]..."
+		if (do_after(user, 40))
+			user.visible_message( \
+				"[user] unfastens \the [src].", \
+				"\blue You have unfastened \the [src].", \
+				"You hear ratchet.")
+			new /obj/item/pipe(loc, make_from=src)
+			del(src)

code/ATMOSPHERICS/components/unary/heat_source.dm

@@ -0,0 +1,43 @@
+/obj/machinery/atmospherics/unary/heat_reservoir
+//currently the same code as cold_sink but anticipating process() changes
+
+	icon = 'icons/obj/atmospherics/cold_sink.dmi'
+	icon_state = "intact_off"
+	density = 1
+	use_power = 1
+
+	name = "Heat Reservoir"
+	desc = "Heats gas when connected to pipe network"
+
+	var/on = 0
+
+	var/current_temperature = T20C
+	var/current_heat_capacity = 50000 //totally random
+
+	update_icon()
+		if(node)
+			icon_state = "intact_[on?("on"):("off")]"
+		else
+			icon_state = "exposed"
+
+			on = 0
+
+		return
+
+	process()
+		..()
+		if(!on)
+			return 0
+		var/air_heat_capacity = air_contents.heat_capacity()
+		var/combined_heat_capacity = current_heat_capacity + air_heat_capacity
+		var/old_temperature = air_contents.temperature
+
+		if(combined_heat_capacity > 0)
+			var/combined_energy = current_temperature*current_heat_capacity + air_heat_capacity*air_contents.temperature
+			air_contents.temperature = combined_energy/combined_heat_capacity
+
+		//todo: have current temperature affected. require power to bring up current temperature again
+
+		if(abs(old_temperature-air_contents.temperature) > 1)
+			network.update = 1
+		return 1

code/ATMOSPHERICS/components/unary/outlet_injector.dm

@@ -0,0 +1,147 @@
+/obj/machinery/atmospherics/unary/outlet_injector
+	icon = 'icons/obj/atmospherics/outlet_injector.dmi'
+	icon_state = "off"
+	use_power = 1
+
+	name = "Air Injector"
+	desc = "Has a valve and pump attached to it"
+
+	var/on = 0
+	var/injecting = 0
+
+	var/volume_rate = 50
+
+	var/frequency = 0
+	var/id = null
+	var/datum/radio_frequency/radio_connection
+
+	level = 1
+
+	update_icon()
+		if(node)
+			if(on && !(stat & NOPOWER))
+				icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]on"
+			else
+				icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off"
+		else
+			icon_state = "exposed"
+			on = 0
+
+		return
+
+	power_change()
+		var/old_stat = stat
+		..()
+		if(old_stat != stat)
+			update_icon()
+
+
+	process()
+		..()
+		injecting = 0
+
+		if(!on || stat & NOPOWER)
+			return 0
+
+		if(air_contents.temperature > 0)
+			var/transfer_moles = (air_contents.return_pressure())*volume_rate/(air_contents.temperature * R_IDEAL_GAS_EQUATION)
+
+			var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
+
+			loc.assume_air(removed)
+
+			if(network)
+				network.update = 1
+
+		return 1
+
+	proc/inject()
+		if(on || injecting)
+			return 0
+
+		injecting = 1
+
+		if(air_contents.temperature > 0)
+			var/transfer_moles = (air_contents.return_pressure())*volume_rate/(air_contents.temperature * R_IDEAL_GAS_EQUATION)
+
+			var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
+
+			loc.assume_air(removed)
+
+			if(network)
+				network.update = 1
+
+		flick("inject", src)
+
+	proc
+		set_frequency(new_frequency)
+			radio_controller.remove_object(src, frequency)
+			frequency = new_frequency
+			if(frequency)
+				radio_connection = radio_controller.add_object(src, frequency)
+
+		broadcast_status()
+			if(!radio_connection)
+				return 0
+
+			var/datum/signal/signal = new
+			signal.transmission_method = 1 //radio signal
+			signal.source = src
+
+			signal.data = list(
+				"tag" = id,
+				"device" = "AO",
+				"power" = on,
+				"volume_rate" = volume_rate,
+				//"timestamp" = world.time,
+				"sigtype" = "status"
+			 )
+
+			radio_connection.post_signal(src, signal)
+
+			return 1
+
+	initialize()
+		..()
+
+		set_frequency(frequency)
+
+	receive_signal(datum/signal/signal)
+		if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
+			return 0
+
+		if("power" in signal.data)
+			on = text2num(signal.data["power"])
+
+		if("power_toggle" in signal.data)
+			on = !on
+
+		if("inject" in signal.data)
+			spawn inject()
+			return
+
+		if("set_volume_rate" in signal.data)
+			var/number = text2num(signal.data["set_volume_rate"])
+			volume_rate = between(0, number, air_contents.volume)
+
+		if("status" in signal.data)
+			spawn(2)
+				broadcast_status()
+			return //do not update_icon
+
+			//log_admin("DEBUG \[[world.timeofday]\]: outlet_injector/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
+			//return
+		spawn(2)
+			broadcast_status()
+		update_icon()
+
+	hide(var/i) //to make the little pipe section invisible, the icon changes.
+		if(node)
+			if(on)
+				icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]on"
+			else
+				icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off"
+		else
+			icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]exposed"
+			on = 0
+		return

code/ATMOSPHERICS/components/unary/oxygen_generator.dm

@@ -0,0 +1,49 @@
+obj/machinery/atmospherics/unary/oxygen_generator
+	icon = 'icons/obj/atmospherics/oxygen_generator.dmi'
+	icon_state = "intact_off"
+	density = 1
+
+	name = "Oxygen Generator"
+	desc = ""
+
+	dir = SOUTH
+	initialize_directions = SOUTH
+
+	var/on = 0
+
+	var/oxygen_content = 10
+
+	update_icon()
+		if(node)
+			icon_state = "intact_[on?("on"):("off")]"
+		else
+			icon_state = "exposed_off"
+
+			on = 0
+
+		return
+
+	New()
+		..()
+
+		air_contents.volume = 50
+
+	process()
+		..()
+		if(!on)
+			return 0
+
+		var/total_moles = air_contents.total_moles()
+
+		if(total_moles < oxygen_content)
+			var/current_heat_capacity = air_contents.heat_capacity()
+
+			var/added_oxygen = oxygen_content - total_moles
+
+			air_contents.temperature = (current_heat_capacity*air_contents.temperature + 20*added_oxygen*T0C)/(current_heat_capacity+20*added_oxygen)
+			air_contents.oxygen += added_oxygen
+
+			if(network)
+				network.update = 1
+
+		return 1

code/ATMOSPHERICS/components/unary/thermal_plate.dm

@@ -0,0 +1,81 @@
+#define RADIATION_CAPACITY 30000 //Radiation isn't particularly effective (TODO BALANCE)
+
+
+/obj/machinery/atmospherics/unary/thermal_plate
+//Based off Heat Reservoir and Space Heater
+//Transfers heat between a pipe system and environment, based on which has a greater thermal energy concentration
+
+	icon = 'icons/obj/atmospherics/cold_sink.dmi'
+	icon_state = "intact_off"
+
+	name = "Thermal Transfer Plate"
+	desc = "Transfers heat to and from an area"
+
+	update_icon()
+		if(node)
+			icon_state = "intact_off"
+		else
+			icon_state = "exposed"
+		return
+
+	process()
+		..()
+
+		var/datum/gas_mixture/environment = loc.return_air()
+
+		//Get processable air sample and thermal info from environment
+
+		var/transfer_moles = 0.25 * environment.total_moles()
+		var/datum/gas_mixture/external_removed = environment.remove(transfer_moles)
+
+		if (!external_removed)
+			return radiate()
+
+		if (external_removed.total_moles() < 10)
+			return radiate()
+
+		//Get same info from connected gas
+
+		var/internal_transfer_moles = 0.25 * air_contents.total_moles()
+		var/datum/gas_mixture/internal_removed = air_contents.remove(internal_transfer_moles)
+
+		if (!internal_removed)
+			environment.merge(external_removed)
+			return 1
+
+		var/combined_heat_capacity = internal_removed.heat_capacity() + external_removed.heat_capacity()
+		var/combined_energy = internal_removed.temperature * internal_removed.heat_capacity() + external_removed.heat_capacity() * external_removed.temperature
+
+		if(!combined_heat_capacity) combined_heat_capacity = 1
+		var/final_temperature = combined_energy / combined_heat_capacity
+
+		external_removed.temperature = final_temperature
+		environment.merge(external_removed)
+
+		internal_removed.temperature = final_temperature
+		air_contents.merge(internal_removed)
+
+		network.update = 1
+
+		return 1
+
+	proc/radiate()
+
+		var/internal_transfer_moles = 0.25 * air_contents.total_moles()
+		var/datum/gas_mixture/internal_removed = air_contents.remove(internal_transfer_moles)
+
+		if (!internal_removed)
+			return 1
+
+		var/combined_heat_capacity = internal_removed.heat_capacity() + RADIATION_CAPACITY
+		var/combined_energy = internal_removed.temperature * internal_removed.heat_capacity() + (RADIATION_CAPACITY * 6.4)
+
+		var/final_temperature = combined_energy / combined_heat_capacity
+
+		internal_removed.temperature = final_temperature
+		air_contents.merge(internal_removed)
+
+		if (network)
+			network.update = 1
+
+		return 1

code/ATMOSPHERICS/components/unary/unary_base.dm

@@ -0,0 +1,88 @@
+/obj/machinery/atmospherics/unary
+	dir = SOUTH
+	initialize_directions = SOUTH
+	layer = TURF_LAYER+0.1
+
+	var/datum/gas_mixture/air_contents
+
+	var/obj/machinery/atmospherics/node
+
+	var/datum/pipe_network/network
+
+	New()
+		..()
+		initialize_directions = dir
+		air_contents = new
+
+		air_contents.volume = 200
+
+// Housekeeping and pipe network stuff below
+	network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+		if(reference == node)
+			network = new_network
+
+		if(new_network.normal_members.Find(src))
+			return 0
+
+		new_network.normal_members += src
+
+		return null
+
+	Del()
+		loc = null
+
+		if(node)
+			node.disconnect(src)
+			del(network)
+
+		node = null
+
+		..()
+
+	initialize()
+		if(node) return
+
+		var/node_connect = dir
+
+		for(var/obj/machinery/atmospherics/target in get_step(src,node_connect))
+			if(target.initialize_directions & get_dir(target,src))
+				node = target
+				break
+
+		update_icon()
+
+	build_network()
+		if(!network && node)
+			network = new /datum/pipe_network()
+			network.normal_members += src
+			network.build_network(node, src)
+
+
+	return_network(obj/machinery/atmospherics/reference)
+		build_network()
+
+		if(reference==node)
+			return network
+
+		return null
+
+	reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
+		if(network == old_network)
+			network = new_network
+
+		return 1
+
+	return_network_air(datum/pipe_network/reference)
+		var/list/results = list()
+
+		if(network == reference)
+			results += air_contents
+
+		return results
+
+	disconnect(obj/machinery/atmospherics/reference)
+		if(reference==node)
+			del(network)
+			node = null
+
+		return null

code/ATMOSPHERICS/components/unary/vent_pump.dm

@@ -0,0 +1,351 @@
+/obj/machinery/atmospherics/unary/vent_pump
+	icon = 'icons/obj/atmospherics/vent_pump.dmi'
+	icon_state = "off"
+
+	name = "Air Vent"
+	desc = "Has a valve and pump attached to it"
+	use_power = 1
+
+	var/area/initial_loc
+	level = 1
+	var/area_uid
+	var/id_tag = null
+
+	var/on = 0
+	var/pump_direction = 1 //0 = siphoning, 1 = releasing
+
+	var/external_pressure_bound = ONE_ATMOSPHERE
+	var/internal_pressure_bound = 0
+
+	var/pressure_checks = 1
+	//1: Do not pass external_pressure_bound
+	//2: Do not pass internal_pressure_bound
+	//3: Do not pass either
+
+	var/welded = 0 // Added for aliens -- TLE
+
+	var/frequency = 1439
+	var/datum/radio_frequency/radio_connection
+
+	var/radio_filter_out
+	var/radio_filter_in
+
+	on
+		on = 1
+		icon_state = "out"
+
+	siphon
+		pump_direction = 0
+		icon_state = "off"
+
+		on
+			on = 1
+			icon_state = "in"
+
+	New()
+		initial_loc = get_area(loc)
+		if (initial_loc.master)
+			initial_loc = initial_loc.master
+		area_uid = initial_loc.uid
+		if (!id_tag)
+			assign_uid()
+			id_tag = num2text(uid)
+		if(ticker && ticker.current_state == 3)//if the game is running
+			src.initialize()
+			src.broadcast_status()
+		..()
+
+	high_volume
+		name = "Large Air Vent"
+		power_channel = EQUIP
+		New()
+			..()
+			air_contents.volume = 1000
+
+	update_icon()
+		if(welded)
+			icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]weld"
+			return
+		if(on && !(stat & (NOPOWER|BROKEN)))
+			if(pump_direction)
+				icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]out"
+			else
+				icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]in"
+		else
+			icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off"
+
+		return
+
+	process()
+		..()
+		if(stat & (NOPOWER|BROKEN))
+			return
+		if (!node)
+			on = 0
+		//broadcast_status() // from now air alarm/control computer should request update purposely --rastaf0
+		if(!on)
+			return 0
+
+		if(welded)
+			return 0
+
+		var/datum/gas_mixture/environment = loc.return_air()
+		var/environment_pressure = environment.return_pressure()
+
+		if(pump_direction) //internal -> external
+			var/pressure_delta = 10000
+
+			if(pressure_checks&1)
+				pressure_delta = min(pressure_delta, (external_pressure_bound - environment_pressure))
+			if(pressure_checks&2)
+				pressure_delta = min(pressure_delta, (air_contents.return_pressure() - internal_pressure_bound))
+
+			if(pressure_delta > 0.5)
+				if(air_contents.temperature > 0)
+					var/transfer_moles = pressure_delta*environment.volume/(air_contents.temperature * R_IDEAL_GAS_EQUATION)
+
+					var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
+
+					loc.assume_air(removed)
+
+					if(network)
+						network.update = 1
+
+		else //external -> internal
+			var/pressure_delta = 10000
+			if(pressure_checks&1)
+				pressure_delta = min(pressure_delta, (environment_pressure - external_pressure_bound))
+			if(pressure_checks&2)
+				pressure_delta = min(pressure_delta, (internal_pressure_bound - air_contents.return_pressure()))
+
+			if(pressure_delta > 0.5)
+				if(environment.temperature > 0)
+					var/transfer_moles = pressure_delta*air_contents.volume/(environment.temperature * R_IDEAL_GAS_EQUATION)
+
+					var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
+					if (isnull(removed)) //in space
+						return
+
+					air_contents.merge(removed)
+
+					if(network)
+						network.update = 1
+
+		return 1
+
+	//Radio remote control
+
+	proc
+		set_frequency(new_frequency)
+			radio_controller.remove_object(src, frequency)
+			frequency = new_frequency
+			if(frequency)
+				radio_connection = radio_controller.add_object(src, frequency,radio_filter_in)
+
+		broadcast_status()
+			if(!radio_connection)
+				return 0
+
+			var/datum/signal/signal = new
+			signal.transmission_method = 1 //radio signal
+			signal.source = src
+
+			signal.data = list(
+				"area" = src.area_uid,
+				"tag" = src.id_tag,
+				"device" = "AVP",
+				"power" = on,
+				"direction" = pump_direction?("release"):("siphon"),
+				"checks" = pressure_checks,
+				"internal" = internal_pressure_bound,
+				"external" = external_pressure_bound,
+				"timestamp" = world.time,
+				"sigtype" = "status"
+			)
+
+			if(!initial_loc.air_vent_names[id_tag])
+				var/new_name = "[initial_loc.name] Vent Pump #[initial_loc.air_vent_names.len+1]"
+				initial_loc.air_vent_names[id_tag] = new_name
+				src.name = new_name
+			initial_loc.air_vent_info[id_tag] = signal.data
+
+			radio_connection.post_signal(src, signal, radio_filter_out)
+
+			return 1
+
+
+	initialize()
+		..()
+
+		//some vents work his own spesial way
+		radio_filter_in = frequency==1439?(RADIO_FROM_AIRALARM):null
+		radio_filter_out = frequency==1439?(RADIO_TO_AIRALARM):null
+		if(frequency)
+			set_frequency(frequency)
+
+	receive_signal(datum/signal/signal)
+		if(stat & (NOPOWER|BROKEN))
+			return
+		//log_admin("DEBUG \[[world.timeofday]\]: /obj/machinery/atmospherics/unary/vent_pump/receive_signal([signal.debug_print()])")
+		if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
+			return 0
+
+		if(signal.data["purge"] != null)
+			pressure_checks &= ~1
+			pump_direction = 0
+
+		if(signal.data["stabalize"] != null)
+			pressure_checks |= 1
+			pump_direction = 1
+
+		if(signal.data["power"] != null)
+			on = text2num(signal.data["power"])
+
+		if(signal.data["power_toggle"] != null)
+			on = !on
+
+		if(signal.data["checks"] != null)
+			pressure_checks = text2num(signal.data["checks"])
+
+		if(signal.data["checks_toggle"] != null)
+			pressure_checks = (pressure_checks?0:3)
+
+		if(signal.data["direction"] != null)
+			pump_direction = text2num(signal.data["direction"])
+
+		if(signal.data["set_internal_pressure"] != null)
+			internal_pressure_bound = between(
+				0,
+				text2num(signal.data["set_internal_pressure"]),
+				ONE_ATMOSPHERE*50
+			)
+
+		if(signal.data["set_external_pressure"] != null)
+			external_pressure_bound = between(
+				0,
+				text2num(signal.data["set_external_pressure"]),
+				ONE_ATMOSPHERE*50
+			)
+
+		if(signal.data["adjust_internal_pressure"] != null)
+			internal_pressure_bound = between(
+				0,
+				internal_pressure_bound + text2num(signal.data["adjust_internal_pressure"]),
+				ONE_ATMOSPHERE*50
+			)
+
+		if(signal.data["adjust_external_pressure"] != null)
+			external_pressure_bound = between(
+				0,
+				external_pressure_bound + text2num(signal.data["adjust_external_pressure"]),
+				ONE_ATMOSPHERE*50
+			)
+
+		if(signal.data["init"] != null)
+			name = signal.data["init"]
+			return
+
+		if(signal.data["status"] != null)
+			spawn(2)
+				broadcast_status()
+			return //do not update_icon
+
+			//log_admin("DEBUG \[[world.timeofday]\]: vent_pump/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
+		spawn(2)
+			broadcast_status()
+		update_icon()
+		return
+
+	hide(var/i) //to make the little pipe section invisible, the icon changes.
+		if(welded)
+			icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]weld"
+			return
+		if(on&&node)
+			if(pump_direction)
+				icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]out"
+			else
+				icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]in"
+		else
+			icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off"
+			on = 0
+		return
+
+	attackby(obj/item/W, mob/user)
+		if(istype(W, /obj/item/weapon/weldingtool))
+			var/obj/item/weapon/weldingtool/WT = W
+			if (WT.remove_fuel(0,user))
+				user << "\blue Now welding the vent."
+				if(do_after(user, 20))
+					if(!src || !WT.isOn()) return
+					playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
+					if(!welded)
+						user.visible_message("[user] welds the vent shut.", "You weld the vent shut.", "You hear welding.")
+						welded = 1
+						update_icon()
+					else
+						user.visible_message("[user] unwelds the vent.", "You unweld the vent.", "You hear welding.")
+						welded = 0
+						update_icon()
+				else
+					user << "\blue The welding tool needs to be on to start this task."
+			else
+				user << "\blue You need more welding fuel to complete this task."
+				return 1
+	examine()
+		set src in oview(1)
+		..()
+		if(welded)
+			usr << "It seems welded shut."
+
+	power_change()
+		if(powered(power_channel))
+			stat &= ~NOPOWER
+		else
+			stat |= NOPOWER
+		update_icon()
+
+	attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+		if (!istype(W, /obj/item/weapon/wrench))
+			return ..()
+		if (!(stat & NOPOWER) && on)
+			user << "\red You cannot unwrench this [src], turn it off first."
+			return 1
+		var/turf/T = src.loc
+		if (level==1 && isturf(T) && T.intact)
+			user << "\red You must remove the plating first."
+			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 << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+			add_fingerprint(user)
+			return 1
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+		user << "\blue You begin to unfasten \the [src]..."
+		if (do_after(user, 40))
+			user.visible_message( \
+				"[user] unfastens \the [src].", \
+				"\blue You have unfastened \the [src].", \
+				"You hear ratchet.")
+			new /obj/item/pipe(loc, make_from=src)
+			del(src)
+
+/obj/machinery/atmospherics/unary/vent_pump/Del()
+	if(initial_loc)
+		initial_loc.air_vent_info -= id_tag
+		initial_loc.air_vent_names -= id_tag
+	..()
+	return
+
+/*
+	Alt-click to ventcrawl - Monkeys, aliens, slimes and mice.
+	This is a little buggy but somehow that just seems to plague ventcrawl.
+	I am sorry, I don't know why.
+*/
+/obj/machinery/atmospherics/unary/vent_pump/AltClick(var/mob/living/ML)
+	if(istype(ML))
+		var/list/ventcrawl_verbs = list(/mob/living/carbon/monkey/verb/ventcrawl, /mob/living/carbon/alien/verb/ventcrawl, /mob/living/carbon/slime/verb/ventcrawl,/mob/living/simple_animal/mouse/verb/ventcrawl)
+		if(length(ML.verbs & ventcrawl_verbs)) // alien queens have this removed, an istype would be complicated
+			ML.handle_ventcrawl(src)
+			return
+	..()

code/ATMOSPHERICS/components/unary/vent_scrubber.dm

@@ -0,0 +1,273 @@
+/obj/machinery/atmospherics/unary/vent_scrubber
+	icon = 'icons/obj/atmospherics/vent_scrubber.dmi'
+	icon_state = "off"
+
+	name = "Air Scrubber"
+	desc = "Has a valve and pump attached to it"
+	use_power = 1
+
+	level = 1
+
+	var/area/initial_loc
+	var/id_tag = null
+	var/frequency = 1439
+	var/datum/radio_frequency/radio_connection
+
+	var/on = 0
+	var/scrubbing = 1 //0 = siphoning, 1 = scrubbing
+	var/scrub_CO2 = 1
+	var/scrub_Toxins = 0
+	var/scrub_N2O = 0
+
+	var/volume_rate = 120
+	var/panic = 0 //is this scrubber panicked?
+
+	var/area_uid
+	var/radio_filter_out
+	var/radio_filter_in
+	New()
+		initial_loc = get_area(loc)
+		if (initial_loc.master)
+			initial_loc = initial_loc.master
+		area_uid = initial_loc.uid
+		if (!id_tag)
+			assign_uid()
+			id_tag = num2text(uid)
+		if(ticker && ticker.current_state == 3)//if the game is running
+			src.initialize()
+			src.broadcast_status()
+		..()
+
+	update_icon()
+		if(node && on && !(stat & (NOPOWER|BROKEN)))
+			if(scrubbing)
+				icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]on"
+			else
+				icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]in"
+		else
+			icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off"
+		return
+
+	proc
+		set_frequency(new_frequency)
+			radio_controller.remove_object(src, frequency)
+			frequency = new_frequency
+			radio_connection = radio_controller.add_object(src, frequency, radio_filter_in)
+
+		broadcast_status()
+			if(!radio_connection)
+				return 0
+
+			var/datum/signal/signal = new
+			signal.transmission_method = 1 //radio signal
+			signal.source = src
+			signal.data = list(
+				"area" = area_uid,
+				"tag" = id_tag,
+				"device" = "AScr",
+				"timestamp" = world.time,
+				"power" = on,
+				"scrubbing" = scrubbing,
+				"panic" = panic,
+				"filter_co2" = scrub_CO2,
+				"filter_toxins" = scrub_Toxins,
+				"filter_n2o" = scrub_N2O,
+				"sigtype" = "status"
+			)
+			if(!initial_loc.air_scrub_names[id_tag])
+				var/new_name = "[initial_loc.name] Air Scrubber #[initial_loc.air_scrub_names.len+1]"
+				initial_loc.air_scrub_names[id_tag] = new_name
+				src.name = new_name
+			initial_loc.air_scrub_info[id_tag] = signal.data
+			radio_connection.post_signal(src, signal, radio_filter_out)
+
+			return 1
+
+	initialize()
+		..()
+		radio_filter_in = frequency==initial(frequency)?(RADIO_FROM_AIRALARM):null
+		radio_filter_out = frequency==initial(frequency)?(RADIO_TO_AIRALARM):null
+		if (frequency)
+			set_frequency(frequency)
+
+	process()
+		..()
+		if(stat & (NOPOWER|BROKEN))
+			return
+		if (!node)
+			on = 0
+		//broadcast_status()
+		if(!on)
+			return 0
+
+
+		var/datum/gas_mixture/environment = loc.return_air()
+
+		if(scrubbing)
+			if((environment.toxins>0) || (environment.carbon_dioxide>0) || (environment.trace_gases.len>0))
+				var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles()
+
+				//Take a gas sample
+				var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
+				if (isnull(removed)) //in space
+					return
+
+				//Filter it
+				var/datum/gas_mixture/filtered_out = new
+				filtered_out.temperature = removed.temperature
+				if(scrub_Toxins)
+					filtered_out.toxins = removed.toxins
+					removed.toxins = 0
+				if(scrub_CO2)
+					filtered_out.carbon_dioxide = removed.carbon_dioxide
+					removed.carbon_dioxide = 0
+
+				if(removed.trace_gases.len>0)
+					for(var/datum/gas/trace_gas in removed.trace_gases)
+						if(istype(trace_gas, /datum/gas/oxygen_agent_b))
+							removed.trace_gases -= trace_gas
+							filtered_out.trace_gases += trace_gas
+						else if(istype(trace_gas, /datum/gas/sleeping_agent) && scrub_N2O)
+							removed.trace_gases -= trace_gas
+							filtered_out.trace_gases += trace_gas
+
+
+				//Remix the resulting gases
+				air_contents.merge(filtered_out)
+
+				loc.assume_air(removed)
+
+				if(network)
+					network.update = 1
+
+		else //Just siphoning all air
+			if (air_contents.return_pressure()>=50*ONE_ATMOSPHERE)
+				return
+
+			var/transfer_moles = environment.total_moles()*(volume_rate/environment.volume)
+
+			var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
+
+			air_contents.merge(removed)
+
+			if(network)
+				network.update = 1
+
+		return 1
+/* //unused piece of code
+	hide(var/i) //to make the little pipe section invisible, the icon changes.
+		if(on&&node)
+			if(scrubbing)
+				icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]on"
+			else
+				icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]in"
+		else
+			icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off"
+			on = 0
+		return
+*/
+
+	receive_signal(datum/signal/signal)
+		if(stat & (NOPOWER|BROKEN))
+			return
+		if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
+			return 0
+
+		if(signal.data["power"] != null)
+			on = text2num(signal.data["power"])
+		if(signal.data["power_toggle"] != null)
+			on = !on
+
+		if(signal.data["panic_siphon"]) //must be before if("scrubbing" thing
+			panic = text2num(signal.data["panic_siphon"] != null)
+			if(panic)
+				on = 1
+				scrubbing = 0
+				volume_rate = 2000
+			else
+				scrubbing = 1
+				volume_rate = initial(volume_rate)
+		if(signal.data["toggle_panic_siphon"] != null)
+			panic = !panic
+			if(panic)
+				on = 1
+				scrubbing = 0
+				volume_rate = 2000
+			else
+				scrubbing = 1
+				volume_rate = initial(volume_rate)
+
+		if(signal.data["scrubbing"] != null)
+			scrubbing = text2num(signal.data["scrubbing"])
+		if(signal.data["toggle_scrubbing"])
+			scrubbing = !scrubbing
+
+		if(signal.data["co2_scrub"] != null)
+			scrub_CO2 = text2num(signal.data["co2_scrub"])
+		if(signal.data["toggle_co2_scrub"])
+			scrub_CO2 = !scrub_CO2
+
+		if(signal.data["tox_scrub"] != null)
+			scrub_Toxins = text2num(signal.data["tox_scrub"])
+		if(signal.data["toggle_tox_scrub"])
+			scrub_Toxins = !scrub_Toxins
+
+		if(signal.data["n2o_scrub"] != null)
+			scrub_N2O = text2num(signal.data["n2o_scrub"])
+		if(signal.data["toggle_n2o_scrub"])
+			scrub_N2O = !scrub_N2O
+
+		if(signal.data["init"] != null)
+			name = signal.data["init"]
+			return
+
+		if(signal.data["status"] != null)
+			spawn(2)
+				broadcast_status()
+			return //do not update_icon
+
+//			log_admin("DEBUG \[[world.timeofday]\]: vent_scrubber/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
+		spawn(2)
+			broadcast_status()
+		update_icon()
+		return
+
+	power_change()
+		if(powered(power_channel))
+			stat &= ~NOPOWER
+		else
+			stat |= NOPOWER
+		update_icon()
+
+	attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+		if (!istype(W, /obj/item/weapon/wrench))
+			return ..()
+		if (!(stat & NOPOWER) && on)
+			user << "\red You cannot unwrench this [src], turn it off first."
+			return 1
+		var/turf/T = src.loc
+		if (level==1 && isturf(T) && T.intact)
+			user << "\red You must remove the plating first."
+			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 << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+			add_fingerprint(user)
+			return 1
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+		user << "\blue You begin to unfasten \the [src]..."
+		if (do_after(user, 40))
+			user.visible_message( \
+				"[user] unfastens \the [src].", \
+				"\blue You have unfastened \the [src].", \
+				"You hear ratchet.")
+			new /obj/item/pipe(loc, make_from=src)
+			del(src)
+
+/obj/machinery/atmospherics/unary/vent_scrubber/Del()
+	if(initial_loc)
+		initial_loc.air_scrub_info -= id_tag
+		initial_loc.air_scrub_names -= id_tag
+	..()
+	return

code/ATMOSPHERICS/components/valve.dm

@@ -0,0 +1,338 @@
+obj/machinery/atmospherics/valve
+	icon = 'icons/obj/atmospherics/valve.dmi'
+	icon_state = "valve0"
+
+	name = "manual valve"
+	desc = "A pipe valve"
+
+	dir = SOUTH
+	initialize_directions = SOUTH|NORTH
+
+	var/open = 0
+	var/openDuringInit = 0
+
+	var/obj/machinery/atmospherics/node1
+	var/obj/machinery/atmospherics/node2
+
+	var/datum/pipe_network/network_node1
+	var/datum/pipe_network/network_node2
+
+	open
+		open = 1
+		icon_state = "valve1"
+
+	update_icon(animation)
+		if(animation)
+			flick("valve[src.open][!src.open]",src)
+		else
+			icon_state = "valve[open]"
+
+	New()
+		switch(dir)
+			if(NORTH || SOUTH)
+				initialize_directions = NORTH|SOUTH
+			if(EAST || WEST)
+				initialize_directions = EAST|WEST
+		..()
+
+	network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+
+
+		if(reference == node1)
+			network_node1 = new_network
+			if(open)
+				network_node2 = new_network
+		else if(reference == node2)
+			network_node2 = new_network
+			if(open)
+				network_node1 = new_network
+
+		if(new_network.normal_members.Find(src))
+			return 0
+
+		new_network.normal_members += src
+
+		if(open)
+			if(reference == node1)
+				if(node2)
+					return node2.network_expand(new_network, src)
+			else if(reference == node2)
+				if(node1)
+					return node1.network_expand(new_network, src)
+
+		return null
+
+	Del()
+		loc = null
+
+		if(node1)
+			node1.disconnect(src)
+			del(network_node1)
+		if(node2)
+			node2.disconnect(src)
+			del(network_node2)
+
+		node1 = null
+		node2 = null
+
+		..()
+
+	proc/open()
+
+		if(open) return 0
+
+		open = 1
+		update_icon()
+
+		if(network_node1&&network_node2)
+			network_node1.merge(network_node2)
+			network_node2 = network_node1
+
+		if(network_node1)
+			network_node1.update = 1
+		else if(network_node2)
+			network_node2.update = 1
+
+		return 1
+
+	proc/close()
+
+		if(!open)
+			return 0
+
+		open = 0
+		update_icon()
+
+		if(network_node1)
+			del(network_node1)
+		if(network_node2)
+			del(network_node2)
+
+		build_network()
+
+		return 1
+
+	proc/normalize_dir()
+		if(dir==3)
+			dir = 1
+		else if(dir==12)
+			dir = 4
+
+	attack_ai(mob/user as mob)
+		return
+
+	attack_paw(mob/user as mob)
+		return attack_hand(user)
+
+	attack_hand(mob/user as mob)
+		src.add_fingerprint(usr)
+		update_icon(1)
+		sleep(10)
+		if (src.open)
+			src.close()
+		else
+			src.open()
+
+	process()
+		..()
+		. = PROCESS_KILL
+
+/*		if(open && (!node1 || !node2))
+			close()
+		if(!node1)
+			if(!nodealert)
+				//world << "Missing node from [src] at [src.x],[src.y],[src.z]"
+				nodealert = 1
+		else if (!node2)
+			if(!nodealert)
+				//world << "Missing node from [src] at [src.x],[src.y],[src.z]"
+				nodealert = 1
+		else if (nodealert)
+			nodealert = 0
+*/
+
+		return
+
+	initialize()
+		normalize_dir()
+
+		var/node1_dir
+		var/node2_dir
+
+		for(var/direction in cardinal)
+			if(direction&initialize_directions)
+				if (!node1_dir)
+					node1_dir = direction
+				else if (!node2_dir)
+					node2_dir = direction
+
+		for(var/obj/machinery/atmospherics/target in get_step(src,node1_dir))
+			if(target.initialize_directions & get_dir(target,src))
+				node1 = target
+				break
+		for(var/obj/machinery/atmospherics/target in get_step(src,node2_dir))
+			if(target.initialize_directions & get_dir(target,src))
+				node2 = target
+				break
+
+		build_network()
+
+		if(openDuringInit)
+			close()
+			open()
+			openDuringInit = 0
+
+/*
+		var/connect_directions
+		switch(dir)
+			if(NORTH)
+				connect_directions = NORTH|SOUTH
+			if(SOUTH)
+				connect_directions = NORTH|SOUTH
+			if(EAST)
+				connect_directions = EAST|WEST
+			if(WEST)
+				connect_directions = EAST|WEST
+			else
+				connect_directions = dir
+
+		for(var/direction in cardinal)
+			if(direction&connect_directions)
+				for(var/obj/machinery/atmospherics/target in get_step(src,direction))
+					if(target.initialize_directions & get_dir(target,src))
+						connect_directions &= ~direction
+						node1 = target
+						break
+				if(node1)
+					break
+
+		for(var/direction in cardinal)
+			if(direction&connect_directions)
+				for(var/obj/machinery/atmospherics/target in get_step(src,direction))
+					if(target.initialize_directions & get_dir(target,src))
+						node2 = target
+						break
+				if(node1)
+					break
+*/
+	build_network()
+		if(!network_node1 && node1)
+			network_node1 = new /datum/pipe_network()
+			network_node1.normal_members += src
+			network_node1.build_network(node1, src)
+
+		if(!network_node2 && node2)
+			network_node2 = new /datum/pipe_network()
+			network_node2.normal_members += src
+			network_node2.build_network(node2, src)
+
+
+	return_network(obj/machinery/atmospherics/reference)
+		build_network()
+
+		if(reference==node1)
+			return network_node1
+
+		if(reference==node2)
+			return network_node2
+
+		return null
+
+	reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
+		if(network_node1 == old_network)
+			network_node1 = new_network
+		if(network_node2 == old_network)
+			network_node2 = new_network
+
+		return 1
+
+	return_network_air(datum/network/reference)
+		return null
+
+	disconnect(obj/machinery/atmospherics/reference)
+		if(reference==node1)
+			del(network_node1)
+			node1 = null
+
+		else if(reference==node2)
+			del(network_node2)
+			node2 = null
+
+		return null
+
+	digital		// can be controlled by AI
+		name = "digital valve"
+		desc = "A digitally controlled valve."
+		icon = 'icons/obj/atmospherics/digital_valve.dmi'
+
+		attack_ai(mob/user as mob)
+			return src.attack_hand(user)
+
+		attack_hand(mob/user as mob)
+			if(!src.allowed(user))
+				user << "\red Access denied."
+				return
+			..()
+
+		//Radio remote control
+
+		proc
+			set_frequency(new_frequency)
+				radio_controller.remove_object(src, frequency)
+				frequency = new_frequency
+				if(frequency)
+					radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
+
+		var/frequency = 0
+		var/id = null
+		var/datum/radio_frequency/radio_connection
+
+		initialize()
+			..()
+			if(frequency)
+				set_frequency(frequency)
+
+		receive_signal(datum/signal/signal)
+			if(!signal.data["tag"] || (signal.data["tag"] != id))
+				return 0
+
+			switch(signal.data["command"])
+				if("valve_open")
+					if(!open)
+						open()
+
+				if("valve_close")
+					if(open)
+						close()
+
+				if("valve_toggle")
+					if(open)
+						close()
+					else
+						open()
+
+	attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+		if (!istype(W, /obj/item/weapon/wrench))
+			return ..()
+		if (istype(src, /obj/machinery/atmospherics/valve/digital))
+			user << "\red You cannot unwrench this [src], it's too complicated."
+			return 1
+		var/turf/T = src.loc
+		if (level==1 && isturf(T) && T.intact)
+			user << "\red You must remove the plating first."
+			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 << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+			add_fingerprint(user)
+			return 1
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+		user << "\blue You begin to unfasten \the [src]..."
+		if (do_after(user, 40))
+			user.visible_message( \
+				"[user] unfastens \the [src].", \
+				"\blue You have unfastened \the [src].", \
+				"You hear ratchet.")
+			new /obj/item/pipe(loc, make_from=src)
+			del(src)

code/ATMOSPHERICS/datum_pipe_network.dm

@@ -0,0 +1,206 @@
+var/global/list/datum/pipe_network/pipe_networks = list()
+
+datum/pipe_network
+	var/list/datum/gas_mixture/gases = list() //All of the gas_mixtures continuously connected in this network
+
+	var/list/obj/machinery/atmospherics/normal_members = list()
+	var/list/datum/pipeline/line_members = list()
+		//membership roster to go through for updates and what not
+
+	var/update = 1
+	var/datum/gas_mixture/air_transient = null
+
+	New()
+		air_transient = new()
+
+		..()
+
+	proc/process()
+		//Equalize gases amongst pipe if called for
+		if(update)
+			update = 0
+			reconcile_air() //equalize_gases(gases)
+
+		//Give pipelines their process call for pressure checking and what not. Have to remove pressure checks for the time being as pipes dont radiate heat - Mport
+		//for(var/datum/pipeline/line_member in line_members)
+		//	line_member.process()
+
+	proc/build_network(obj/machinery/atmospherics/start_normal, obj/machinery/atmospherics/reference)
+		//Purpose: Generate membership roster
+		//Notes: Assuming that members will add themselves to appropriate roster in network_expand()
+
+		if(!start_normal)
+			del(src)
+
+		start_normal.network_expand(src, reference)
+
+		update_network_gases()
+
+		if((normal_members.len>0)||(line_members.len>0))
+			pipe_networks += src
+		else
+			del(src)
+
+	proc/merge(datum/pipe_network/giver)
+		if(giver==src) return 0
+
+		normal_members |= giver.normal_members
+
+		line_members |= giver.line_members
+
+		for(var/obj/machinery/atmospherics/normal_member in giver.normal_members)
+			normal_member.reassign_network(giver, src)
+
+		for(var/datum/pipeline/line_member in giver.line_members)
+			line_member.network = src
+
+		del(giver)
+
+		update_network_gases()
+		return 1
+
+	proc/update_network_gases()
+		//Go through membership roster and make sure gases is up to date
+
+		gases = list()
+
+		for(var/obj/machinery/atmospherics/normal_member in normal_members)
+			var/result = normal_member.return_network_air(src)
+			if(result) gases += result
+
+		for(var/datum/pipeline/line_member in line_members)
+			gases += line_member.air
+
+	proc/reconcile_air()
+		//Perfectly equalize all gases members instantly
+
+		//Calculate totals from individual components
+		var/total_thermal_energy = 0
+		var/total_heat_capacity = 0
+
+		air_transient.volume = 0
+
+		air_transient.oxygen = 0
+		air_transient.nitrogen = 0
+		air_transient.toxins = 0
+		air_transient.carbon_dioxide = 0
+
+
+		air_transient.trace_gases = list()
+
+		for(var/datum/gas_mixture/gas in gases)
+			air_transient.volume += gas.volume
+			var/temp_heatcap = gas.heat_capacity()
+			total_thermal_energy += gas.temperature*temp_heatcap
+			total_heat_capacity += temp_heatcap
+
+			air_transient.oxygen += gas.oxygen
+			air_transient.nitrogen += gas.nitrogen
+			air_transient.toxins += gas.toxins
+			air_transient.carbon_dioxide += gas.carbon_dioxide
+
+			if(gas.trace_gases.len)
+				for(var/datum/gas/trace_gas in gas.trace_gases)
+					var/datum/gas/corresponding = locate(trace_gas.type) in air_transient.trace_gases
+					if(!corresponding)
+						corresponding = new trace_gas.type()
+						air_transient.trace_gases += corresponding
+
+					corresponding.moles += trace_gas.moles
+
+		if(air_transient.volume > 0)
+
+			if(total_heat_capacity > 0)
+				air_transient.temperature = total_thermal_energy/total_heat_capacity
+
+				//Allow air mixture to react
+				if(air_transient.react())
+					update = 1
+
+			else
+				air_transient.temperature = 0
+
+			//Update individual gas_mixtures by volume ratio
+			for(var/datum/gas_mixture/gas in gases)
+				gas.oxygen = air_transient.oxygen*gas.volume/air_transient.volume
+				gas.nitrogen = air_transient.nitrogen*gas.volume/air_transient.volume
+				gas.toxins = air_transient.toxins*gas.volume/air_transient.volume
+				gas.carbon_dioxide = air_transient.carbon_dioxide*gas.volume/air_transient.volume
+
+				gas.temperature = air_transient.temperature
+
+				if(air_transient.trace_gases.len)
+					for(var/datum/gas/trace_gas in air_transient.trace_gases)
+						var/datum/gas/corresponding = locate(trace_gas.type) in gas.trace_gases
+						if(!corresponding)
+							corresponding = new trace_gas.type()
+							gas.trace_gases += corresponding
+
+						corresponding.moles = trace_gas.moles*gas.volume/air_transient.volume
+				gas.update_values()
+		air_transient.update_values()
+		return 1
+
+proc/equalize_gases(datum/gas_mixture/list/gases)
+	//Perfectly equalize all gases members instantly
+
+	//Calculate totals from individual components
+	var/total_volume = 0
+	var/total_thermal_energy = 0
+	var/total_heat_capacity = 0
+
+	var/total_oxygen = 0
+	var/total_nitrogen = 0
+	var/total_toxins = 0
+	var/total_carbon_dioxide = 0
+
+	var/list/total_trace_gases = list()
+
+	for(var/datum/gas_mixture/gas in gases)
+		total_volume += gas.volume
+		var/temp_heatcap = gas.heat_capacity()
+		total_thermal_energy += gas.temperature*temp_heatcap
+		total_heat_capacity += temp_heatcap
+
+		total_oxygen += gas.oxygen
+		total_nitrogen += gas.nitrogen
+		total_toxins += gas.toxins
+		total_carbon_dioxide += gas.carbon_dioxide
+
+		if(gas.trace_gases.len)
+			for(var/datum/gas/trace_gas in gas.trace_gases)
+				var/datum/gas/corresponding = locate(trace_gas.type) in total_trace_gases
+				if(!corresponding)
+					corresponding = new trace_gas.type()
+					total_trace_gases += corresponding
+
+				corresponding.moles += trace_gas.moles
+
+	if(total_volume > 0)
+
+		//Calculate temperature
+		var/temperature = 0
+
+		if(total_heat_capacity > 0)
+			temperature = total_thermal_energy/total_heat_capacity
+
+		//Update individual gas_mixtures by volume ratio
+		for(var/datum/gas_mixture/gas in gases)
+			gas.oxygen = total_oxygen*gas.volume/total_volume
+			gas.nitrogen = total_nitrogen*gas.volume/total_volume
+			gas.toxins = total_toxins*gas.volume/total_volume
+			gas.carbon_dioxide = total_carbon_dioxide*gas.volume/total_volume
+
+			gas.temperature = temperature
+
+			if(total_trace_gases.len)
+				for(var/datum/gas/trace_gas in total_trace_gases)
+					var/datum/gas/corresponding = locate(trace_gas.type) in gas.trace_gases
+					if(!corresponding)
+						corresponding = new trace_gas.type()
+						gas.trace_gases += corresponding
+
+					corresponding.moles = trace_gas.moles*gas.volume/total_volume
+			gas.update_values()
+
+	return 1

code/ATMOSPHERICS/datum_pipeline.dm

@@ -0,0 +1,213 @@
+datum/pipeline
+	var/datum/gas_mixture/air
+
+	var/list/obj/machinery/atmospherics/pipe/members
+	var/list/obj/machinery/atmospherics/pipe/edges //Used for building networks
+
+	var/datum/pipe_network/network
+
+	var/alert_pressure = 0
+
+	Del()
+		if(network)
+			del(network)
+
+		if(air && air.volume)
+			temporarily_store_air()
+			del(air)
+
+		..()
+
+	proc/process()//This use to be called called from the pipe networks
+
+		//Check to see if pressure is within acceptable limits
+		var/pressure = air.return_pressure()
+		if(pressure > alert_pressure)
+			for(var/obj/machinery/atmospherics/pipe/member in members)
+				if(!member.check_pressure(pressure))
+					break //Only delete 1 pipe per process
+
+		//Allow for reactions
+		//air.react() //Should be handled by pipe_network now
+
+	proc/temporarily_store_air()
+		//Update individual gas_mixtures by volume ratio
+
+		for(var/obj/machinery/atmospherics/pipe/member in members)
+			member.air_temporary = new
+			member.air_temporary.volume = member.volume
+
+			member.air_temporary.oxygen = air.oxygen*member.volume/air.volume
+			member.air_temporary.nitrogen = air.nitrogen*member.volume/air.volume
+			member.air_temporary.toxins = air.toxins*member.volume/air.volume
+			member.air_temporary.carbon_dioxide = air.carbon_dioxide*member.volume/air.volume
+
+			member.air_temporary.temperature = air.temperature
+
+			if(air.trace_gases.len)
+				for(var/datum/gas/trace_gas in air.trace_gases)
+					var/datum/gas/corresponding = new trace_gas.type()
+					member.air_temporary.trace_gases += corresponding
+
+					corresponding.moles = trace_gas.moles*member.volume/air.volume
+			member.air_temporary.update_values()
+
+	proc/build_pipeline(obj/machinery/atmospherics/pipe/base)
+		air = new
+
+		var/list/possible_expansions = list(base)
+		members = list(base)
+		edges = list()
+
+		var/volume = base.volume
+		base.parent = src
+		alert_pressure = base.alert_pressure
+
+		if(base.air_temporary)
+			air = base.air_temporary
+			base.air_temporary = null
+		else
+			air = new
+
+		while(possible_expansions.len>0)
+			for(var/obj/machinery/atmospherics/pipe/borderline in possible_expansions)
+
+				var/list/result = borderline.pipeline_expansion()
+				var/edge_check = result.len
+
+				if(result.len>0)
+					for(var/obj/machinery/atmospherics/pipe/item in result)
+						if(!members.Find(item))
+							members += item
+							possible_expansions += item
+
+							volume += item.volume
+							item.parent = src
+
+							alert_pressure = min(alert_pressure, item.alert_pressure)
+
+							if(item.air_temporary)
+								air.merge(item.air_temporary)
+
+						edge_check--
+
+				if(edge_check>0)
+					edges += borderline
+
+				possible_expansions -= borderline
+
+		air.volume = volume
+
+	proc/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+
+		if(new_network.line_members.Find(src))
+			return 0
+
+		new_network.line_members += src
+
+		network = new_network
+
+		for(var/obj/machinery/atmospherics/pipe/edge in edges)
+			for(var/obj/machinery/atmospherics/result in edge.pipeline_expansion())
+				if(!istype(result,/obj/machinery/atmospherics/pipe) && (result!=reference))
+					result.network_expand(new_network, edge)
+
+		return 1
+
+	proc/return_network(obj/machinery/atmospherics/reference)
+		if(!network)
+			network = new /datum/pipe_network()
+			network.build_network(src, null)
+				//technically passing these parameters should not be allowed
+				//however pipe_network.build_network(..) and pipeline.network_extend(...)
+				//		were setup to properly handle this case
+
+		return network
+
+	proc/mingle_with_turf(turf/simulated/target, mingle_volume)
+		var/datum/gas_mixture/air_sample = air.remove_ratio(mingle_volume/air.volume)
+		air_sample.volume = mingle_volume
+
+		if(istype(target) && target.zone)
+			//Have to consider preservation of group statuses
+			var/datum/gas_mixture/turf_copy = new
+
+			turf_copy.copy_from(target.zone.air)
+			turf_copy.volume = target.zone.air.volume //Copy a good representation of the turf from parent group
+
+			equalize_gases(list(air_sample, turf_copy))
+			air.merge(air_sample)
+
+			turf_copy.subtract(target.zone.air)
+
+			target.zone.air.merge(turf_copy)
+
+		else
+			var/datum/gas_mixture/turf_air = target.return_air()
+
+			equalize_gases(list(air_sample, turf_air))
+			air.merge(air_sample)
+			//turf_air already modified by equalize_gases()
+
+		if(network)
+			network.update = 1
+
+	proc/temperature_interact(turf/target, share_volume, thermal_conductivity)
+		var/total_heat_capacity = air.heat_capacity()
+		var/partial_heat_capacity = total_heat_capacity*(share_volume/air.volume)
+
+		if(istype(target, /turf/simulated))
+			var/turf/simulated/modeled_location = target
+
+			if(modeled_location.blocks_air)
+
+				if((modeled_location.heat_capacity>0) && (partial_heat_capacity>0))
+					var/delta_temperature = air.temperature - modeled_location.temperature
+
+					var/heat = thermal_conductivity*delta_temperature* \
+						(partial_heat_capacity*modeled_location.heat_capacity/(partial_heat_capacity+modeled_location.heat_capacity))
+
+					air.temperature -= heat/total_heat_capacity
+					modeled_location.temperature += heat/modeled_location.heat_capacity
+
+			else
+				var/delta_temperature = 0
+				var/sharer_heat_capacity = 0
+
+				if(modeled_location.zone)
+					delta_temperature = (air.temperature - modeled_location.zone.air.temperature)
+					sharer_heat_capacity = modeled_location.zone.air.heat_capacity()
+				else
+					delta_temperature = (air.temperature - modeled_location.air.temperature)
+					sharer_heat_capacity = modeled_location.air.heat_capacity()
+
+				var/self_temperature_delta = 0
+				var/sharer_temperature_delta = 0
+
+				if((sharer_heat_capacity>0) && (partial_heat_capacity>0))
+					var/heat = thermal_conductivity*delta_temperature* \
+						(partial_heat_capacity*sharer_heat_capacity/(partial_heat_capacity+sharer_heat_capacity))
+
+					self_temperature_delta = -heat/total_heat_capacity
+					sharer_temperature_delta = heat/sharer_heat_capacity
+				else
+					return 1
+
+				air.temperature += self_temperature_delta
+
+				if(modeled_location.zone)
+					modeled_location.zone.air.temperature += sharer_temperature_delta/modeled_location.zone.air.group_multiplier
+				else
+					modeled_location.air.temperature += sharer_temperature_delta
+
+
+		else
+			if((target.heat_capacity>0) && (partial_heat_capacity>0))
+				var/delta_temperature = air.temperature - target.temperature
+
+				var/heat = thermal_conductivity*delta_temperature* \
+					(partial_heat_capacity*target.heat_capacity/(partial_heat_capacity+target.heat_capacity))
+
+				air.temperature -= heat/total_heat_capacity
+		if(network)
+			network.update = 1

code/ATMOSPHERICS/he_pipes.dm

@@ -0,0 +1,106 @@
+
+obj/machinery/atmospherics/pipe/simple/heat_exchanging
+	icon = 'icons/obj/pipes/heat.dmi'
+	icon_state = "intact"
+	level = 2
+	var/initialize_directions_he
+
+	minimum_temperature_difference = 20
+	thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT
+
+	// BubbleWrap
+	New()
+		..()
+		initialize_directions_he = initialize_directions	// The auto-detection from /pipe is good enough for a simple HE pipe
+	// BubbleWrap END
+
+	initialize()
+		normalize_dir()
+		var/node1_dir
+		var/node2_dir
+
+		for(var/direction in cardinal)
+			if(direction&initialize_directions_he)
+				if (!node1_dir)
+					node1_dir = direction
+				else if (!node2_dir)
+					node2_dir = direction
+
+		for(var/obj/machinery/atmospherics/pipe/simple/heat_exchanging/target in get_step(src,node1_dir))
+			if(target.initialize_directions_he & get_dir(target,src))
+				node1 = target
+				break
+		for(var/obj/machinery/atmospherics/pipe/simple/heat_exchanging/target in get_step(src,node2_dir))
+			if(target.initialize_directions_he & get_dir(target,src))
+				node2 = target
+				break
+		update_icon()
+		return
+
+
+	process()
+		if(!parent)
+			..()
+		else
+			var/environment_temperature = 0
+			if(istype(loc, /turf/simulated/))
+				if(loc:blocks_air)
+					environment_temperature = loc:temperature
+				else
+					var/datum/gas_mixture/environment = loc.return_air()
+					environment_temperature = environment.temperature
+			else
+				environment_temperature = loc:temperature
+			var/datum/gas_mixture/pipe_air = return_air()
+			if(abs(environment_temperature-pipe_air.temperature) > minimum_temperature_difference)
+				parent.temperature_interact(loc, volume, thermal_conductivity)
+
+
+
+obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction
+	icon = 'icons/obj/pipes/junction.dmi'
+	icon_state = "intact"
+	level = 2
+	minimum_temperature_difference = 300
+	thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
+
+	// BubbleWrap
+	New()
+		.. ()
+		switch ( dir )
+			if ( SOUTH )
+				initialize_directions = NORTH
+				initialize_directions_he = SOUTH
+			if ( NORTH )
+				initialize_directions = SOUTH
+				initialize_directions_he = NORTH
+			if ( EAST )
+				initialize_directions = WEST
+				initialize_directions_he = EAST
+			if ( WEST )
+				initialize_directions = EAST
+				initialize_directions_he = WEST
+	// BubbleWrap END
+
+	update_icon()
+		if(node1&&node2)
+			icon_state = "intact"
+		else
+			var/have_node1 = node1?1:0
+			var/have_node2 = node2?1:0
+			icon_state = "exposed[have_node1][have_node2]"
+		if(!node1&&!node2)
+			del(src)
+
+	initialize()
+		for(var/obj/machinery/atmospherics/target in get_step(src,initialize_directions))
+			if(target.initialize_directions & get_dir(target,src))
+				node1 = target
+				break
+		for(var/obj/machinery/atmospherics/pipe/simple/heat_exchanging/target in get_step(src,initialize_directions_he))
+			if(target.initialize_directions_he & get_dir(target,src))
+				node2 = target
+				break
+
+		update_icon()
+		return

code/ATMOSPHERICS/mapdebugging.dm

@@ -0,0 +1,16 @@
+client/verb/discon_pipes()
+	set name = "Show Disconnected Pipes"
+	set category = "Debug"
+
+	for(var/obj/machinery/atmospherics/pipe/simple/P in world)
+		if(!P.node1 || !P.node2)
+			usr << "[P], [P.x], [P.y], [P.z], [P.loc.loc]"
+
+	for(var/obj/machinery/atmospherics/pipe/manifold/P in world)
+		if(!P.node1 || !P.node2 || !P.node3)
+			usr << "[P], [P.x], [P.y], [P.z], [P.loc.loc]"
+
+	for(var/obj/machinery/atmospherics/pipe/manifold4w/P in world)
+		if(!P.node1 || !P.node2 || !P.node3 || !P.node4)
+			usr << "[P], [P.x], [P.y], [P.z], [P.loc.loc]"
+//With thanks to mini. Check before use, uncheck after. Do Not Use on a live server.