Merge pull request #54 from ParadiseSS13/master

Merge from Master

.gitignore

@@ -12,5 +12,6 @@
 #ignore other, specific files and folers
 data/
 /maps/backup/*
+/maps/RandomZLevels/backup/*
 /maps/cyberiad.dmm.backup
 /nano/debug.html

code/ATMOSPHERICS/_atmos_setup.dm

@@ -0,0 +1,271 @@
+//--------------------------------------------
+// Pipe colors
+//
+// Add them here and to the pipe_colors list
+//  to automatically add them to all relevant
+//  atmospherics devices.
+//--------------------------------------------
+
+#define	PIPE_COLOR_GREY		"#ffffff"	//yes white is grey
+#define	PIPE_COLOR_RED		"#ff0000"
+#define	PIPE_COLOR_BLUE		"#0000ff"
+#define	PIPE_COLOR_CYAN		"#00ffff"
+#define	PIPE_COLOR_GREEN	"#00ff00"
+#define	PIPE_COLOR_YELLOW	"#ffcc00"
+#define	PIPE_COLOR_PURPLE	"#5c1ec0"
+
+var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "purple" = PIPE_COLOR_PURPLE)
+
+/proc/pipe_color_lookup(var/color)
+	for(var/C in pipe_colors)
+		if(color == pipe_colors[C])
+			return "[C]"
+
+/proc/pipe_color_check(var/color)
+	if(!color)
+		return 1
+	for(var/C in pipe_colors)
+		if(color == pipe_colors[C])
+			return 1
+	return 0
+
+//--------------------------------------------
+// Icon cache generation
+//--------------------------------------------
+
+/datum/pipe_icon_manager
+	var/list/pipe_icons[]
+	var/list/manifold_icons[]
+	var/list/device_icons[]
+	var/list/underlays[]
+	//var/list/underlays_down[]
+	//var/list/underlays_exposed[]
+	//var/list/underlays_intact[]
+	//var/list/pipe_underlays_exposed[]
+	//var/list/pipe_underlays_intact[]
+	var/list/omni_icons[]
+
+/datum/pipe_icon_manager/New()
+	check_icons()
+
+/datum/pipe_icon_manager/proc/get_atmos_icon(var/device, var/dir, var/color, var/state)
+	check_icons()
+
+	device = "[device]"
+	state = "[state]"
+	color = "[color]"
+	dir = "[dir]"
+
+	switch(device)
+		if("pipe")
+			return pipe_icons[state + color]
+		if("manifold")
+			return manifold_icons[state + color]
+		if("device")
+			return device_icons[state]
+		if("omni")
+			return omni_icons[state]
+		if("underlay")
+			return underlays[state + dir + color]
+		//if("underlay_intact")
+		//	return underlays_intact[state + dir + color]
+	//	if("underlay_exposed")
+	//		return underlays_exposed[state + dir + color]
+	//	if("underlay_down")
+	//		return underlays_down[state + dir + color]
+	//	if("pipe_underlay_exposed")
+	//		return pipe_underlays_exposed[state + dir + color]
+	//	if("pipe_underlay_intact")
+	//		return pipe_underlays_intact[state + dir + color]
+
+/datum/pipe_icon_manager/proc/check_icons()
+	if(!pipe_icons)
+		gen_pipe_icons()
+	if(!manifold_icons)
+		gen_manifold_icons()
+	if(!device_icons)
+		gen_device_icons()
+	if(!omni_icons)
+		gen_omni_icons()
+	//if(!underlays_intact || !underlays_down || !underlays_exposed || !pipe_underlays_exposed || !pipe_underlays_intact)
+	if(!underlays)
+		gen_underlay_icons()
+
+/datum/pipe_icon_manager/proc/gen_pipe_icons()
+	if(!pipe_icons)
+		pipe_icons = new()
+
+	var/icon/pipe = new('icons/atmos/pipes.dmi')
+
+	for(var/state in pipe.IconStates())
+		if(!state || findtext(state, "map"))
+			continue
+
+		var/cache_name = state
+		var/image/I = image('icons/atmos/pipes.dmi', icon_state = state)
+		pipe_icons[cache_name] = I
+
+		for(var/pipe_color in pipe_colors)
+			I = image('icons/atmos/pipes.dmi', icon_state = state)
+			I.color = pipe_colors[pipe_color]
+			pipe_icons[state + "[pipe_colors[pipe_color]]"] = I
+
+/datum/pipe_icon_manager/proc/gen_manifold_icons()
+	if(!manifold_icons)
+		manifold_icons = new()
+
+	var/icon/pipe = new('icons/atmos/manifold.dmi')
+
+	for(var/state in pipe.IconStates())
+		if(findtext(state, "clamps"))
+			var/image/I = image('icons/atmos/manifold.dmi', icon_state = state)
+			manifold_icons[state] = I
+			continue
+
+		if(findtext(state, "core") || findtext(state, "4way"))
+			var/image/I = image('icons/atmos/manifold.dmi', icon_state = state)
+			manifold_icons[state] = I
+			for(var/pipe_color in pipe_colors)
+				I = image('icons/atmos/manifold.dmi', icon_state = state)
+				I.color = pipe_colors[pipe_color]
+				manifold_icons[state + pipe_colors[pipe_color]] = I
+
+/datum/pipe_icon_manager/proc/gen_device_icons()
+	if(!device_icons)
+		device_icons = new()
+
+	var/icon/device
+
+	device = new('icons/atmos/vent_pump.dmi')
+	for(var/state in device.IconStates())
+		if(!state || findtext(state, "map"))
+			continue
+		device_icons["vent" + state] = image('icons/atmos/vent_pump.dmi', icon_state = state)
+
+	device = new('icons/atmos/vent_scrubber.dmi')
+	for(var/state in device.IconStates())
+		if(!state || findtext(state, "map"))
+			continue
+		device_icons["scrubber" + state] = image('icons/atmos/vent_scrubber.dmi', icon_state = state)
+
+/datum/pipe_icon_manager/proc/gen_omni_icons()
+	if(!omni_icons)
+		omni_icons = new()
+
+	var/icon/omni = new('icons/atmos/omni_devices.dmi')
+
+	for(var/state in omni.IconStates())
+		if(!state || findtext(state, "map"))
+			continue
+		omni_icons[state] = image('icons/atmos/omni_devices.dmi', icon_state = state)
+
+
+/datum/pipe_icon_manager/proc/gen_underlay_icons()
+
+	if(!underlays)
+		underlays = new()
+
+	var/icon/pipe = new('icons/atmos/pipe_underlays.dmi')
+
+	for(var/state in pipe.IconStates())
+		if(state == "")
+			continue
+
+		var/cache_name = state
+
+		for(var/D in cardinal)
+			var/image/I = image('icons/atmos/pipe_underlays.dmi', icon_state = state, dir = D)
+			underlays[cache_name + "[D]"] = I
+			for(var/pipe_color in pipe_colors)
+				I = image('icons/atmos/pipe_underlays.dmi', icon_state = state, dir = D)
+				I.color = pipe_colors[pipe_color]
+				underlays[state + "[D]" + "[pipe_colors[pipe_color]]"] = I
+
+/*
+/datum/pipe_icon_manager/proc/gen_underlay_icons()
+	if(!underlays_intact)
+		underlays_intact = new()
+	if(!underlays_exposed)
+		underlays_exposed = new()
+	if(!underlays_down)
+		underlays_down = new()
+	if(!pipe_underlays_exposed)
+		pipe_underlays_exposed = new()
+	if(!pipe_underlays_intact)
+		pipe_underlays_intact = new()
+
+	var/icon/pipe = new('icons/atmos/pipe_underlays.dmi')
+
+	for(var/state in pipe.IconStates())
+		if(state == "")
+			continue
+
+		for(var/D in cardinal)
+			var/image/I = image('icons/atmos/pipe_underlays.dmi', icon_state = state, dir = D)
+			switch(state)
+				if("intact")
+					underlays_intact["[D]"] = I
+				if("exposed")
+					underlays_exposed["[D]"] = I
+				if("down")
+					underlays_down["[D]"] = I
+				if("pipe_exposed")
+					pipe_underlays_exposed["[D]"] = I
+				if("pipe_intact")
+					pipe_underlays_intact["[D]"] = I
+				if("intact-supply")
+					underlays_intact["[D]"] = I
+				if("exposed-supply")
+					underlays_exposed["[D]"] = I
+				if("down-supply")
+					underlays_down["[D]"] = I
+				if("pipe_exposed-supply")
+					pipe_underlays_exposed["[D]"] = I
+				if("pipe_intact-supply")
+					pipe_underlays_intact["[D]"] = I
+				if("intact-scrubbers")
+					underlays_intact["[D]"] = I
+				if("exposed-scrubbers")
+					underlays_exposed["[D]"] = I
+				if("down-scrubbers")
+					underlays_down["[D]"] = I
+				if("pipe_exposed-scrubbers")
+					pipe_underlays_exposed["[D]"] = I
+				if("pipe_intact-scrubbers")
+					pipe_underlays_intact["[D]"] = I
+			for(var/pipe_color in pipe_colors)
+				I = image('icons/atmos/pipe_underlays.dmi', icon_state = state, dir = D)
+				I.color = pipe_colors[pipe_color]
+				switch(state)
+					if("intact")
+						underlays_intact["[D]" + pipe_colors[pipe_color]] = I
+					if("exposed")
+						underlays_exposed["[D]" + pipe_colors[pipe_color]] = I
+					if("down")
+						underlays_down["[D]" + pipe_colors[pipe_color]] = I
+					if("pipe_exposed")
+						pipe_underlays_exposed["[D]" + pipe_colors[pipe_color]] = I
+					if("pipe_intact")
+						pipe_underlays_intact["[D]" + pipe_colors[pipe_color]] = I
+					if("intact-supply")
+						underlays_intact["[D]" + pipe_colors[pipe_color]] = I
+					if("exposed-supply")
+						underlays_exposed["[D]" + pipe_colors[pipe_color]] = I
+					if("down-supply")
+						underlays_down["[D]" + pipe_colors[pipe_color]] = I
+					if("pipe_exposed-supply")
+						pipe_underlays_exposed["[D]" + pipe_colors[pipe_color]] = I
+					if("pipe_intact-supply")
+						pipe_underlays_intact["[D]" + pipe_colors[pipe_color]] = I
+					if("intact-scrubbers")
+						underlays_intact["[D]" + pipe_colors[pipe_color]] = I
+					if("exposed-scrubbers")
+						underlays_exposed["[D]" + pipe_colors[pipe_color]] = I
+					if("down-scrubbers")
+						underlays_down["[D]" + pipe_colors[pipe_color]] = I
+					if("pipe_exposed-scrubbers")
+						pipe_underlays_exposed["[D]" + pipe_colors[pipe_color]] = I
+					if("pipe_intact-scrubbers")
+						pipe_underlays_intact["[D]" + pipe_colors[pipe_color]] = I
+
+*/

code/ATMOSPHERICS/atmospherics.dm

@@ -9,49 +9,129 @@ Pipes -> Pipelines
 Pipelines + Other Objects -> Pipe network
 
 */
-
-obj/machinery/atmospherics
+/obj/machinery/atmospherics
 	anchored = 1
 	idle_power_usage = 0
 	active_power_usage = 0
 	power_channel = ENVIRON
 	var/nodealert = 0
+	
+	layer = 2.4 //under wires with their 2.44	
 
+	var/connect_types[] = list(1) //1=regular, 2=supply, 3=scrubber
+	var/connected_to = 1 //same as above, currently not used for anything
+	var/icon_connect_type = "" //"-supply" or "-scrubbers"
+	
+	var/initialize_directions = 0
+	var/pipe_color
+	
+	var/global/datum/pipe_icon_manager/icon_manager
 
+/obj/machinery/atmospherics/New()
+	if(!icon_manager)
+		icon_manager = new()
+	
+	if(!pipe_color)
+		pipe_color = color
+	color = null
+	
+	if(!pipe_color_check(pipe_color))
+		pipe_color = null
+	..()
 
-obj/machinery/atmospherics/var/initialize_directions = 0
-obj/machinery/atmospherics/var/_color
+/obj/machinery/atmospherics/attackby(atom/A, mob/user as mob)
+	if(istype(A, /obj/item/device/pipe_painter))
+		return
+	..()
 
-obj/machinery/atmospherics/process()
+/obj/machinery/atmospherics/proc/add_underlay(var/turf/T, var/obj/machinery/atmospherics/node, var/direction, var/icon_connect_type)
+	if(node)
+		if(T.intact && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
+			//underlays += icon_manager.get_atmos_icon("underlay_down", direction, color_cache_name(node))
+			underlays += icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "down" + icon_connect_type)
+		else
+			//underlays += icon_manager.get_atmos_icon("underlay_intact", direction, color_cache_name(node))
+			underlays += icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "intact" + icon_connect_type)
+	else
+		//underlays += icon_manager.get_atmos_icon("underlay_exposed", direction, pipe_color)
+		underlays += icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "exposed" + icon_connect_type)
+
+/obj/machinery/atmospherics/proc/update_underlays()
+	if(check_icon_cache())
+		return 1
+	else
+		return 0
+
+obj/machinery/atmospherics/proc/check_connect_types(obj/machinery/atmospherics/atmos1, obj/machinery/atmospherics/atmos2)
+	var/i
+	var/list1[] = atmos1.connect_types
+	var/list2[] = atmos2.connect_types
+	for(i=1,i<=list1.len,i++)
+		var/j
+		for(j=1,j<=list2.len,j++)
+			if(list1[i] == list2[j])
+				var/n = list1[i]
+				return n
+	return 0
+
+obj/machinery/atmospherics/proc/check_connect_types_construction(obj/machinery/atmospherics/atmos1, obj/item/pipe/pipe2)
+	var/i
+	var/list1[] = atmos1.connect_types
+	var/list2[] = pipe2.connect_types
+	for(i=1,i<=list1.len,i++)
+		var/j
+		for(j=1,j<=list2.len,j++)
+			if(list1[i] == list2[j])
+				var/n = list1[i]
+				return n
+	return 0		
+		
+/obj/machinery/atmospherics/proc/check_icon_cache(var/safety = 0)
+	if(!istype(icon_manager))
+		if(!safety) //to prevent infinite loops
+			icon_manager = new()
+			check_icon_cache(1)
+		return 0
+	
+	return 1
+
+/obj/machinery/atmospherics/proc/color_cache_name(var/obj/machinery/atmospherics/node)
+	//Don't use this for standard pipes
+	if(!istype(node))
+		return null
+	
+	return node.pipe_color
+
+/obj/machinery/atmospherics/process()
 	build_network()
 
-obj/machinery/atmospherics/proc/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+/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()
+/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)
+/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)
+/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)
+/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/proc/disconnect(obj/machinery/atmospherics/reference)
 
-obj/machinery/atmospherics/update_icon()
+/obj/machinery/atmospherics/update_icon()
 	return null

code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm

@@ -67,16 +67,25 @@ obj/machinery/atmospherics/binary
 
 		for(var/obj/machinery/atmospherics/target in get_step(src,node1_connect))
 			if(target.initialize_directions & get_dir(target,src))
-				node1 = target
-				break
+				var/c = check_connect_types(target,src)
+				if (c)
+					target.connected_to = c
+					src.connected_to = c
+					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
+				var/c = check_connect_types(target,src)
+				if (c)
+					target.connected_to = c
+					src.connected_to = c
+					node2 = target
+					break
 
 		update_icon()
-
+		update_underlays()
+		
 	build_network()
 		if(!network1 && node1)
 			network1 = new /datum/pipe_network()
@@ -126,5 +135,8 @@ obj/machinery/atmospherics/binary
 		else if(reference==node2)
 			del(network2)
 			node2 = null
+			
+		update_icon()
+		update_underlays()
 
 		return null

code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm

@@ -1,6 +1,6 @@
 /obj/machinery/atmospherics/binary/dp_vent_pump
-	icon = 'icons/obj/atmospherics/dp_vent_pump.dmi'
-	icon_state = "off"
+	icon = 'icons/atmos/vent_pump.dmi'
+	icon_state = "map_dp_vent"
 
 	//node2 is output port
 	//node1 is input port
@@ -10,15 +10,6 @@
 
 	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
 
@@ -26,174 +17,199 @@
 	var/input_pressure_min = 0
 	var/output_pressure_max = 0
 
+	var/frequency = 0
+	var/id = null
+	var/datum/radio_frequency/radio_connection
+
 	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
 
+/obj/machinery/atmospherics/binary/dp_vent_pump/New()
+	..()
+	icon = null
+
+/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume
+	name = "Large Dual Port Air Vent"
+
+/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume/New()
+	..()
+	air1.volume = 1000
+	air2.volume = 1000
+
+/obj/machinery/atmospherics/binary/dp_vent_pump/update_icon(var/safety = 0)
+	if(!check_icon_cache())
+		return
+
+	overlays.Cut()
+	
+	var/vent_icon = "vent"
+
+	var/turf/T = get_turf(src)
+	if(!istype(T))
+		return
+
+	if(T.intact && node1 && node2 && node1.level == 1 && node2.level == 1 && istype(node1, /obj/machinery/atmospherics/pipe) && istype(node2, /obj/machinery/atmospherics/pipe))
+		vent_icon += "h"
+		
+	if(!powered())
+		vent_icon += "off"
+	else
+		vent_icon += "[on ? "[pump_direction ? "out" : "in"]" : "off"]"
+
+	overlays += icon_manager.get_atmos_icon("device", , , vent_icon)
+
+/obj/machinery/atmospherics/binary/dp_vent_pump/update_underlays()
+	if(..())
+		underlays.Cut()
+		var/turf/T = get_turf(src)
+		if(!istype(T))
+			return
+		if(T.intact && node1 && node2 && node1.level == 1 && node2.level == 1 && istype(node1, /obj/machinery/atmospherics/pipe) && istype(node2, /obj/machinery/atmospherics/pipe))
+			return
+		else
+			add_underlay(T, node1, turn(dir, -180))
+			add_underlay(T, node2, dir)
+
+/obj/machinery/atmospherics/binary/dp_vent_pump/hide(var/i)
 	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
+	update_underlays()
 
-		return
+/obj/machinery/atmospherics/binary/dp_vent_pump/process()
+	..()
 
-	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
+	if(!on)
+		return 0
 
-	process()
-		..()
+	var/datum/gas_mixture/environment = loc.return_air()
+	var/environment_pressure = environment.return_pressure()
 
-		if(!on)
-			return 0
+	if(pump_direction) //input -> external
+		var/pressure_delta = 10000
 
-		var/datum/gas_mixture/environment = loc.return_air()
-		var/environment_pressure = environment.return_pressure()
+		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(pump_direction) //input -> external
-			var/pressure_delta = 10000
+		if(pressure_delta > 0)
+			if(air1.temperature > 0)
+				var/transfer_moles = pressure_delta*environment.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
 
-			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))
+				var/datum/gas_mixture/removed = air1.remove(transfer_moles)
 
-			if(pressure_delta > 0)
-				if(air1.temperature > 0)
-					var/transfer_moles = pressure_delta*environment.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
+				loc.assume_air(removed)
 
-					var/datum/gas_mixture/removed = air1.remove(transfer_moles)
+				if(network1)
+					network1.update = 1
 
-					loc.assume_air(removed)
+	else //external -> output
+		var/pressure_delta = 10000
 
-					if(network1)
-						network1.update = 1
+		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()))
 
-		else //external -> output
-			var/pressure_delta = 10000
+		if(pressure_delta > 0)
+			if(environment.temperature > 0)
+				var/transfer_moles = pressure_delta*air2.volume/(environment.temperature * R_IDEAL_GAS_EQUATION)
 
-			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()))
+				var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
 
-			if(pressure_delta > 0)
-				if(environment.temperature > 0)
-					var/transfer_moles = pressure_delta*air2.volume/(environment.temperature * R_IDEAL_GAS_EQUATION)
+				air2.merge(removed)
 
-					var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
+				if(network2)
+					network2.update = 1
 
-					air2.merge(removed)
-
-					if(network2)
-						network2.update = 1
-
-		return 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)
+/obj/machinery/atmospherics/binary/dp_vent_pump/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
+/obj/machinery/atmospherics/binary/dp_vent_pump/proc/broadcast_status()
+	if(!radio_connection)
+		return 0
 
-			var/datum/signal/signal = new
-			signal.transmission_method = 1 //radio signal
-			signal.source = src
+	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)
+	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
+	return 1
 
-	var/frequency = 0
-	var/id = null
-	var/datum/radio_frequency/radio_connection
+/obj/machinery/atmospherics/binary/dp_vent_pump/initialize()
+	..()
+	if(frequency)
+		set_frequency(frequency)
 
-	initialize()
-		..()
-		if(frequency)
-			set_frequency(frequency)
+/obj/machinery/atmospherics/binary/dp_vent_pump/receive_signal(datum/signal/signal)
+	if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
+		return 0
+	if(signal.data["power"])
+		on = text2num(signal.data["power"])
 
-	receive_signal(datum/signal/signal)
+	if(signal.data["power_toggle"])
+		on = !on
 
-		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(signal.data["direction"])
+		pump_direction = text2num(signal.data["direction"])
 
-		if("power_toggle" in signal.data)
-			on = !on
+	if(signal.data["checks"])
+		pressure_checks = text2num(signal.data["checks"])
 
-		if("set_direction" in signal.data)
-			pump_direction = text2num(signal.data["set_direction"])
+	if(signal.data["purge"])
+		pressure_checks &= ~1
+		pump_direction = 0
 
-		if("checks" in signal.data)
-			pressure_checks = text2num(signal.data["checks"])
+	if(signal.data["stabalize"])
+		pressure_checks |= 1
+		pump_direction = 1
 
-		if("purge" in signal.data)
-			pressure_checks &= ~1
-			pump_direction = 0
+	if(signal.data["set_input_pressure"])
+		input_pressure_min = between(
+			0,
+			text2num(signal.data["set_input_pressure"]),
+			ONE_ATMOSPHERE*50
+		)
 
-		if("stabalize" in signal.data)
-			pressure_checks |= 1
-			pump_direction = 1
+	if(signal.data["set_output_pressure"])
+		output_pressure_max = between(
+			0,
+			text2num(signal.data["set_output_pressure"]),
+			ONE_ATMOSPHERE*50
+		)
 
-		if("set_input_pressure" in signal.data)
-			input_pressure_min = between(
-				0,
-				text2num(signal.data["set_input_pressure"]),
-				ONE_ATMOSPHERE*50
-			)
+	if(signal.data["set_external_pressure"])
+		external_pressure_bound = between(
+			0,
+			text2num(signal.data["set_external_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"])
+	if(signal.data["status"])
 		spawn(2)
 			broadcast_status()
-		update_icon()
+		return //do not update_icon
+
+	spawn(2)
+		broadcast_status()
+	update_icon()

code/ATMOSPHERICS/components/binary_devices/passive_gate.dm

@@ -1,8 +1,9 @@
-obj/machinery/atmospherics/binary/passive_gate
+/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"
+	icon = 'icons/atmos/passive_gate.dmi'
+	icon_state = "map"
+	level = 1
 
 	name = "Passive gate"
 	desc = "A one-way air valve that does not require power"
@@ -14,175 +15,161 @@ obj/machinery/atmospherics/binary/passive_gate
 	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
+/obj/machinery/atmospherics/binary/passive_gate/update_icon()
+	icon_state = "[on ? "on" : "off"]"
 
-	process()
-		..()
-		if(!on)
-			return 0
+/obj/machinery/atmospherics/binary/passive_gate/update_underlays()
+	if(..())
+		underlays.Cut()
+		var/turf/T = get_turf(src)
+		if(!istype(T))
+			return
+		add_underlay(T, node1, turn(dir, 180))
+		add_underlay(T, node2, dir)
 
-		var/output_starting_pressure = air2.return_pressure()
-		var/input_starting_pressure = air1.return_pressure()
+/obj/machinery/atmospherics/binary/passive_gate/hide(var/i)
+	update_underlays()
 
-		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
+/obj/machinery/atmospherics/binary/passive_gate/process()
+	..()
+	if(!on)
+		return 0
 
-		//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/output_starting_pressure = air2.return_pressure()
+	var/input_starting_pressure = air1.return_pressure()
 
-			var/transfer_moles = pressure_delta*air2.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
+	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
 
-			//Actually transfer the gas
-			var/datum/gas_mixture/removed = air1.remove(transfer_moles)
-			air2.merge(removed)
+	//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
 
-			if(network1)
-				network1.update = 1
+		var/transfer_moles = pressure_delta*air2.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
 
-			if(network2)
-				network2.update = 1
+		//Actually transfer the gas
+		var/datum/gas_mixture/removed = air1.remove(transfer_moles)
+		air2.merge(removed)
 
+		if(network1)
+			network1.update = 1
 
-	//Radio remote control
+		if(network2)
+			network2.update = 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, filter = RADIO_ATMOSIA)
+//Radio remote control
 
-		broadcast_status()
-			if(!radio_connection)
-				return 0
+/obj/machinery/atmospherics/binary/passive_gate/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)
 
-			var/datum/signal/signal = new
-			signal.transmission_method = 1 //radio signal
-			signal.source = src
+/obj/machinery/atmospherics/binary/passive_gate/proc/broadcast_status()
+	if(!radio_connection)
+		return 0
 
-			signal.data = list(
-				"tag" = id,
-				"device" = "AGP",
-				"power" = on,
-				"target_output" = target_pressure,
-				"sigtype" = "status"
-			)
+	var/datum/signal/signal = new
+	signal.transmission_method = 1 //radio signal
+	signal.source = src
 
-			radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
+	signal.data = list(
+		"tag" = id,
+		"device" = "AGP",
+		"power" = on,
+		"target_output" = target_pressure,
+		"sigtype" = "status"
+	)
 
-			return 1
+	radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 
-	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>
-					"}
+	return 1
 
-		user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
-		onclose(user, "atmo_pump")
+/obj/machinery/atmospherics/binary/passive_gate/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>
+				"}
 
-	initialize()
-		..()
-		if(frequency)
-			set_frequency(frequency)
+	user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
+	onclose(user, "atmo_pump")
 
-	receive_signal(datum/signal/signal)
-		if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
-			return 0
+/obj/machinery/atmospherics/binary/passive_gate/initialize()
+	..()
+	if(frequency)
+		set_frequency(frequency)
 
-		if("power" in signal.data)
-			on = text2num(signal.data["power"])
+/obj/machinery/atmospherics/binary/passive_gate/receive_signal(datum/signal/signal)
+	if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
+		return 0
 
-		if("power_toggle" in signal.data)
-			on = !on
+	if("power" in signal.data)
+		on = text2num(signal.data["power"])
 
-		if("set_output_pressure" in signal.data)
-			target_pressure = between(
-				0,
-				text2num(signal.data["set_output_pressure"]),
-				ONE_ATMOSPHERE*50
-			)
+	if("power_toggle" in signal.data)
+		on = !on
 
-		if("status" in signal.data)
-			spawn(2)
-				broadcast_status()
-			return //do not update_icon
+	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()
-		update_icon()
+		return //do not update_icon
+
+	spawn(2)
+		broadcast_status()
+	update_icon()
+	return
+
+/obj/machinery/atmospherics/binary/passive_gate/attack_hand(user as mob)
+	if(..())
 		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)
+	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(get_turf(src), '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/binary/passive_gate/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
 
+/obj/machinery/atmospherics/binary/passive_gate/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/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

@@ -12,9 +12,10 @@ Thus, the two variables affect pump operation are set in New():
 			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"
+/obj/machinery/atmospherics/binary/pump
+	icon = 'icons/atmos/pump.dmi'
+	icon_state = "map_off"
+	level = 1
 
 	name = "Gas pump"
 	desc = "A pump"
@@ -26,180 +27,181 @@ obj/machinery/atmospherics/binary/pump
 	var/id = null
 	var/datum/radio_frequency/radio_connection
 
-	highcap
-		name = "High capacity gas pump"
-		desc = "A high capacity pump"
+/obj/machinery/atmospherics/binary/pump/highcap
+	name = "High capacity gas pump"
+	desc = "A high capacity pump"
 
-		target_pressure = 15000000
+	target_pressure = 15000000
 
-	on
-		on = 1
-		icon_state = "intact_on"
+/obj/machinery/atmospherics/binary/pump/on
+	icon_state = "map_on"
+	on = 1
 
-	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
+/obj/machinery/atmospherics/binary/pump/update_icon()
+	if(!powered())
+		icon_state = "off"
+	else
+		icon_state = "[on ? "on" : "off"]"
 
-	process()
-//		..()
-		if(stat & (NOPOWER|BROKEN))
+/obj/machinery/atmospherics/binary/pump/update_underlays()
+	if(..())
+		underlays.Cut()
+		var/turf/T = get_turf(src)
+		if(!istype(T))
 			return
-		if(!on)
-			return 0
+		add_underlay(T, node1, turn(dir, -180))
+		add_underlay(T, node2, dir)
 
-		var/output_starting_pressure = air2.return_pressure()
+/obj/machinery/atmospherics/binary/pump/hide(var/i)
+	update_underlays()
 
-		if( (target_pressure - output_starting_pressure) < 0.01)
-			//No need to pump gas if target is already reached!
-			return 1
+/obj/machinery/atmospherics/binary/pump/process()
+//		..()
+	if(stat & (NOPOWER|BROKEN))
+		return
+	if(!on)
+		return 0
 
-		//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
+	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
 
-	//Radio remote control
+	//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)
 
-	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)
+		//Actually transfer the gas
+		var/datum/gas_mixture/removed = air1.remove(transfer_moles)
+		air2.merge(removed)
 
-		broadcast_status()
-			if(!radio_connection)
-				return 0
+		if(network1)
+			network1.update = 1
 
-			var/datum/signal/signal = new
-			signal.transmission_method = 1 //radio signal
-			signal.source = src
+		if(network2)
+			network2.update = 1
 
-			signal.data = list(
-				"tag" = id,
-				"device" = "AGP",
-				"power" = on,
-				"target_output" = target_pressure,
-				"sigtype" = "status"
-			)
+	return 1
 
-			radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
+//Radio remote control
 
-			return 1
+/obj/machinery/atmospherics/binary/pump/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)
 
-	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>
-					"}
+/obj/machinery/atmospherics/binary/pump/proc/broadcast_status()
+	if(!radio_connection)
+		return 0
 
-		user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
-		onclose(user, "atmo_pump")
+	var/datum/signal/signal = new
+	signal.transmission_method = 1 //radio signal
+	signal.source = src
 
-	initialize()
-		..()
-		if(frequency)
-			set_frequency(frequency)
+	signal.data = list(
+		"tag" = id,
+		"device" = "AGP",
+		"power" = on,
+		"target_output" = target_pressure,
+		"sigtype" = "status"
+	)
 
-	receive_signal(datum/signal/signal)
-		if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
-			return 0
+	radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 
-		if("power" in signal.data)
-			on = text2num(signal.data["power"])
+	return 1
 
-		if("power_toggle" in signal.data)
-			on = !on
+/obj/machinery/atmospherics/binary/pump/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>
+				"}
 
-		if("set_output_pressure" in signal.data)
-			target_pressure = between(
-				0,
-				text2num(signal.data["set_output_pressure"]),
-				ONE_ATMOSPHERE*50
-			)
+	user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
+	onclose(user, "atmo_pump")
 
-		if("status" in signal.data)
-			spawn(2)
-				broadcast_status()
-			return //do not update_icon
+/obj/machinery/atmospherics/binary/pump/initialize()
+	..()
+	if(frequency)
+		set_frequency(frequency)
 
+/obj/machinery/atmospherics/binary/pump/receive_signal(datum/signal/signal)
+	if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
+		return 0
+
+	if(signal.data["power"])
+		on = text2num(signal.data["power"])
+
+	if(signal.data["power_toggle"])
+		on = !on
+
+	if(signal.data["set_output_pressure"])
+		target_pressure = between(
+			0,
+			text2num(signal.data["set_output_pressure"]),
+			ONE_ATMOSPHERE*50
+		)
+
+	if(signal.data["status"])
 		spawn(2)
 			broadcast_status()
-		update_icon()
+		return //do not update_icon
+
+	spawn(2)
+		broadcast_status()
+	update_icon()
+	return
+
+
+/obj/machinery/atmospherics/binary/pump/attack_hand(user as mob)
+	if(..())
 		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)
+	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
+/obj/machinery/atmospherics/binary/pump/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()
-		..()
+/obj/machinery/atmospherics/binary/pump/power_change()
+	var/old_stat = stat
+	..()
+	if(old_stat != stat)
 		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(get_turf(src), '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/binary/pump/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/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

@@ -12,9 +12,10 @@ Thus, the two variables affect pump operation are set in New():
 			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"
+/obj/machinery/atmospherics/binary/volume_pump
+	icon = 'icons/atmos/volume_pump.dmi'
+	icon_state = "map_off"
+	level = 1
 
 	name = "Volumetric gas pump"
 	desc = "A volumetric pump"
@@ -26,174 +27,168 @@ obj/machinery/atmospherics/binary/volume_pump
 	var/id = null
 	var/datum/radio_frequency/radio_connection
 
-	on
-		on = 1
-		icon_state = "intact_on"
+/obj/machinery/atmospherics/binary/volume_pump/on
+	on = 1
+	icon_state = "map_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
+/obj/machinery/atmospherics/binary/volume_pump/update_icon()
+	if(!powered())
+		icon_state = "off"
+	else
+		icon_state = "[on ? "on" : "off"]"
 
-	process()
-//		..()
-		if(stat & (NOPOWER|BROKEN))
+/obj/machinery/atmospherics/binary/volume_pump/update_underlays()
+	if(..())
+		underlays.Cut()
+		var/turf/T = get_turf(src)
+		if(!istype(T))
 			return
-		if(!on || transfer_rate < 1)
-			return 0
+		add_underlay(T, node1, turn(dir, -180))
+		add_underlay(T, node2, dir)
+
+/obj/machinery/atmospherics/binary/volume_pump/hide(var/i)
+	update_underlays()
+
+/obj/machinery/atmospherics/binary/volume_pump/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
+	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
 
-	proc
-		set_frequency(new_frequency)
-			radio_controller.remove_object(src, frequency)
-			frequency = new_frequency
-			if(frequency)
-				radio_connection = radio_controller.add_object(src, frequency)
+	var/transfer_ratio = max(1, transfer_rate/air1.volume)
 
-		broadcast_status()
-			if(!radio_connection)
-				return 0
+	var/datum/gas_mixture/removed = air1.remove_ratio(transfer_ratio)
 
-			var/datum/signal/signal = new
-			signal.transmission_method = 1 //radio signal
-			signal.source = src
+	air2.merge(removed)
 
-			signal.data = list(
-				"tag" = id,
-				"device" = "APV",
-				"power" = on,
-				"transfer_rate" = transfer_rate,
-				"sigtype" = "status"
-			)
-			radio_connection.post_signal(src, signal)
+	if(network1)
+		network1.update = 1
 
-			return 1
+	if(network2)
+		network2.update = 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>
-					"}
+	return 1
 
-		user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
-		onclose(user, "atmo_pump")
+/obj/machinery/atmospherics/binary/volume_pump/proc/set_frequency(new_frequency)
+	radio_controller.remove_object(src, frequency)
+	frequency = new_frequency
+	if(frequency)
+		radio_connection = radio_controller.add_object(src, frequency)
 
+/obj/machinery/atmospherics/binary/volume_pump/proc/broadcast_status()
+	if(!radio_connection)
+		return 0
 
+	var/datum/signal/signal = new
+	signal.transmission_method = 1 //radio signal
+	signal.source = src
 
-	initialize()
-		..()
+	signal.data = list(
+		"tag" = id,
+		"device" = "APV",
+		"power" = on,
+		"transfer_rate" = transfer_rate,
+		"sigtype" = "status"
+	)
+	radio_connection.post_signal(src, signal)
 
-		set_frequency(frequency)
+	return 1
 
-	receive_signal(datum/signal/signal)
-		if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
-			return 0
+/obj/machinery/atmospherics/binary/volume_pump/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>
+				"}
 
-		if("power" in signal.data)
-			on = text2num(signal.data["power"])
+	user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
+	onclose(user, "atmo_pump")
 
-		if("power_toggle" in signal.data)
-			on = !on
+/obj/machinery/atmospherics/binary/volume_pump/initialize()
+	..()
+	set_frequency(frequency)
 
-		if("set_transfer_rate" in signal.data)
-			transfer_rate = between(
-				0,
-				text2num(signal.data["set_transfer_rate"]),
-				air1.volume
-			)
+/obj/machinery/atmospherics/binary/volume_pump/receive_signal(datum/signal/signal)
+	if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
+		return 0
 
-		if("status" in signal.data)
-			spawn(2)
-				broadcast_status()
-			return //do not update_icon
+	if(signal.data["power"])
+		on = text2num(signal.data["power"])
 
+	if(signal.data["power_toggle"])
+		on = !on
+
+	if(signal.data["set_transfer_rate"])
+		transfer_rate = between(
+			0,
+			text2num(signal.data["set_transfer_rate"]),
+			air1.volume
+		)
+
+	if(signal.data["status"])
 		spawn(2)
 			broadcast_status()
+		return //do not update_icon
+
+	spawn(2)
+		broadcast_status()
+	update_icon()
+
+/obj/machinery/atmospherics/binary/volume_pump/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
+
+/obj/machinery/atmospherics/binary/volume_pump/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
+
+/obj/machinery/atmospherics/binary/volume_pump/power_change()
+	var/old_stat = stat
+	..()
+	if(old_stat != stat)
 		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(get_turf(src), '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/binary/volume_pump/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/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/omni_devices/_omni_extras.dm

@@ -0,0 +1,93 @@
+//--------------------------------------------
+// Omni device port types
+//--------------------------------------------
+#define ATM_NONE	0
+#define ATM_INPUT	1
+#define ATM_OUTPUT	2
+
+#define ATM_O2		3
+#define ATM_N2		4
+#define ATM_CO2		5
+#define ATM_P		6	//Phoron
+#define ATM_N2O		7
+
+//--------------------------------------------
+// Omni port datum
+//
+// Used by omni devices to manage connections 
+//  to other atmospheric objects.
+//--------------------------------------------
+/datum/omni_port
+	var/obj/machinery/atmospherics/omni/master
+	var/dir
+	var/update = 1
+	var/mode = 0
+	var/concentration = 0
+	var/con_lock = 0
+	var/transfer_moles = 0
+	var/datum/gas_mixture/air
+	var/obj/machinery/atmospherics/node
+	var/datum/pipe_network/network
+
+/datum/omni_port/New(var/obj/machinery/atmospherics/omni/M, var/direction = NORTH)
+	..()
+	dir = direction
+	if(istype(M))
+		master = M
+	air = new
+	air.volume = 200
+
+/datum/omni_port/proc/connect()
+	if(node)
+		return
+	master.initialize()
+	master.build_network()
+	if(node)
+		node.initialize()
+		node.build_network()
+
+/datum/omni_port/proc/disconnect()
+	if(node)
+		node.disconnect(master)
+		master.disconnect(node)
+
+
+//--------------------------------------------
+// Need to find somewhere else for these
+//--------------------------------------------
+
+//returns a text string based on the direction flag input
+// if capitalize is true, it will return the string capitalized
+// otherwise it will return the direction string in lower case
+/proc/dir_name(var/dir, var/capitalize = 0)
+	var/string = null
+	switch(dir)
+		if(NORTH)
+			string = "North"
+		if(SOUTH)
+			string = "South"
+		if(EAST)
+			string = "East"
+		if(WEST)
+			string = "West"
+	
+	if(!capitalize && string)
+		string = lowertext(string)
+	
+	return string
+
+//returns a direction flag based on the string passed to it
+// case insensitive
+/proc/dir_flag(var/dir)
+	dir = lowertext(dir)
+	switch(dir)
+		if("north")
+			return NORTH
+		if("south")
+			return SOUTH
+		if("east")
+			return EAST
+		if("west")
+			return WEST
+		else
+			return 0

code/ATMOSPHERICS/components/omni_devices/filter.dm

@@ -87,8 +87,8 @@
 					filtered_out.carbon_dioxide = removed.carbon_dioxide
 					removed.carbon_dioxide = 0
 				if(ATM_P)
-					filtered_out.phoron = removed.phoron
-					removed.phoron = 0
+					filtered_out.toxins = removed.toxins
+					removed.toxins = 0
 				if(ATM_N2O)
 					if(removed.trace_gases.len>0)
 						for(var/datum/gas/sleeping_agent/trace_gas in removed.trace_gases)
@@ -112,14 +112,14 @@
 
 	return
 
-/obj/machinery/atmospherics/omni/filter/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+/obj/machinery/atmospherics/omni/filter/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)
 	usr.set_machine(src)
 
 	var/list/data = new()
 
 	data = build_uidata()
 
-	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
 
 	if (!ui)
 		ui = new(user, src, ui_key, "omni_filter.tmpl", "Omni Filter Control", 330, 330)
@@ -174,7 +174,7 @@
 		if(ATM_CO2)
 			return "Carbon Dioxide"
 		if(ATM_P)
-			return "Phoron" //*cough* Plasma *cough*
+			return "Plasma" //*cough* Plasma *cough*
 		if(ATM_N2O)
 			return "Nitrous Oxide"
 		else
@@ -202,7 +202,7 @@
 			if("switch_mode")
 				switch_mode(dir_flag(href_list["dir"]), mode_return_switch(href_list["mode"]))
 			if("switch_filter")
-				var/new_filter = input(usr,"Select filter mode:","Change filter",href_list["mode"]) in list("None", "Oxygen", "Nitrogen", "Carbon Dioxide", "Phoron", "Nitrous Oxide")
+				var/new_filter = input(usr,"Select filter mode:","Change filter",href_list["mode"]) in list("None", "Oxygen", "Nitrogen", "Carbon Dioxide", "Plasma", "Nitrous Oxide")
 				switch_filter(dir_flag(href_list["dir"]), mode_return_switch(new_filter))
 
 	update_icon()
@@ -217,7 +217,7 @@
 			return ATM_N2
 		if("Carbon Dioxide")
 			return ATM_CO2
-		if("Phoron")
+		if("Plasma")
 			return ATM_P
 		if("Nitrous Oxide")
 			return ATM_N2O

code/ATMOSPHERICS/components/omni_devices/mixer.dm

@@ -137,14 +137,14 @@
 
 	return 1
 
-/obj/machinery/atmospherics/omni/mixer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+/obj/machinery/atmospherics/omni/mixer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)
 	usr.set_machine(src)
 
 	var/list/data = new()
 
 	data = build_uidata()
 
-	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
 
 	if (!ui)
 		ui = new(user, src, ui_key, "omni_mixer.tmpl", "Omni Mixer Control", 360, 330)

code/ATMOSPHERICS/components/omni_devices/omni_base.dm

@@ -0,0 +1,291 @@
+//--------------------------------------------
+// Base omni device
+//--------------------------------------------
+/obj/machinery/atmospherics/omni
+	name = "omni device"
+	icon = 'icons/atmos/omni_devices.dmi'
+	icon_state = "base"
+	use_power = 1
+	initialize_directions = 0
+	level = 1
+
+	var/on = 0
+	var/configuring = 0
+	var/target_pressure = ONE_ATMOSPHERE
+
+	var/tag_north = ATM_NONE
+	var/tag_south = ATM_NONE
+	var/tag_east = ATM_NONE
+	var/tag_west = ATM_NONE
+
+	var/overlays_on[5]
+	var/overlays_off[5]
+	var/overlays_error[2]
+	var/underlays_current[4]
+
+	var/list/ports = new()
+
+/obj/machinery/atmospherics/omni/New()
+	..()
+	icon_state = "base"
+	
+	ports = new()
+	for(var/d in cardinal)
+		var/datum/omni_port/new_port = new(src, d)
+		switch(d)
+			if(NORTH)
+				new_port.mode = tag_north
+			if(SOUTH)
+				new_port.mode = tag_south
+			if(EAST)
+				new_port.mode = tag_east
+			if(WEST)
+				new_port.mode = tag_west
+		if(new_port.mode > 0)
+			initialize_directions |= d
+		ports += new_port
+	
+	build_icons()
+
+/obj/machinery/atmospherics/omni/update_icon()
+	if(stat & NOPOWER)
+		overlays = overlays_off
+		on = 0
+	else if(error_check())
+		overlays = overlays_error
+		on = 0
+	else
+		overlays = on ? (overlays_on) : (overlays_off)
+
+	underlays = underlays_current
+
+	return
+
+/obj/machinery/atmospherics/omni/proc/error_check()
+	return
+
+/obj/machinery/atmospherics/omni/power_change()
+	var/old_stat = stat
+	..()
+	if(old_stat != stat)
+		update_icon()
+
+/obj/machinery/atmospherics/omni/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+	if(!istype(W, /obj/item/weapon/wrench))
+		return ..()
+
+	var/int_pressure = 0
+	for(var/datum/omni_port/P in ports)
+		int_pressure += P.air.return_pressure()
+	var/datum/gas_mixture/env_air = loc.return_air()
+	if ((int_pressure - env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
+		user << "<span class='warning'>You cannot unwrench [src], it is too exerted due to internal pressure.</span>"
+		add_fingerprint(user)
+		return 1
+	user << "\blue You begin to unfasten \the [src]..."
+	playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+	if(do_after(user, 40))
+		user.visible_message( \
+			"[user] unfastens \the [src].", \
+			"\blue You have unfastened \the [src].", \
+			"You hear a ratchet.")
+		new /obj/item/pipe(loc, make_from=src)
+		del(src)
+
+/obj/machinery/atmospherics/omni/attack_hand(user as mob)
+	if(..())
+		return
+
+	src.add_fingerprint(usr)
+	ui_interact(user)
+	return
+
+/obj/machinery/atmospherics/omni/proc/build_icons()
+	if(!check_icon_cache())
+		return
+
+	var/core_icon = null
+	if(istype(src, /obj/machinery/atmospherics/omni/mixer))
+		core_icon = "mixer"
+	else if(istype(src, /obj/machinery/atmospherics/omni/filter))
+		core_icon = "filter"
+	else
+		return
+
+	//directional icons are layers 1-4, with the core icon on layer 5
+	if(core_icon)
+		overlays_off[5] = icon_manager.get_atmos_icon("omni", , , core_icon)
+		overlays_on[5] = icon_manager.get_atmos_icon("omni", , , core_icon + "_glow")
+
+		overlays_error[1] = icon_manager.get_atmos_icon("omni", , , core_icon)
+		overlays_error[2] = icon_manager.get_atmos_icon("omni", , , "error")
+
+/obj/machinery/atmospherics/omni/proc/update_port_icons()
+	if(!check_icon_cache())
+		return
+
+	for(var/datum/omni_port/P in ports)
+		if(P.update)
+			var/ref_layer = 0
+			switch(P.dir)
+				if(NORTH)
+					ref_layer = 1
+				if(SOUTH)
+					ref_layer = 2
+				if(EAST)
+					ref_layer = 3
+				if(WEST)
+					ref_layer = 4
+
+			if(!ref_layer)
+				continue
+
+			var/list/port_icons = select_port_icons(P)
+			if(port_icons)
+				if(P.node)
+					underlays_current[ref_layer] = port_icons["pipe_icon"]
+				else
+					underlays_current[ref_layer] = null
+				overlays_off[ref_layer] = port_icons["off_icon"]
+				overlays_on[ref_layer] = port_icons["on_icon"]
+			else
+				underlays_current[ref_layer] = null
+				overlays_off[ref_layer] = null
+				overlays_on[ref_layer] = null
+
+	update_icon()
+
+/obj/machinery/atmospherics/omni/proc/select_port_icons(var/datum/omni_port/P)
+	if(!istype(P))
+		return
+
+	if(P.mode > 0)
+		var/ic_dir = dir_name(P.dir)
+		var/ic_on = ic_dir
+		var/ic_off = ic_dir
+		switch(P.mode)
+			if(ATM_INPUT)
+				ic_on += "_in_glow"
+				ic_off += "_in"
+			if(ATM_OUTPUT)
+				ic_on += "_out_glow"
+				ic_off += "_out"
+			if(ATM_O2 to ATM_N2O)
+				ic_on += "_filter"
+				ic_off += "_out"
+		
+		ic_on = icon_manager.get_atmos_icon("omni", , , ic_on)
+		ic_off = icon_manager.get_atmos_icon("omni", , , ic_off)
+
+		var/pipe_state
+		var/turf/T = get_turf(src)
+		if(!istype(T))
+			return
+		if(T.intact && istype(P.node, /obj/machinery/atmospherics/pipe) && P.node.level == 1 )
+			pipe_state = icon_manager.get_atmos_icon("underlay_down", P.dir, color_cache_name(P.node))
+		else
+			pipe_state = icon_manager.get_atmos_icon("underlay_intact", P.dir, color_cache_name(P.node))
+
+		return list("on_icon" = ic_on, "off_icon" = ic_off, "pipe_icon" = pipe_state)
+
+/obj/machinery/atmospherics/omni/update_underlays()
+	for(var/datum/omni_port/P in ports)
+		P.update = 1
+	update_ports()
+
+/obj/machinery/atmospherics/omni/hide(var/i)
+	update_underlays()
+
+/obj/machinery/atmospherics/omni/proc/update_ports()
+	sort_ports()
+	update_port_icons()
+	for(var/datum/omni_port/P in ports)
+		P.update = 0
+
+/obj/machinery/atmospherics/omni/proc/sort_ports()
+	return
+
+
+// Housekeeping and pipe network stuff below
+
+/obj/machinery/atmospherics/omni/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+	for(var/datum/omni_port/P in ports)
+		if(reference == P.node)
+			P.network = new_network
+			break
+
+	if(new_network.normal_members.Find(src))
+		return 0
+
+	new_network.normal_members += src
+
+	return null
+
+/obj/machinery/atmospherics/omni/Del()
+	loc = null
+
+	for(var/datum/omni_port/P in ports)
+		if(P.node)
+			P.node.disconnect(src)
+			del(P.network)
+			P.node = null
+
+	..()
+
+/obj/machinery/atmospherics/omni/initialize()
+	for(var/datum/omni_port/P in ports)
+		if(P.node || P.mode == 0)
+			continue
+		for(var/obj/machinery/atmospherics/target in get_step(src, P.dir))
+			if(target.initialize_directions & get_dir(target,src))
+				P.node = target
+				break
+
+	for(var/datum/omni_port/P in ports)
+		P.update = 1
+
+	update_ports()
+
+/obj/machinery/atmospherics/omni/build_network()
+	for(var/datum/omni_port/P in ports)
+		if(!P.network && P.node)
+			P.network = new /datum/pipe_network()
+			P.network.normal_members += src
+			P.network.build_network(P.node, src)
+
+/obj/machinery/atmospherics/omni/return_network(obj/machinery/atmospherics/reference)
+	build_network()
+
+	for(var/datum/omni_port/P in ports)
+		if(reference == P.node)
+			return P.network
+
+	return null
+
+/obj/machinery/atmospherics/omni/reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
+	for(var/datum/omni_port/P in ports)
+		if(P.network == old_network)
+			P.network = new_network
+
+	return 1
+
+/obj/machinery/atmospherics/omni/return_network_air(datum/pipe_network/reference)
+	var/list/results = list()
+
+	for(var/datum/omni_port/P in ports)
+		if(P.network == reference)
+			results += P.air
+
+	return results
+
+/obj/machinery/atmospherics/omni/disconnect(obj/machinery/atmospherics/reference)
+	for(var/datum/omni_port/P in ports)
+		if(reference == P.node)
+			del(P.network)
+			P.node = null
+			P.update = 1
+			break
+	
+	update_ports()
+
+	return null

code/ATMOSPHERICS/components/portables_connector.dm

@@ -1,6 +1,6 @@
 /obj/machinery/atmospherics/portables_connector
-	icon = 'icons/obj/atmospherics/portables_connector.dmi'
-	icon_state = "intact"
+	icon = 'icons/atmos/connector.dmi'
+	icon_state = "map_connector"
 
 	name = "Connector Port"
 	desc = "For connecting portables devices related to atmospherics control."
@@ -16,142 +16,143 @@
 
 	var/on = 0
 	use_power = 0
-	level = 0
+	level = 1
 
 
-	New()
-		initialize_directions = dir
-		..()
+/obj/machinery/atmospherics/portables_connector/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"
+/obj/machinery/atmospherics/portables_connector/update_icon()
+	icon_state = "connector"
 
+/obj/machinery/atmospherics/portables_connector/update_underlays()
+	if(..())
+		underlays.Cut()
+		var/turf/T = get_turf(src)
+		if(!istype(T))
+			return
+		add_underlay(T, node, dir)
+
+/obj/machinery/atmospherics/portables_connector/hide(var/i)
+	update_underlays()
+
+/obj/machinery/atmospherics/portables_connector/process()
+	..()
+	if(!on)
 		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
+	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
+/obj/machinery/atmospherics/portables_connector/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
+	if(new_network.normal_members.Find(src))
+		return 0
 
-		new_network.normal_members += src
+	new_network.normal_members += src
 
-		return null
+	return null
 
-	Destroy()
-		loc = null
+/obj/machinery/atmospherics/portables_connector/Del()
+	loc = null
 
-		if(connected_device)
-			connected_device.disconnect()
+	if(connected_device)
+		connected_device.disconnect()
 
-		if(node)
-			node.disconnect(src)
-			del(network)
+	if(node)
+		node.disconnect(src)
+		del(network)
 
-		node = null
+	node = null
 
-		..()
+	..()
 
-	initialize()
-		if(node) return
+/obj/machinery/atmospherics/portables_connector/initialize()
+	if(node) return
 
-		var/node_connect = dir
+	var/node_connect = dir
 
-		for(var/obj/machinery/atmospherics/target in get_step(src,node_connect))
-			if(target.initialize_directions & get_dir(target,src))
+	for(var/obj/machinery/atmospherics/target in get_step(src,node_connect))
+		if(target.initialize_directions & get_dir(target,src))
+			var/c = check_connect_types(target,src)
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
 				node = target
 				break
 
-		update_icon()
+	update_icon()
+	update_underlays()
 
+/obj/machinery/atmospherics/portables_connector/build_network()
+	if(!network && node)
+		network = new /datum/pipe_network()
+		network.normal_members += src
+		network.build_network(node, src)
+
+
+/obj/machinery/atmospherics/portables_connector/return_network(obj/machinery/atmospherics/reference)
 	build_network()
-		if(!network && node)
-			network = new /datum/pipe_network()
-			network.normal_members += src
-			network.build_network(node, src)
+
+	if(reference==node)
+		return network
+
+	if(reference==connected_device)
+		return network
+
+	return null
+
+/obj/machinery/atmospherics/portables_connector/reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
+	if(network == old_network)
+		network = new_network
+
+	return 1
+
+/obj/machinery/atmospherics/portables_connector/return_network_air(datum/pipe_network/reference)
+	var/list/results = list()
+
+	if(connected_device)
+		results += connected_device.air_contents
+
+	return results
+
+/obj/machinery/atmospherics/portables_connector/disconnect(obj/machinery/atmospherics/reference)
+	if(reference==node)
+		del(network)
+		node = null
+	
+	update_underlays()
+
+	return null
 
 
-	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
-
+/obj/machinery/atmospherics/portables_connector/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
-
-	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(get_turf(src), '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)
-			qdel(src)
+	if (locate(/obj/machinery/portable_atmospherics, src.loc))
+		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

@@ -1,13 +1,11 @@
-obj/machinery/atmospherics/trinary/filter
-	icon = 'icons/obj/atmospherics/filter.dmi'
-	icon_state = "intact_off"
+/obj/machinery/atmospherics/trinary/filter
+	icon = 'icons/atmos/filter.dmi'
+	icon_state = "map"
 	density = 0
+	level = 1
 
 	name = "Gas filter"
 
-	req_access = list(access_atmospherics)
-
-	var/on = 0
 	var/temp = null // -- TLE
 
 	var/target_pressure = ONE_ATMOSPHERE
@@ -16,7 +14,7 @@ obj/machinery/atmospherics/trinary/filter
 /*
 Filter types:
 -1: Nothing
- 0: Carbon Molecules: Plasma Toxin, Oxygen Agent B
+ 0: Toxins: Toxins, Oxygen Agent B
  1: Oxygen: Oxygen ONLY
  2: Nitrogen: Nitrogen ONLY
  3: Carbon Dioxide: Carbon Dioxide ONLY
@@ -26,141 +24,159 @@ Filter types:
 	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)
+/obj/machinery/atmospherics/trinary/filter/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()
-		..()
+/* I don't know why this is here, but it's ugly, so I'm disabling it
+/obj/machinery/atmospherics/trinary/filter/New()
+	..()
+	if(radio_controller)
+		initialize()
+*/
+/obj/machinery/atmospherics/trinary/filter/update_icon()
+	if(istype(src, /obj/machinery/atmospherics/trinary/filter/m_filter))
+		icon_state = "m"
+	else
+		icon_state = ""
+	
+	if(!powered())
+		icon_state += "off"
+	else if(node2 && node3 && node1)
+		icon_state += on ? "on" : "off"
+	else
+		icon_state += "off"
+		on = 0
 
-	update_icon()
-		if(stat & NOPOWER)
-			icon_state = "intact_off"
-		else if(node2 && node3 && node1)
-			icon_state = "intact_[on?("on"):("off")]"
+/obj/machinery/atmospherics/trinary/filter/update_underlays()
+	if(..())
+		underlays.Cut()
+		var/turf/T = get_turf(src)
+		if(!istype(T))
+			return
+
+		add_underlay(T, node1, turn(dir, -180))
+
+		if(istype(src, /obj/machinery/atmospherics/trinary/filter/m_filter))
+			add_underlay(T, node2, turn(dir, 90))
 		else
-			icon_state = "intact_off"
-			on = 0
+			add_underlay(T, node2, turn(dir, -90))
 
-		return
+		add_underlay(T, node3, dir)
 
-	power_change()
-		var/old_stat = stat
-		..()
-		if(old_stat != stat)
-			update_icon()
+/obj/machinery/atmospherics/trinary/filter/hide(var/i)
+	update_underlays()
 
-	process()
-		..()
-		if(!on)
-			return 0
+/obj/machinery/atmospherics/trinary/filter/power_change()
+	var/old_stat = stat
+	..()
+	if(old_stat != stat)
+		update_icon()
 
-		var/output_starting_pressure = air3.return_pressure()
+/obj/machinery/atmospherics/trinary/filter/process()
+	..()
+	if(!on)
+		return 0
 
-		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
+	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
 
-	initialize()
-		set_frequency(frequency)
-		..()
+	//Calculate necessary moles to transfer using PV=nRT
 
-	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(get_turf(src), '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)
+	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
 
 
-obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE
+		air2.merge(filtered_out)
+		air3.merge(removed)
+
+	if(network2)
+		network2.update = 1
+
+	if(network3)
+		network3.update = 1
+
+	if(network1)
+		network1.update = 1
+
+	return 1
+
+/obj/machinery/atmospherics/trinary/filter/initialize()
+	set_frequency(frequency)
+	..()
+
+/obj/machinery/atmospherics/trinary/filter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+	if (!istype(W, /obj/item/weapon/wrench))
+		return ..()
+	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
 
@@ -172,7 +188,7 @@ obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE
 	var/current_filter_type
 	switch(filter_type)
 		if(0)
-			current_filter_type = "Carbon Molecules"
+			current_filter_type = "Toxins"
 		if(1)
 			current_filter_type = "Oxygen"
 		if(2)
@@ -190,7 +206,7 @@ obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE
 			<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=0'>Toxins</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>
@@ -213,7 +229,7 @@ obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE
 	onclose(user, "atmo_filter")
 	return
 
-obj/machinery/atmospherics/trinary/filter/Topic(href, href_list) // -- TLE
+/obj/machinery/atmospherics/trinary/filter/Topic(href, href_list) // -- TLE
 	if(..())
 		return
 	usr.set_machine(src)
@@ -236,4 +252,47 @@ obj/machinery/atmospherics/trinary/filter/Topic(href, href_list) // -- TLE
 */
 	return
 
+/obj/machinery/atmospherics/trinary/filter/m_filter
+	icon_state = "mmap"
 
+	dir = SOUTH
+	initialize_directions = SOUTH|NORTH|EAST
+
+obj/machinery/atmospherics/trinary/filter/m_filter/New()
+	..()
+	switch(dir)
+		if(NORTH)
+			initialize_directions = WEST|NORTH|SOUTH
+		if(SOUTH)
+			initialize_directions = SOUTH|EAST|NORTH
+		if(EAST)
+			initialize_directions = EAST|WEST|NORTH
+		if(WEST)
+			initialize_directions = WEST|SOUTH|EAST
+
+/obj/machinery/atmospherics/trinary/filter/m_filter/initialize()
+	set_frequency(frequency)
+	
+	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()
+	update_underlays()

code/ATMOSPHERICS/components/trinary_devices/mixer.dm

@@ -1,164 +1,274 @@
-obj/machinery/atmospherics/trinary/mixer
-	icon = 'icons/obj/atmospherics/mixer.dmi'
-	icon_state = "intact_off"
+/obj/machinery/atmospherics/trinary/mixer
+	icon = 'icons/atmos/mixer.dmi'
+	icon_state = "map"
 	density = 0
+	level = 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")]"
+/obj/machinery/atmospherics/trinary/mixer/update_icon(var/safety = 0)
+	if(istype(src, /obj/machinery/atmospherics/trinary/mixer/m_mixer))
+		icon_state = "m"
+	else if(istype(src, /obj/machinery/atmospherics/trinary/mixer/t_mixer))
+		icon_state = "t"
+	else
+		icon_state = ""
+	
+	if(!powered())
+		icon_state += "off"
+	else if(node2 && node3 && node1)
+		icon_state += on ? "on" : "off"
+	else
+		icon_state += "off"
+		on = 0
+
+/obj/machinery/atmospherics/trinary/mixer/update_underlays()
+	if(..())
+		underlays.Cut()
+		var/turf/T = get_turf(src)
+		if(!istype(T))
+			return
+
+		if(istype(src, /obj/machinery/atmospherics/trinary/mixer/t_mixer))
+			add_underlay(T, node1, turn(dir, -90))
 		else
-			icon_state = "intact_off"
-			on = 0
+			add_underlay(T, node1, turn(dir, -180))
 
-		return
+		if(istype(src, /obj/machinery/atmospherics/trinary/mixer/m_mixer) || istype(src, /obj/machinery/atmospherics/trinary/mixer/t_mixer))
+			add_underlay(T, node2, turn(dir, 90))
+		else
+			add_underlay(T, node2, turn(dir, -90))
 
-	power_change()
-		var/old_stat = stat
-		..()
-		if(old_stat != stat)
-			update_icon()
+		add_underlay(T, node3, dir)
 
-	New()
-		..()
-		air3.volume = 300
+/obj/machinery/atmospherics/trinary/mixer/hide(var/i)
+	update_underlays()
 
-	process()
-		..()
-		if(!on)
-			return 0
+/obj/machinery/atmospherics/trinary/mixer/power_change()
+	var/old_stat = stat
+	..()
+	if(old_stat != stat)
+		update_icon()
 
-		var/output_starting_pressure = air3.return_pressure()
+/obj/machinery/atmospherics/trinary/mixer/New()
+	..()
+	air3.volume = 300
 
-		if(output_starting_pressure >= target_pressure)
-			//No need to mix if target is already full!
-			return 1
+/obj/machinery/atmospherics/trinary/mixer/process()
+	..()
+	if(!on)
+		return 0
 
-		//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
+	var/output_starting_pressure = air3.return_pressure()
 
+	if(output_starting_pressure >= target_pressure)
+		//No need to mix if target is already full!
 		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(get_turf(src), '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)
+	//Calculate necessary moles to transfer using PV=nRT
 
-	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>
-					"}
+	var/pressure_delta = target_pressure - output_starting_pressure
+	var/transfer_moles1 = 0
+	var/transfer_moles2 = 0
 
-		user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_mixer")
-		onclose(user, "atmo_mixer")
+	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
+
+/obj/machinery/atmospherics/trinary/mixer/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+	if (!istype(W, /obj/item/weapon/wrench))
+		return ..()
+	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/mixer/attack_hand(user as mob)
+	if(..())
 		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()
+	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
+
+/obj/machinery/atmospherics/trinary/mixer/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
+
+obj/machinery/atmospherics/trinary/mixer/t_mixer
+	icon_state = "tmap"
+
+	dir = SOUTH
+	initialize_directions = SOUTH|EAST|WEST
+
+	//node 3 is the outlet, nodes 1 & 2 are intakes
+
+obj/machinery/atmospherics/trinary/mixer/t_mixer/New()
+	..()
+	switch(dir)
+		if(NORTH)
+			initialize_directions = EAST|NORTH|WEST
+		if(SOUTH)
+			initialize_directions = SOUTH|WEST|EAST
+		if(EAST)
+			initialize_directions = EAST|NORTH|SOUTH
+		if(WEST)
+			initialize_directions = WEST|NORTH|SOUTH
+
+obj/machinery/atmospherics/trinary/mixer/t_mixer/initialize()
+	if(node1 && node2 && node3) return
+
+	var/node1_connect = turn(dir, -90)
+	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()
+	update_underlays()
+
+obj/machinery/atmospherics/trinary/mixer/m_mixer
+	icon_state = "mmap"
+
+	dir = SOUTH
+	initialize_directions = SOUTH|NORTH|EAST
+
+	//node 3 is the outlet, nodes 1 & 2 are intakes
+
+obj/machinery/atmospherics/trinary/mixer/m_mixer/New()
+	..()
+	switch(dir)
+		if(NORTH)
+			initialize_directions = WEST|NORTH|SOUTH
+		if(SOUTH)
+			initialize_directions = SOUTH|EAST|NORTH
+		if(EAST)
+			initialize_directions = EAST|WEST|NORTH
+		if(WEST)
+			initialize_directions = WEST|SOUTH|EAST
+
+obj/machinery/atmospherics/trinary/mixer/m_mixer/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()
+	update_underlays()

code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm

@@ -2,6 +2,8 @@ obj/machinery/atmospherics/trinary
 	dir = SOUTH
 	initialize_directions = SOUTH|NORTH|WEST
 	use_power = 1
+	
+	var/on = 0
 
 	var/datum/gas_mixture/air1
 	var/datum/gas_mixture/air2
@@ -52,7 +54,7 @@ obj/machinery/atmospherics/trinary
 
 		return null
 
-	Destroy()
+	Del()
 		loc = null
 
 		if(node1)
@@ -94,6 +96,7 @@ obj/machinery/atmospherics/trinary
 				break
 
 		update_icon()
+		update_underlays()
 
 	build_network()
 		if(!network1 && node1)
@@ -160,5 +163,7 @@ obj/machinery/atmospherics/trinary
 		else if(reference==node3)
 			del(network3)
 			node3 = null
+		
+		update_underlays()
 
 		return null

code/ATMOSPHERICS/components/tvalve.dm

@@ -1,10 +1,11 @@
-obj/machinery/atmospherics/tvalve
-	icon = 'icons/obj/atmospherics/valve.dmi'
-	icon_state = "tvalve0"
+/obj/machinery/atmospherics/tvalve
+	icon = 'icons/atmos/tvalve.dmi'
+	icon_state = "map_tvalve0"
 
 	name = "manual switching valve"
 	desc = "A pipe valve"
 
+	level = 1
 	dir = SOUTH
 	initialize_directions = SOUTH|NORTH|WEST
 
@@ -19,417 +20,478 @@ obj/machinery/atmospherics/tvalve
 	var/datum/pipe_network/network_node2
 	var/datum/pipe_network/network_node3
 
-	update_icon(animation)
-		if(animation)
-			flick("tvalve[src.state][!src.state]",src)
+/obj/machinery/atmospherics/tvalve/bypass
+	icon_state = "map_tvalve1"
+	state = 1
+
+/obj/machinery/atmospherics/tvalve/update_icon(animation)
+	if(animation)
+		flick("tvalve[src.state][!src.state]",src)
+	else
+		icon_state = "tvalve[state]"
+
+/obj/machinery/atmospherics/tvalve/update_underlays()
+	if(..())
+		underlays.Cut()
+		var/turf/T = get_turf(src)
+		if(!istype(T))
+			return
+		add_underlay(T, node1, turn(dir, -180))
+		
+		if(istype(src, /obj/machinery/atmospherics/tvalve/mirrored))
+			add_underlay(T, node2, turn(dir, 90))
 		else
-			icon_state = "tvalve[state]"
+			add_underlay(T, node2, turn(dir, -90))
+		
+		add_underlay(T, node3, dir)
 
-	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
-
-	Destroy()
-		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)
-			src.add_hiddenprint(user)
-			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(get_turf(src), '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"
+/obj/machinery/atmospherics/tvalve/hide(var/i)
+	update_underlays()
 
+/obj/machinery/atmospherics/tvalve/New()
 	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
+/obj/machinery/atmospherics/tvalve/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
 
-		node1_dir = turn(dir, 180)
-		node2_dir = turn(dir, 90)
-		node3_dir = dir
+/obj/machinery/atmospherics/tvalve/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
 
-		for(var/obj/machinery/atmospherics/target in get_step(src,node1_dir))
-			if(target.initialize_directions & get_dir(target,src))
+	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
+
+/obj/machinery/atmospherics/tvalve/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
+
+	..()
+
+/obj/machinery/atmospherics/tvalve/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
+
+/obj/machinery/atmospherics/tvalve/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
+
+/obj/machinery/atmospherics/tvalve/attack_ai(mob/user as mob)
+	return
+
+/obj/machinery/atmospherics/tvalve/attack_paw(mob/user as mob)
+	return attack_hand(user)
+
+/obj/machinery/atmospherics/tvalve/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()
+
+/obj/machinery/atmospherics/tvalve/process()
+	..()
+	. = PROCESS_KILL
+	//machines.Remove(src)
+
+	return
+
+/obj/machinery/atmospherics/tvalve/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))
+			var/c = check_connect_types(target,src)
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
 				node1 = target
 				break
-		for(var/obj/machinery/atmospherics/target in get_step(src,node2_dir))
-			if(target.initialize_directions & get_dir(target,src))
+	for(var/obj/machinery/atmospherics/target in get_step(src,node2_dir))
+		if(target.initialize_directions & get_dir(target,src))
+			var/c = check_connect_types(target,src)
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
 				node2 = target
 				break
-		for(var/obj/machinery/atmospherics/target in get_step(src,node3_dir))
-			if(target.initialize_directions & get_dir(target,src))
+	for(var/obj/machinery/atmospherics/target in get_step(src,node3_dir))
+		if(target.initialize_directions & get_dir(target,src))
+			var/c = check_connect_types(target,src)
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
 				node3 = target
 				break
+	
+	update_icon()
+	update_underlays()
 
-	update_icon(animation)
-		if(animation)
-			flick("tvalvem[src.state][!src.state]",src)
-		else
-			icon_state = "tvalvem[state]"
+/obj/machinery/atmospherics/tvalve/build_network()
+	if(!network_node1 && node1)
+		network_node1 = new /datum/pipe_network()
+		network_node1.normal_members += src
+		network_node1.build_network(node1, src)
 
-	digital		// can be controlled by AI
-		name = "digital switching valve"
-		desc = "A digitally controlled valve."
-		icon = 'icons/obj/atmospherics/digital_valve.dmi'
+	if(!network_node2 && node2)
+		network_node2 = new /datum/pipe_network()
+		network_node2.normal_members += src
+		network_node2.build_network(node2, src)
 
-		attack_ai(mob/user as mob)
-			src.add_hiddenprint(user)
-			return src.attack_hand(user)
+	if(!network_node3 && node3)
+		network_node3 = new /datum/pipe_network()
+		network_node3.normal_members += src
+		network_node3.build_network(node3, src)
 
-		attack_hand(mob/user as mob)
-			if(!src.allowed(user))
-				user << "\red Access denied."
-				return
-			..()
 
-		//Radio remote control -eh?
+/obj/machinery/atmospherics/tvalve/return_network(obj/machinery/atmospherics/reference)
+	build_network()
 
-		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)
+	if(reference==node1)
+		return network_node1
 
-		var/frequency = 0
-		var/id = null
-		var/datum/radio_frequency/radio_connection
+	if(reference==node2)
+		return network_node2
 
-		initialize()
-			..()
-			if(frequency)
-				set_frequency(frequency)
+	if(reference==node3)
+		return network_node3
 
-		receive_signal(datum/signal/signal)
-			if(!signal.data["tag"] || (signal.data["tag"] != id))
-				return 0
+	return null
 
-			switch(signal.data["command"])
-				if("valve_open")
-					if(!state)
-						go_to_side()
+/obj/machinery/atmospherics/tvalve/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
 
-				if("valve_close")
-					if(state)
-						go_straight()
+	return 1
 
-				if("valve_toggle")
-					if(state)
-						go_straight()
-					else
-						go_to_side()
+/obj/machinery/atmospherics/tvalve/return_network_air(datum/network/reference)
+	return null
+
+/obj/machinery/atmospherics/tvalve/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
+
+	update_underlays()
+
+	return null
+
+/obj/machinery/atmospherics/tvalve/digital		// can be controlled by AI
+	name = "digital switching valve"
+	desc = "A digitally controlled valve."
+	icon = 'icons/atmos/digital_tvalve.dmi'
+
+	var/frequency = 0
+	var/id = null
+	var/datum/radio_frequency/radio_connection
+
+/obj/machinery/atmospherics/tvalve/digital/bypass
+	icon_state = "map_tvalve1"
+	state = 1
+
+/obj/machinery/atmospherics/tvalve/digital/power_change()
+	var/old_stat = stat
+	..()
+	if(old_stat != stat)
+		update_icon()
+
+/obj/machinery/atmospherics/tvalve/digital/update_icon()
+	..()
+	if(!powered())
+		icon_state = "tvalvenopower"
+
+/obj/machinery/atmospherics/tvalve/digital/attack_ai(mob/user as mob)
+	return src.attack_hand(user)
+
+/obj/machinery/atmospherics/tvalve/digital/attack_hand(mob/user as mob)
+	if(!powered())
+		return
+	if(!src.allowed(user))
+		user << "\red Access denied."
+		return
+	..()
+
+//Radio remote control
+
+/obj/machinery/atmospherics/tvalve/digital/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)
+
+
+
+/obj/machinery/atmospherics/tvalve/digital/initialize()
+	..()
+	if(frequency)
+		set_frequency(frequency)
+
+/obj/machinery/atmospherics/tvalve/digital/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()
+
+/obj/machinery/atmospherics/tvalve/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/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 = "map_tvalvem0"
+
+/obj/machinery/atmospherics/tvalve/mirrored/bypass
+	icon_state = "map_tvalvem1"
+	state = 1
+
+/obj/machinery/atmospherics/tvalve/mirrored/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
+
+/obj/machinery/atmospherics/tvalve/mirrored/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()
+	update_underlays()
+
+/obj/machinery/atmospherics/tvalve/mirrored/update_icon(animation)
+	if(animation)
+		flick("tvalvem[src.state][!src.state]",src)
+	else
+		icon_state = "tvalvem[state]"
+
+/obj/machinery/atmospherics/tvalve/mirrored/digital		// can be controlled by AI
+	name = "digital switching valve"
+	desc = "A digitally controlled valve."
+	icon = 'icons/atmos/digital_tvalve.dmi'
+
+	var/frequency = 0
+	var/id = null
+	var/datum/radio_frequency/radio_connection
+
+/obj/machinery/atmospherics/tvalve/mirrored/digital/bypass
+	icon_state = "map_tvalvem1"
+	state = 1
+
+/obj/machinery/atmospherics/tvalve/mirrored/digital/power_change()
+	var/old_stat = stat
+	..()
+	if(old_stat != stat)
+		update_icon()
+
+/obj/machinery/atmospherics/tvalve/mirrored/digital/update_icon()
+	..()
+	if(!powered())
+		icon_state = "tvalvemnopower"
+
+/obj/machinery/atmospherics/tvalve/mirrored/digital/attack_ai(mob/user as mob)
+	return src.attack_hand(user)
+
+/obj/machinery/atmospherics/tvalve/mirrored/digital/attack_hand(mob/user as mob)
+	if(!powered())
+		return
+	if(!src.allowed(user))
+		user << "\red Access denied."
+		return
+	..()
+
+//Radio remote control -eh?
+
+/obj/machinery/atmospherics/tvalve/mirrored/digital/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)
+
+/obj/machinery/atmospherics/tvalve/mirrored/digital/initialize()
+	..()
+	if(frequency)
+		set_frequency(frequency)
+
+/obj/machinery/atmospherics/tvalve/mirrored/digital/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/outlet_injector.dm

@@ -1,7 +1,8 @@
 /obj/machinery/atmospherics/unary/outlet_injector
-	icon = 'icons/obj/atmospherics/outlet_injector.dmi'
-	icon_state = "off"
+	icon = 'icons/atmos/injector.dmi'
+	icon_state = "map_injector"
 	use_power = 1
+	layer = 3
 
 	name = "Air Injector"
 	desc = "Has a valve and pump attached to it"
@@ -17,131 +18,122 @@
 
 	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
+/obj/machinery/atmospherics/unary/outlet_injector/update_icon()
+	if(!powered())
+		icon_state = "off"
+	else
+		icon_state = "[on ? "on" : "off"]"
 
-		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()
+/obj/machinery/atmospherics/unary/outlet_injector/update_underlays()
+	if(..())
+		underlays.Cut()
+		var/turf/T = get_turf(src)
+		if(!istype(T))
 			return
+		add_underlay(T, node, dir)
 
-		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()
+/obj/machinery/atmospherics/unary/outlet_injector/power_change()
+	var/old_stat = stat
+	..()
+	if(old_stat != stat)
 		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
+/obj/machinery/atmospherics/unary/outlet_injector/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
+
+/obj/machinery/atmospherics/unary/outlet_injector/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)
+
+/obj/machinery/atmospherics/unary/outlet_injector/proc/set_frequency(new_frequency)
+	radio_controller.remove_object(src, frequency)
+	frequency = new_frequency
+	if(frequency)
+		radio_connection = radio_controller.add_object(src, frequency)
+
+/obj/machinery/atmospherics/unary/outlet_injector/proc/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,
+		"sigtype" = "status"
+	 )
+
+	radio_connection.post_signal(src, signal)
+
+	return 1
+
+/obj/machinery/atmospherics/unary/outlet_injector/initialize()
+	..()
+
+	set_frequency(frequency)
+
+/obj/machinery/atmospherics/unary/outlet_injector/receive_signal(datum/signal/signal)
+	if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
+		return 0
+
+	if(signal.data["power"])
+		on = text2num(signal.data["power"])
+
+	if(signal.data["power_toggle"])
+		on = !on
+
+	if(signal.data["inject"])
+		spawn inject()
+		return
+
+	if(signal.data["set_volume_rate"])
+		var/number = text2num(signal.data["set_volume_rate"])
+		volume_rate = between(0, number, air_contents.volume)
+
+	if(signal.data["status"])
+		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()
+
+/obj/machinery/atmospherics/unary/outlet_injector/hide(var/i)
+	update_underlays()

code/ATMOSPHERICS/components/unary/unary_base.dm

@@ -46,10 +46,15 @@
 
 		for(var/obj/machinery/atmospherics/target in get_step(src,node_connect))
 			if(target.initialize_directions & get_dir(target,src))
-				node = target
-				break
+				var/c = check_connect_types(target,src)
+				if (c)
+					target.connected_to = c
+					src.connected_to = c
+					node = target
+					break
 
 		update_icon()
+		update_underlays()
 
 	build_network()
 		if(!network && node)
@@ -84,5 +89,8 @@
 		if(reference==node)
 			del(network)
 			node = null
+			
+		update_icon()
+		update_underlays()
 
 		return null

code/ATMOSPHERICS/components/unary/vent_pump.dm

@@ -1,6 +1,11 @@
+#define EXTERNAL_PRESSURE_BOUND ONE_ATMOSPHERE
+#define INTERNAL_PRESSURE_BOUND 0
+#define PRESSURE_CHECKS 1
+#undefine
+
 /obj/machinery/atmospherics/unary/vent_pump
-	icon = 'icons/obj/atmospherics/vent_pump.dmi'
-	icon_state = "off"
+	icon = 'icons/atmos/vent_pump.dmi'
+	icon_state = "map_vent"
 
 	name = "Air Vent"
 	desc = "Has a valve and pump attached to it"
@@ -14,329 +19,372 @@
 	var/on = 0
 	var/pump_direction = 1 //0 = siphoning, 1 = releasing
 
-	var/external_pressure_bound = ONE_ATMOSPHERE
-	var/internal_pressure_bound = 0
+	var/external_pressure_bound = EXTERNAL_PRESSURE_BOUND
+	var/internal_pressure_bound = INTERNAL_PRESSURE_BOUND
 
-	var/pressure_checks = 1
+	var/pressure_checks = PRESSURE_CHECKS
 	//1: Do not pass external_pressure_bound
 	//2: Do not pass internal_pressure_bound
 	//3: Do not pass either
 
+	// Used when handling incoming radio signals requesting default settings
+	var/external_pressure_bound_default = EXTERNAL_PRESSURE_BOUND
+	var/internal_pressure_bound_default = INTERNAL_PRESSURE_BOUND
+	var/pressure_checks_default = PRESSURE_CHECKS
+
 	var/welded = 0 // Added for aliens -- TLE
-	var/canSpawnMice = 1 // Set to 0 to prevent spawning of mice.
 
 	var/frequency = 1439
 	var/datum/radio_frequency/radio_connection
 
 	var/radio_filter_out
 	var/radio_filter_in
+	
+	connect_types = list(1,2) //connects to regular and supply pipes
 
-	on
-		on = 1
-		icon_state = "out"
+/obj/machinery/atmospherics/unary/vent_pump/on
+	on = 1
+	icon_state = "map_vent_out"
 
-	siphon
-		pump_direction = 0
-		icon_state = "off"
+/obj/machinery/atmospherics/unary/vent_pump/siphon
+	pump_direction = 0
 
-		on
-			on = 1
-			icon_state = "in"
+/obj/machinery/atmospherics/unary/vent_pump/siphon/on
+	on = 1
+	icon_state = "map_vent_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()
-		..()
+/obj/machinery/atmospherics/unary/vent_pump/New()
+	icon = null
+	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
+/obj/machinery/atmospherics/unary/vent_pump/high_volume
+	name = "Large Air Vent"
+	power_channel = EQUIP
 
-	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"
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/New()
+	..()
+	air_contents.volume = 1000
 
+/obj/machinery/atmospherics/unary/vent_pump/update_icon(var/safety = 0)
+	if(!check_icon_cache())
 		return
 
-	process()
-		..()
-		if(stat & (NOPOWER|BROKEN))
+	overlays.Cut()
+	
+	var/vent_icon = "vent"
+
+	var/turf/T = get_turf(src)
+	if(!istype(T))
+		return
+
+	if(T.intact && node && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
+		vent_icon += "h"
+		
+	if(welded)
+		vent_icon += "weld"
+	else if(!powered())
+		vent_icon += "off"
+	else
+		vent_icon += "[on ? "[pump_direction ? "out" : "in"]" : "off"]"
+
+	overlays += icon_manager.get_atmos_icon("device", , , vent_icon)
+
+/obj/machinery/atmospherics/unary/vent_pump/update_underlays()
+	if(..())
+		underlays.Cut()
+		var/turf/T = get_turf(src)
+		if(!istype(T))
 			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
-
-		// New GC does this sometimes
-		if(!loc) return
-
-		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))
+		if(T.intact && node && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
 			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
+		else
+			if(node)
+				add_underlay(T, node, dir, node.icon_connect_type)
+			else
+				add_underlay(T,, dir)
 
-		if(signal.data["purge"] != null)
-			pressure_checks &= ~1
-			pump_direction = 0
+/obj/machinery/atmospherics/unary/vent_pump/hide()
+	update_icon()
+	update_underlays()
 
-		if(signal.data["stabalize"] != null)
-			pressure_checks |= 1
-			pump_direction = 1
+/obj/machinery/atmospherics/unary/vent_pump/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(signal.data["power"] != null)
-			on = text2num(signal.data["power"])
+	if(welded)
+		return 0
 
-		if(signal.data["power_toggle"] != null)
-			on = !on
+	var/datum/gas_mixture/environment = loc.return_air()
+	var/environment_pressure = environment.return_pressure()
 
-		if(signal.data["checks"] != null)
+	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
+
+/obj/machinery/atmospherics/unary/vent_pump/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)
+
+/obj/machinery/atmospherics/unary/vent_pump/proc/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
+
+
+/obj/machinery/atmospherics/unary/vent_pump/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)
+
+/obj/machinery/atmospherics/unary/vent_pump/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)
+		if (signal.data["checks"] == "default")
+			pressure_checks = pressure_checks_default
+		else
 			pressure_checks = text2num(signal.data["checks"])
 
-		if(signal.data["checks_toggle"] != null)
-			pressure_checks = (pressure_checks?0:3)
+	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["direction"] != null)
+		pump_direction = text2num(signal.data["direction"])
 
-		if(signal.data["set_internal_pressure"] != null)
+	if(signal.data["set_internal_pressure"] != null)
+		if (signal.data["set_internal_pressure"] == "default")
+			internal_pressure_bound = internal_pressure_bound_default
+		else
 			internal_pressure_bound = between(
 				0,
 				text2num(signal.data["set_internal_pressure"]),
 				ONE_ATMOSPHERE*50
 			)
 
-		if(signal.data["set_external_pressure"] != null)
+	if(signal.data["set_external_pressure"] != null)
+		if (signal.data["set_external_pressure"] == "default")
+			external_pressure_bound = external_pressure_bound_default
+		else
 			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_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["adjust_external_pressure"] != null)
 
-		if(signal.data["init"] != null)
-			name = signal.data["init"]
-			return
 
-		if(signal.data["status"] != null)
-			spawn(2)
-				broadcast_status()
-			return //do not update_icon
+		external_pressure_bound = between(
+			0,
+			external_pressure_bound + text2num(signal.data["adjust_external_pressure"]),
+			ONE_ATMOSPHERE*50
+		)
 
-			//log_admin("DEBUG \[[world.timeofday]\]: vent_pump/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
+	if(signal.data["init"] != null)
+		name = signal.data["init"]
+		return
+
+	if(signal.data["status"] != null)
 		spawn(2)
 			broadcast_status()
-		update_icon()
-		return
+		return //do not update_icon
 
-	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
+		//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
 
-	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(get_turf(src), '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()
+/obj/machinery/atmospherics/unary/vent_pump/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 << "\blue The welding tool needs to be on to start this task."
+					user.visible_message("[user] unwelds the vent.", "You unweld the vent.", "You hear welding.")
+					welded = 0
+					update_icon()
 			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
+				user << "\blue The welding tool needs to be on to start this task."
 		else
-			stat |= NOPOWER
+			user << "\blue You need more welding fuel to complete this task."
+			return 1
+	else
+		..()
+
+/obj/machinery/atmospherics/unary/vent_pump/examine()
+	set src in oview(1)
+	..()
+	if(welded)
+		usr << "It seems welded shut."
+
+/obj/machinery/atmospherics/unary/vent_pump/power_change()
+	var/old_stat = stat
+	..()
+	if(old_stat != stat)
 		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(get_turf(src), '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/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 (node && node.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/Destroy()
+/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/alien_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

@@ -1,6 +1,6 @@
 /obj/machinery/atmospherics/unary/vent_scrubber
-	icon = 'icons/obj/atmospherics/vent_scrubber.dmi'
-	icon_state = "off"
+	icon = 'icons/atmos/vent_scrubber.dmi'
+	icon_state = "map_scrubber"
 
 	name = "Air Scrubber"
 	desc = "Has a valve and pump attached to it"
@@ -18,7 +18,6 @@
 	var/scrub_CO2 = 1
 	var/scrub_Toxins = 0
 	var/scrub_N2O = 0
-	var/scrub_O2 = 0
 
 	var/volume_rate = 120
 	var/panic = 0 //is this scrubber panicked?
@@ -26,272 +25,264 @@
 	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()
-		var/hidden=""
-		if(level == 1 && istype(loc, /turf/simulated))
-			hidden="h"
-		var/suffix=""
-		if(scrub_O2)
-			suffix="1"
-		if(node && on && !(stat & (NOPOWER|BROKEN)))
-			if(scrubbing)
-				icon_state = "[hidden]on[suffix]"
-			else
-				icon_state = "[hidden]in"
-		else
-			icon_state = "[hidden]off"
+	connect_types = list(1,3) //connects to regular and scrubber pipes
+	
+
+/obj/machinery/atmospherics/unary/vent_scrubber/New()
+	icon = null
+	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()
+	..()
+
+/obj/machinery/atmospherics/unary/vent_scrubber/update_icon(var/safety = 0)
+	if(!check_icon_cache())
 		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)
+	overlays.Cut()
+	
+	var/scrubber_icon = "scrubber"
 
-		broadcast_status()
-			if(!radio_connection)
-				return 0
+	var/turf/T = get_turf(src)
+	if(!istype(T))
+		return
 
-			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_tox" = scrub_Toxins,
-				"filter_n2o" = scrub_N2O,
-				"filter_o2" = scrub_O2,
-				"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)
+	if(!powered())
+		scrubber_icon += "off"
+	else
+		scrubber_icon += "[on ? "[scrubbing ? "on" : "in"]" : "off"]"
 
-			return 1
+	overlays += icon_manager.get_atmos_icon("device", , , scrubber_icon)
 
-	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))
+/obj/machinery/atmospherics/unary/vent_scrubber/update_underlays()
+	if(..())
+		underlays.Cut()
+		var/turf/T = get_turf(src)
+		if(!istype(T))
 			return
-		if (!node)
-			on = 0
-		//broadcast_status()
-		if(!on)
-			return 0
-		// New GC does this sometimes
-		if(!loc) return
+		if(T.intact && node && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
+			return
+		else
+			if(node)
+				add_underlay(T, node, dir, node.icon_connect_type)
+			else
+				add_underlay(T,, dir)
+
+/obj/machinery/atmospherics/unary/vent_scrubber/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)
+
+/obj/machinery/atmospherics/unary/vent_scrubber/proc/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
+
+/obj/machinery/atmospherics/unary/vent_scrubber/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)
+
+/obj/machinery/atmospherics/unary/vent_scrubber/process()
+	..()
+	if(stat & (NOPOWER|BROKEN))
+		return
+	if (!node)
+		on = 0
+	//broadcast_status()
+	if(!on)
+		return 0
 
 
-		var/datum/gas_mixture/environment = loc.return_air()
+	var/datum/gas_mixture/environment = loc.return_air()
 
-		if(scrubbing)
-			// Are we scrubbing gasses that are present?
-			if(\
-				(scrub_Toxins && environment.toxins > 0.001) ||\
-				(scrub_CO2 && environment.carbon_dioxide > 0.001) ||\
-				(scrub_N2O && environment.trace_gases.len > 0) ||\
-				(scrub_O2 && environment.oxygen > 0.001))
-				var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles()
+	if(scrubbing)
+		if((environment.toxins>0.001) || (environment.carbon_dioxide>0.001) || (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(scrub_O2)
-					filtered_out.oxygen = removed.oxygen
-					removed.oxygen = 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)
+			//Take a gas sample
+			var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
+			if (isnull(removed)) //in space
 				return
 
-			var/transfer_moles = environment.total_moles()*(volume_rate/environment.volume)
+			//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
 
-			var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
+			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
 
-			air_contents.merge(removed)
+
+			//Remix the resulting gases
+			air_contents.merge(filtered_out)
+
+			loc.assume_air(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
+	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
+
+/obj/machinery/atmospherics/unary/vent_scrubber/hide(var/i) //to make the little pipe section invisible, the icon changes.
+	update_icon()
+
+/obj/machinery/atmospherics/unary/vent_scrubber/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
 
-	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["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["panic_siphon"]) //must be before if("scrubbing" thing
-			panic = text2num(signal.data["panic_siphon"]) // We send 0 for false in the alarm.
-			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["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["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["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["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["o2_scrub"] != null)
-			scrub_O2 = text2num(signal.data["o2_scrub"])
-		if(signal.data["toggle_o2_scrub"])
-			scrub_O2 = !scrub_O2
-
-		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()]")
+	if(signal.data["status"] != null)
 		spawn(2)
 			broadcast_status()
-		update_icon()
-		return
+		return //do not update_icon
 
-	power_change()
-		if(powered(power_channel))
-			stat &= ~NOPOWER
-		else
-			stat |= NOPOWER
+//			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
+
+/obj/machinery/atmospherics/unary/vent_scrubber/power_change()
+	var/old_stat = stat
+	..()
+	if(old_stat != stat)
 		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(get_turf(src), '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/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 (node && node.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/Destroy()
+/obj/machinery/atmospherics/unary/vent_scrubber/Del()
 	if(initial_loc)
 		initial_loc.air_scrub_info -= id_tag
 		initial_loc.air_scrub_names -= id_tag

code/ATMOSPHERICS/components/valve.dm

@@ -1,10 +1,11 @@
-obj/machinery/atmospherics/valve
-	icon = 'icons/obj/atmospherics/valve.dmi'
-	icon_state = "valve0"
+/obj/machinery/atmospherics/valve
+	icon = 'icons/atmos/valve.dmi'
+	icon_state = "map_valve0"
 
 	name = "manual valve"
 	desc = "A pipe valve"
 
+	level = 1
 	dir = SOUTH
 	initialize_directions = SOUTH|NORTH
 
@@ -17,323 +18,305 @@ obj/machinery/atmospherics/valve
 	var/datum/pipe_network/network_node1
 	var/datum/pipe_network/network_node2
 
-	open
-		open = 1
-		icon_state = "valve1"
+/obj/machinery/atmospherics/valve/open
+	open = 1
+	icon_state = "map_valve1"
 
-	update_icon(animation)
-		if(animation)
-			flick("valve[src.open][!src.open]",src)
-		else
-			icon_state = "valve[open]"
+/obj/machinery/atmospherics/valve/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
-		..()
+/obj/machinery/atmospherics/valve/update_underlays()
+	if(..())
+		underlays.Cut()
+		var/turf/T = get_turf(src)
+		if(!istype(T))
+			return
+		add_underlay(T, node1, get_dir(src, node1))
+		add_underlay(T, node2, get_dir(src, node2))
 
-	network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+/obj/machinery/atmospherics/valve/hide(var/i)
+	update_underlays()
 
+/obj/machinery/atmospherics/valve/New()
+	switch(dir)
+		if(NORTH || SOUTH)
+			initialize_directions = NORTH|SOUTH
+		if(EAST || WEST)
+			initialize_directions = EAST|WEST
+	..()
 
-		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
-
+/obj/machinery/atmospherics/valve/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+	if(reference == node1)
+		network_node1 = new_network
 		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)
+			network_node2 = new_network
+	else if(reference == node2)
+		network_node2 = new_network
+		if(open)
+			network_node1 = new_network
 
-		return null
+	if(new_network.normal_members.Find(src))
+		return 0
 
-	Destroy()
-		loc = null
+	new_network.normal_members += src
 
-		if(node1)
-			node1.disconnect(src)
-			del(network_node1)
-		if(node2)
-			node2.disconnect(src)
-			del(network_node2)
+	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)
 
-		node1 = null
-		node2 = null
+	return null
 
-		..()
+/obj/machinery/atmospherics/valve/Del()
+	loc = null
 
-	proc/open()
+	if(node1)
+		node1.disconnect(src)
+		del(network_node1)
+	if(node2)
+		node2.disconnect(src)
+		del(network_node2)
 
-		if(open) return 0
+	node1 = null
+	node2 = null
 
-		open = 1
-		update_icon()
+	..()
 
-		if(network_node1&&network_node2)
-			network_node1.merge(network_node2)
-			network_node2 = network_node1
+/obj/machinery/atmospherics/valve/proc/open()
+	if(open) return 0
 
-		if(network_node1)
-			network_node1.update = 1
-		else if(network_node2)
-			network_node2.update = 1
+	open = 1
+	update_icon()
 
-		return 1
+	if(network_node1&&network_node2)
+		network_node1.merge(network_node2)
+		network_node2 = network_node1
 
-	proc/close()
+	if(network_node1)
+		network_node1.update = 1
+	else if(network_node2)
+		network_node2.update = 1
 
-		if(!open)
-			return 0
+	return 1
 
-		open = 0
-		update_icon()
+/obj/machinery/atmospherics/valve/proc/close()
+	if(!open)
+		return 0
 
-		if(network_node1)
-			del(network_node1)
-		if(network_node2)
-			del(network_node2)
+	open = 0
+	update_icon()
 
-		build_network()
+	if(network_node1)
+		del(network_node1)
+	if(network_node2)
+		del(network_node2)
 
-		return 1
+	build_network()
 
-	proc/normalize_dir()
-		if(dir==3)
-			dir = 1
-		else if(dir==12)
-			dir = 4
+	return 1
 
-	attack_ai(mob/user as mob)
-		return
+/obj/machinery/atmospherics/valve/proc/normalize_dir()
+	if(dir==3)
+		dir = 1
+	else if(dir==12)
+		dir = 4
 
-	attack_paw(mob/user as mob)
-		return attack_hand(user)
+/obj/machinery/atmospherics/valve/attack_ai(mob/user as mob)
+	return
 
-	attack_hand(mob/user as mob)
-		src.add_fingerprint(usr)
-		update_icon(1)
-		sleep(10)
-		if (src.open)
-			src.close()
-		else
-			src.open()
+/obj/machinery/atmospherics/valve/attack_paw(mob/user as mob)
+	return attack_hand(user)
 
-	process()
-		..()
-		. = PROCESS_KILL
+/obj/machinery/atmospherics/valve/attack_hand(mob/user as mob)
+	src.add_fingerprint(usr)
+	update_icon(1)
+	sleep(10)
+	if (src.open)
+		src.close()
+	else
+		src.open()
 
-/*		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
-*/
+/obj/machinery/atmospherics/valve/process()
+	..()
+	. = PROCESS_KILL
 
-		return
+	return
 
-	initialize()
-		normalize_dir()
+/obj/machinery/atmospherics/valve/initialize()
+	normalize_dir()
 
-		var/node1_dir
-		var/node2_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/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))
+	for(var/obj/machinery/atmospherics/target in get_step(src,node1_dir))
+		if(target.initialize_directions & get_dir(target,src))
+			var/c = check_connect_types(target,src)
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
 				node1 = target
 				break
-		for(var/obj/machinery/atmospherics/target in get_step(src,node2_dir))
-			if(target.initialize_directions & get_dir(target,src))
+	for(var/obj/machinery/atmospherics/target in get_step(src,node2_dir))
+		if(target.initialize_directions & get_dir(target,src))
+			var/c = check_connect_types(target,src)
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
 				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)
+	
+	update_icon()
+	update_underlays()
 
-		if(!network_node2 && node2)
-			network_node2 = new /datum/pipe_network()
-			network_node2.normal_members += src
-			network_node2.build_network(node2, src)
+	if(openDuringInit)
+		close()
+		open()
+		openDuringInit = 0
 
+/obj/machinery/atmospherics/valve/build_network()
+	if(!network_node1 && node1)
+		network_node1 = new /datum/pipe_network()
+		network_node1.normal_members += src
+		network_node1.build_network(node1, src)
 
-	return_network(obj/machinery/atmospherics/reference)
-		build_network()
+	if(!network_node2 && node2)
+		network_node2 = new /datum/pipe_network()
+		network_node2.normal_members += src
+		network_node2.build_network(node2, src)
 
-		if(reference==node1)
-			return network_node1
+/obj/machinery/atmospherics/valve/return_network(obj/machinery/atmospherics/reference)
+	build_network()
 
-		if(reference==node2)
-			return network_node2
+	if(reference==node1)
+		return network_node1
 
-		return null
+	if(reference==node2)
+		return network_node2
 
-	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 null
 
+/obj/machinery/atmospherics/valve/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
+
+/obj/machinery/atmospherics/valve/return_network_air(datum/network/reference)
+	return null
+
+/obj/machinery/atmospherics/valve/disconnect(obj/machinery/atmospherics/reference)
+	if(reference==node1)
+		del(network_node1)
+		node1 = null
+
+	else if(reference==node2)
+		del(network_node2)
+		node2 = null
+
+	update_underlays()
+
+	return null
+
+/obj/machinery/atmospherics/valve/digital		// can be controlled by AI
+	name = "digital valve"
+	desc = "A digitally controlled valve."
+	icon = 'icons/atmos/digital_valve.dmi'
+	
+	var/frequency = 0
+	var/id = null
+	var/datum/radio_frequency/radio_connection
+
+/obj/machinery/atmospherics/valve/digital/attack_ai(mob/user as mob)
+	return src.attack_hand(user)
+
+/obj/machinery/atmospherics/valve/digital/attack_hand(mob/user as mob)
+	if(!powered())
+		return
+	if(!src.allowed(user))
+		user << "\red Access denied."
+		return
+	..()
+
+/obj/machinery/atmospherics/valve/digital/open
+	open = 1
+	icon_state = "map_valve1"
+
+/obj/machinery/atmospherics/valve/digital/power_change()
+	var/old_stat = stat
+	..()
+	if(old_stat != stat)
+		update_icon()
+
+/obj/machinery/atmospherics/valve/digital/update_icon()
+	..()
+	if(!powered())
+		icon_state = "valve[open]nopower"
+
+/obj/machinery/atmospherics/valve/digital/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)
+
+/obj/machinery/atmospherics/valve/digital/initialize()
+	..()
+	if(frequency)
+		set_frequency(frequency)
+
+/obj/machinery/atmospherics/valve/digital/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()
+
+/obj/machinery/atmospherics/valve/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
-
-	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)
-			src.add_hiddenprint(user)
-			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) && src:frequency)
-			user << "\red You cannot unwrench this [src], it's digitally connected to another device."
-			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(get_turf(src), '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)
+	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/mapdebugging.dm

@@ -1,16 +0,0 @@
-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.

code/game/gamemodes/borer/borer.dm

@@ -39,7 +39,7 @@
 		return 0 // not enough candidates for borer
 
 	for(var/obj/machinery/atmospherics/unary/vent_pump/v in world)
-		if(!v.welded && v.z == STATION_Z && v.canSpawnMice==1) // No more spawning in atmos.  Assuming the mappers did their jobs, anyway.
+		if(!v.welded && v.z == STATION_Z) // No more spawning in atmos.  Assuming the mappers did their jobs, anyway.
 			found_vents.Add(v)
 
 	// for each 2 possible borers, add one borer and one host

code/game/machinery/Freezer.dm

@@ -7,6 +7,7 @@
 	anchored = 1.0
 	use_power = 1
 	current_heat_capacity = 1000
+	layer = 3
 
 /obj/machinery/atmospherics/unary/cold_sink/freezer/New()
 	..()
@@ -137,6 +138,7 @@
 	density = 1
 	var/max_temperature = 0
 	anchored = 1.0
+	layer = 3
 
 	current_heat_capacity = 1000
 

code/game/machinery/bots/ed209bot.dm

@@ -58,7 +58,6 @@
 	var/created_name = "ED-209 Security Robot" //To preserve the name if it's a unique securitron I guess
 	var/lasercolor = ""
 
-
 /obj/machinery/bot/ed209/New(loc,created_name,created_lasercolor)
 	..()
 	if(created_name)
@@ -660,8 +659,6 @@ Auto Patrol[]"},
 			if(istype(W, /obj/item/weapon/screwdriver))
 				playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
 				var/turf/T = get_turf(user)
-				user << "<span class='notice'>Now attaching the gun to the frame...</span>"
-				sleep(40)
 				if(get_turf(user) == T)
 					build_step++
 					name = "armed [name]"

code/game/machinery/pipe/construction.dm

@@ -23,6 +23,25 @@ Buildable meters
 #define PIPE_MTVALVE			18
 #define PIPE_MANIFOLD4W			19
 #define PIPE_CAP				20
+///// Z-Level stuff
+#define PIPE_UP					21
+#define PIPE_DOWN				22
+///// Z-Level stuff
+#define PIPE_GAS_FILTER_M		23
+#define PIPE_GAS_MIXER_T		24
+#define PIPE_GAS_MIXER_M		25
+#define PIPE_OMNI_MIXER			26
+#define PIPE_OMNI_FILTER		27
+///// Supply, scrubbers and universal pipes
+#define PIPE_UNIVERSAL				28
+#define PIPE_SUPPLY_STRAIGHT		29
+#define PIPE_SUPPLY_BENT			30
+#define PIPE_SCRUBBERS_STRAIGHT		31
+#define PIPE_SCRUBBERS_BENT			32
+#define PIPE_SUPPLY_MANIFOLD		33
+#define PIPE_SCRUBBERS_MANIFOLD		34
+#define PIPE_SUPPLY_MANIFOLD4W		35
+#define PIPE_SCRUBBERS_MANIFOLD4W	36
 
 /obj/item/pipe
 	name = "pipe"
@@ -30,6 +49,7 @@ Buildable meters
 	var/pipe_type = 0
 	//var/pipe_dir = 0
 	var/pipename
+	var/connect_types[] = list(1) //1=regular, 2=supply, 3=scrubber
 	force = 7
 	icon = 'icons/obj/pipe-item.dmi'
 	icon_state = "simple"
@@ -43,6 +63,7 @@ Buildable meters
 	if (make_from)
 		src.dir = make_from.dir
 		src.pipename = make_from.name
+		color = make_from.pipe_color
 		var/is_bent
 		if  (make_from.initialize_directions in list(NORTH|SOUTH, WEST|EAST))
 			is_bent = 0
@@ -54,18 +75,43 @@ Buildable meters
 			src.pipe_type = PIPE_HE_STRAIGHT + is_bent
 		else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple/insulated))
 			src.pipe_type = PIPE_INSULATED_STRAIGHT + is_bent
+		else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple/visible/supply) || istype(make_from, /obj/machinery/atmospherics/pipe/simple/hidden/supply))
+			src.pipe_type = PIPE_SUPPLY_STRAIGHT + is_bent
+			connect_types = list(2)
+			src.color = PIPE_COLOR_BLUE
+		else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers) || istype(make_from, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers))
+			src.pipe_type = PIPE_SCRUBBERS_STRAIGHT + is_bent
+			connect_types = list(3)
+			src.color = PIPE_COLOR_RED
+		else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple/visible/universal) || istype(make_from, /obj/machinery/atmospherics/pipe/simple/hidden/universal))
+			src.pipe_type = PIPE_UNIVERSAL
+			connect_types = list(1,2,3)
 		else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple))
 			src.pipe_type = PIPE_SIMPLE_STRAIGHT + is_bent
 		else if(istype(make_from, /obj/machinery/atmospherics/portables_connector))
 			src.pipe_type = PIPE_CONNECTOR
+		else if(istype(make_from, /obj/machinery/atmospherics/pipe/manifold/visible/supply) || istype(make_from, /obj/machinery/atmospherics/pipe/manifold/hidden/supply))
+			src.pipe_type = PIPE_SUPPLY_MANIFOLD
+			connect_types = list(2)
+			src.color = PIPE_COLOR_BLUE
+		else if(istype(make_from, /obj/machinery/atmospherics/pipe/manifold/visible/scrubbers) || istype(make_from, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers))
+			src.pipe_type = PIPE_SCRUBBERS_MANIFOLD
+			connect_types = list(3)
+			src.color = PIPE_COLOR_RED
 		else if(istype(make_from, /obj/machinery/atmospherics/pipe/manifold))
 			src.pipe_type = PIPE_MANIFOLD
 		else if(istype(make_from, /obj/machinery/atmospherics/unary/vent_pump))
 			src.pipe_type = PIPE_UVENT
 		else if(istype(make_from, /obj/machinery/atmospherics/valve))
 			src.pipe_type = PIPE_MVALVE
-		else if(istype(make_from, /obj/machinery/atmospherics/binary/pump))
+		else if(istype(make_from, /obj/machinery/atmospherics/binary/volume_pump))
 			src.pipe_type = PIPE_PUMP
+		else if(istype(make_from, /obj/machinery/atmospherics/trinary/filter/m_filter))
+			src.pipe_type = PIPE_GAS_FILTER_M
+		else if(istype(make_from, /obj/machinery/atmospherics/trinary/mixer/t_mixer))
+			src.pipe_type = PIPE_GAS_MIXER_T
+		else if(istype(make_from, /obj/machinery/atmospherics/trinary/mixer/m_mixer))
+			src.pipe_type = PIPE_GAS_MIXER_M
 		else if(istype(make_from, /obj/machinery/atmospherics/trinary/filter))
 			src.pipe_type = PIPE_GAS_FILTER
 		else if(istype(make_from, /obj/machinery/atmospherics/trinary/mixer))
@@ -80,42 +126,45 @@ Buildable meters
 			src.pipe_type = PIPE_HEAT_EXCHANGE
 		else if(istype(make_from, /obj/machinery/atmospherics/tvalve))
 			src.pipe_type = PIPE_MTVALVE
+		else if(istype(make_from, /obj/machinery/atmospherics/pipe/manifold4w/visible/supply) || istype(make_from, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply))
+			src.pipe_type = PIPE_SUPPLY_MANIFOLD4W
+			connect_types = list(2)
+			src.color = PIPE_COLOR_BLUE
+		else if(istype(make_from, /obj/machinery/atmospherics/pipe/manifold4w/visible/scrubbers) || istype(make_from, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers))
+			src.pipe_type = PIPE_SCRUBBERS_MANIFOLD4W
+			connect_types = list(3)
+			src.color = PIPE_COLOR_RED
 		else if(istype(make_from, /obj/machinery/atmospherics/pipe/manifold4w))
 			src.pipe_type = PIPE_MANIFOLD4W
 		else if(istype(make_from, /obj/machinery/atmospherics/pipe/cap))
 			src.pipe_type = PIPE_CAP
+		else if(istype(make_from, /obj/machinery/atmospherics/omni/mixer))
+			src.pipe_type = PIPE_OMNI_MIXER
+		else if(istype(make_from, /obj/machinery/atmospherics/omni/filter))
+			src.pipe_type = PIPE_OMNI_FILTER
+///// Z-Level stuff
+		/*else if(istype(make_from, /obj/machinery/atmospherics/pipe/zpipe/up))
+			src.pipe_type = PIPE_UP
+		else if(istype(make_from, /obj/machinery/atmospherics/pipe/zpipe/down))
+			src.pipe_type = PIPE_DOWN*/
+///// Z-Level stuff
 	else
 		src.pipe_type = pipe_type
 		src.dir = dir
+		if (pipe_type == 29 || pipe_type == 30 || pipe_type == 33 || pipe_type == 35)
+			connect_types = list(2)
+			src.color = PIPE_COLOR_BLUE
+		else if (pipe_type == 31 || pipe_type == 32 || pipe_type == 34 || pipe_type == 36)
+			connect_types = list(3)
+			src.color = PIPE_COLOR_RED
+		else if (pipe_type == 28)
+			connect_types = list(1,2,3)
 	//src.pipe_dir = get_pipe_dir()
 	update()
 	src.pixel_x = rand(-5, 5)
 	src.pixel_y = rand(-5, 5)
 
 //update the name and icon of the pipe item depending on the type
-var/global/list/pipeID2State = list(
-	"simple", \
-	"simple", \
-	"he", \
-	"he", \
-	"connector", \
-	"manifold", \
-	"junction", \
-	"uvent", \
-	"mvalve", \
-	"pump", \
-	"scrubber", \
-	"insulated", \
-	"insulated", \
-	"filter", \
-	"mixer", \
-	"passivegate", \
-	"volumepump", \
-	"heunary", \
-	"mtvalve", \
-	"manifold4w", \
-	"cap", \
-)
 
 /obj/item/pipe/proc/update()
 	var/list/nlist = list( \
@@ -140,9 +189,70 @@ var/global/list/pipeID2State = list(
 		"t-valve", \
 		"4-way manifold", \
 		"pipe cap", \
+///// Z-Level stuff
+		"pipe up", \
+		"pipe down", \
+///// Z-Level stuff
+		"gas filter m", \
+		"gas mixer t", \
+		"gas mixer m", \
+		"omni mixer", \
+		"omni filter", \
+///// Supply and scrubbers pipes
+		"universal pipe adapter", \
+		"supply pipe", \
+		"bent supply pipe", \
+		"scrubbers pipe", \
+		"bent scrubbers pipe", \
+		"supply manifold", \
+		"scrubbers manifold", \
+		"supply 4-way manifold", \
+		"scrubbers 4-way manifold", \
 	)
 	name = nlist[pipe_type+1] + " fitting"
-	icon_state = pipeID2State[pipe_type + 1]
+	var/list/islist = list( \
+		"simple", \
+		"simple", \
+		"he", \
+		"he", \
+		"connector", \
+		"manifold", \
+		"junction", \
+		"uvent", \
+		"mvalve", \
+		"pump", \
+		"scrubber", \
+		"insulated", \
+		"insulated", \
+		"filter", \
+		"mixer", \
+		"passivegate", \
+		"volumepump", \
+		"heunary", \
+		"mtvalve", \
+		"manifold4w", \
+		"cap", \
+///// Z-Level stuff
+		"cap", \
+		"cap", \
+///// Z-Level stuff
+		"m_filter", \
+		"t_mixer", \
+		"m_mixer", \
+		"omni_mixer", \
+		"omni_filter", \
+///// Supply and scrubbers pipes
+		"universal", \
+		"simple", \
+		"simple", \
+		"simple", \
+		"simple", \
+		"manifold", \
+		"manifold", \
+		"manifold4w", \
+		"manifold4w", \
+	)
+	icon_state = islist[pipe_type + 1]
 
 //called when a turf is attacked with a pipe item
 // place the pipe on the turf, setting pipe level to 1 (underfloor) if the turf is not intact
@@ -159,22 +269,22 @@ var/global/list/pipeID2State = list(
 
 	src.dir = turn(src.dir, -90)
 
-	if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE))
+	if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_SUPPLY_STRAIGHT, PIPE_SCRUBBERS_STRAIGHT, PIPE_UNIVERSAL, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE))
 		if(dir==2)
 			dir = 1
 		else if(dir==8)
 			dir = 4
-	else if (pipe_type == PIPE_MANIFOLD4W)
+	else if (pipe_type in list (PIPE_MANIFOLD4W, PIPE_SUPPLY_MANIFOLD4W, PIPE_SCRUBBERS_MANIFOLD4W))
 		dir = 2
 	//src.pipe_dir = get_pipe_dir()
 	return
 
 /obj/item/pipe/Move()
 	..()
-	if ((pipe_type in list (PIPE_SIMPLE_BENT, PIPE_HE_BENT, PIPE_INSULATED_BENT)) \
+	if ((pipe_type in list (PIPE_SIMPLE_BENT, PIPE_SUPPLY_BENT, PIPE_SCRUBBERS_BENT, PIPE_HE_BENT, PIPE_INSULATED_BENT)) \
 		&& (src.dir in cardinal))
 		src.dir = src.dir|turn(src.dir, 90)
-	else if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE))
+	else if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_SUPPLY_STRAIGHT, PIPE_SCRUBBERS_STRAIGHT, PIPE_UNIVERSAL, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE))
 		if(dir==2)
 			dir = 1
 		else if(dir==8)
@@ -198,21 +308,32 @@ var/global/list/pipeID2State = list(
 			PIPE_PUMP ,\
 			PIPE_VOLUME_PUMP ,\
 			PIPE_PASSIVE_GATE ,\
-			PIPE_MVALVE \
+			PIPE_MVALVE ,\
+			PIPE_SUPPLY_STRAIGHT, \
+			PIPE_SCRUBBERS_STRAIGHT, \
+			PIPE_UNIVERSAL, \
 		)
 			return dir|flip
-		if(PIPE_SIMPLE_BENT, PIPE_INSULATED_BENT, PIPE_HE_BENT)
+		if(PIPE_SIMPLE_BENT, PIPE_INSULATED_BENT, PIPE_HE_BENT, PIPE_SUPPLY_BENT, PIPE_SCRUBBERS_BENT)
 			return dir //dir|acw
 		if(PIPE_CONNECTOR,PIPE_UVENT,PIPE_SCRUBBER,PIPE_HEAT_EXCHANGE)
 			return dir
-		if(PIPE_MANIFOLD4W)
+		if(PIPE_MANIFOLD4W, PIPE_SUPPLY_MANIFOLD4W, PIPE_SCRUBBERS_MANIFOLD4W, PIPE_OMNI_MIXER, PIPE_OMNI_FILTER)
 			return dir|flip|cw|acw
-		if(PIPE_MANIFOLD)
+		if(PIPE_MANIFOLD, PIPE_SUPPLY_MANIFOLD, PIPE_SCRUBBERS_MANIFOLD)
 			return flip|cw|acw
 		if(PIPE_GAS_FILTER, PIPE_GAS_MIXER,PIPE_MTVALVE)
 			return dir|flip|cw
+		if(PIPE_GAS_FILTER_M, PIPE_GAS_MIXER_M)
+			return dir|flip|acw
+		if(PIPE_GAS_MIXER_T)
+			return dir|cw|acw
 		if(PIPE_CAP)
 			return flip
+///// Z-Level stuff
+		if(PIPE_UP,PIPE_DOWN)
+			return dir
+///// Z-Level stuff
 	return 0
 
 /obj/item/pipe/proc/get_pdir() //endpoints for regular pipes
@@ -257,26 +378,84 @@ var/global/list/pipeID2State = list(
 		return ..()
 	if (!isturf(src.loc))
 		return 1
-	if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE))
+	if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_SUPPLY_STRAIGHT, PIPE_SCRUBBERS_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE))
 		if(dir==2)
 			dir = 1
 		else if(dir==8)
 			dir = 4
-	else if (pipe_type == PIPE_MANIFOLD4W)
+	else if (pipe_type in list(PIPE_MANIFOLD4W, PIPE_SUPPLY_MANIFOLD4W, PIPE_SCRUBBERS_MANIFOLD4W, PIPE_OMNI_MIXER, PIPE_OMNI_FILTER))
 		dir = 2
 	var/pipe_dir = get_pipe_dir()
 
 	for(var/obj/machinery/atmospherics/M in src.loc)
-		if(M.initialize_directions & pipe_dir)	// matches at least one direction on either type of pipe
-			user << "\red There is already a pipe at that location."
+		if((M.initialize_directions & pipe_dir) && M.check_connect_types_construction(M,src))	// matches at least one direction on either type of pipe
+			user << "\red There is already a pipe of the same type at this location."
 			return 1
 	// no conflicts found
 
-	var/pipefailtext = "\red There's nothing to connect this pipe section to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
+	var/pipefailtext = "\red There's nothing to connect this pipe section to!" //(with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
 
 	switch(pipe_type)
 		if(PIPE_SIMPLE_STRAIGHT, PIPE_SIMPLE_BENT)
 			var/obj/machinery/atmospherics/pipe/simple/P = new( src.loc )
+			P.pipe_color = color
+			P.dir = src.dir
+			P.initialize_directions = pipe_dir
+			var/turf/T = P.loc
+			P.level = T.intact ? 2 : 1
+			P.initialize()
+			if (!P)
+				usr << pipefailtext
+				return 1
+			P.build_network()
+			if (P.node1)
+				P.node1.initialize()
+				P.node1.build_network()
+			if (P.node2)
+				P.node2.initialize()
+				P.node2.build_network()
+	
+		if(PIPE_SUPPLY_STRAIGHT, PIPE_SUPPLY_BENT)
+			var/obj/machinery/atmospherics/pipe/simple/hidden/supply/P = new( src.loc )
+			P.color = color
+			P.dir = src.dir
+			P.initialize_directions = pipe_dir
+			var/turf/T = P.loc
+			P.level = T.intact ? 2 : 1
+			P.initialize()
+			if (!P)
+				usr << pipefailtext
+				return 1
+			P.build_network()
+			if (P.node1)
+				P.node1.initialize()
+				P.node1.build_network()
+			if (P.node2)
+				P.node2.initialize()
+				P.node2.build_network()
+
+		if(PIPE_SCRUBBERS_STRAIGHT, PIPE_SCRUBBERS_BENT)
+			var/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers/P = new( src.loc )
+			P.color = color
+			P.dir = src.dir
+			P.initialize_directions = pipe_dir
+			var/turf/T = P.loc
+			P.level = T.intact ? 2 : 1
+			P.initialize()
+			if (!P)
+				usr << pipefailtext
+				return 1
+			P.build_network()
+			if (P.node1)
+				P.node1.initialize()
+				P.node1.build_network()
+			if (P.node2)
+				P.node2.initialize()
+				P.node2.build_network()
+
+		if(PIPE_UNIVERSAL)
+			var/obj/machinery/atmospherics/pipe/simple/hidden/universal/P = new( src.loc )
+			P.color = color
 			P.dir = src.dir
 			P.initialize_directions = pipe_dir
 			var/turf/T = P.loc
@@ -329,6 +508,53 @@ var/global/list/pipeID2State = list(
 
 		if(PIPE_MANIFOLD)		//manifold
 			var/obj/machinery/atmospherics/pipe/manifold/M = new( src.loc )
+			M.pipe_color = color
+			M.dir = dir
+			M.initialize_directions = pipe_dir
+			//M.New()
+			var/turf/T = M.loc
+			M.level = T.intact ? 2 : 1
+			M.initialize()
+			if (!M)
+				usr << "There's nothing to connect this manifold to!" //(with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
+				return 1
+			M.build_network()
+			if (M.node1)
+				M.node1.initialize()
+				M.node1.build_network()
+			if (M.node2)
+				M.node2.initialize()
+				M.node2.build_network()
+			if (M.node3)
+				M.node3.initialize()
+				M.node3.build_network()
+				
+		if(PIPE_SUPPLY_MANIFOLD)		//manifold
+			var/obj/machinery/atmospherics/pipe/manifold/hidden/supply/M = new( src.loc )
+			M.color = color
+			M.dir = dir
+			M.initialize_directions = pipe_dir
+			//M.New()
+			var/turf/T = M.loc
+			M.level = T.intact ? 2 : 1
+			M.initialize()
+			if (!M)
+				usr << "There's nothing to connect this manifold to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
+				return 1
+			M.build_network()
+			if (M.node1)
+				M.node1.initialize()
+				M.node1.build_network()
+			if (M.node2)
+				M.node2.initialize()
+				M.node2.build_network()
+			if (M.node3)
+				M.node3.initialize()
+				M.node3.build_network()
+
+		if(PIPE_SCRUBBERS_MANIFOLD)		//manifold
+			var/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers/M = new( src.loc )
+			M.color = color
 			M.dir = dir
 			M.initialize_directions = pipe_dir
 			//M.New()
@@ -351,12 +577,67 @@ var/global/list/pipeID2State = list(
 
 		if(PIPE_MANIFOLD4W)		//4-way manifold
 			var/obj/machinery/atmospherics/pipe/manifold4w/M = new( src.loc )
+			M.pipe_color = color
 			M.dir = dir
 			M.initialize_directions = pipe_dir
 			//M.New()
 			var/turf/T = M.loc
 			M.level = T.intact ? 2 : 1
 			M.initialize()
+			if (!M)
+				usr << "There's nothing to connect this manifold to!" //(with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
+				return 1
+			M.build_network()
+			if (M.node1)
+				M.node1.initialize()
+				M.node1.build_network()
+			if (M.node2)
+				M.node2.initialize()
+				M.node2.build_network()
+			if (M.node3)
+				M.node3.initialize()
+				M.node3.build_network()
+			if (M.node4)
+				M.node4.initialize()
+				M.node4.build_network()
+				
+		if(PIPE_SUPPLY_MANIFOLD4W)		//4-way manifold
+			var/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply/M = new( src.loc )
+			M.color = color
+			M.dir = dir
+			M.initialize_directions = pipe_dir
+			M.connect_types = src.connect_types
+			//M.New()
+			var/turf/T = M.loc
+			M.level = T.intact ? 2 : 1
+			M.initialize()
+			if (!M)
+				usr << "There's nothing to connect this manifold to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
+				return 1
+			M.build_network()
+			if (M.node1)
+				M.node1.initialize()
+				M.node1.build_network()
+			if (M.node2)
+				M.node2.initialize()
+				M.node2.build_network()
+			if (M.node3)
+				M.node3.initialize()
+				M.node3.build_network()
+			if (M.node4)
+				M.node4.initialize()
+				M.node4.build_network()
+
+		if(PIPE_SCRUBBERS_MANIFOLD4W)		//4-way manifold
+			var/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers/M = new( src.loc )
+			M.color = color
+			M.dir = dir
+			M.initialize_directions = pipe_dir
+			M.connect_types = src.connect_types
+			//M.New()
+			var/turf/T = M.loc
+			M.level = T.intact ? 2 : 1
+			M.initialize()
 			if (!M)
 				usr << "There's nothing to connect this manifold to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
 				return 1
@@ -383,7 +664,7 @@ var/global/list/pipeID2State = list(
 			//P.level = T.intact ? 2 : 1
 			P.initialize()
 			if (!P)
-				usr << "There's nothing to connect this junction to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
+				usr << pipefailtext //"There's nothing to connect this pipe to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
 				return 1
 			P.build_network()
 			if (P.node1)
@@ -428,7 +709,7 @@ var/global/list/pipeID2State = list(
 				V.node2.build_network()
 
 		if(PIPE_PUMP)		//gas pump
-			var/obj/machinery/atmospherics/binary/pump/P = new(src.loc)
+			var/obj/machinery/atmospherics/binary/volume_pump/P = new(src.loc)
 			P.dir = dir
 			P.initialize_directions = pipe_dir
 			if (pipename)
@@ -464,7 +745,7 @@ var/global/list/pipeID2State = list(
 				P.node3.initialize()
 				P.node3.build_network()
 
-		if(PIPE_GAS_MIXER)		//gas filter
+		if(PIPE_GAS_MIXER)		//gas mixer
 			var/obj/machinery/atmospherics/trinary/mixer/P = new(src.loc)
 			P.dir = dir
 			P.initialize_directions = pipe_dir
@@ -484,6 +765,66 @@ var/global/list/pipeID2State = list(
 				P.node3.initialize()
 				P.node3.build_network()
 
+		if(PIPE_GAS_FILTER_M)		//gas filter mirrored
+			var/obj/machinery/atmospherics/trinary/filter/m_filter/P = new(src.loc)
+			P.dir = dir
+			P.initialize_directions = pipe_dir
+			if (pipename)
+				P.name = pipename
+			var/turf/T = P.loc
+			P.level = T.intact ? 2 : 1
+			P.initialize()
+			P.build_network()
+			if (P.node1)
+				P.node1.initialize()
+				P.node1.build_network()
+			if (P.node2)
+				P.node2.initialize()
+				P.node2.build_network()
+			if (P.node3)
+				P.node3.initialize()
+				P.node3.build_network()
+
+		if(PIPE_GAS_MIXER_T)		//gas mixer-t
+			var/obj/machinery/atmospherics/trinary/mixer/t_mixer/P = new(src.loc)
+			P.dir = dir
+			P.initialize_directions = pipe_dir
+			if (pipename)
+				P.name = pipename
+			var/turf/T = P.loc
+			P.level = T.intact ? 2 : 1
+			P.initialize()
+			P.build_network()
+			if (P.node1)
+				P.node1.initialize()
+				P.node1.build_network()
+			if (P.node2)
+				P.node2.initialize()
+				P.node2.build_network()
+			if (P.node3)
+				P.node3.initialize()
+				P.node3.build_network()
+
+		if(PIPE_GAS_MIXER_M)		//gas mixer mirrored
+			var/obj/machinery/atmospherics/trinary/mixer/m_mixer/P = new(src.loc)
+			P.dir = dir
+			P.initialize_directions = pipe_dir
+			if (pipename)
+				P.name = pipename
+			var/turf/T = P.loc
+			P.level = T.intact ? 2 : 1
+			P.initialize()
+			P.build_network()
+			if (P.node1)
+				P.node1.initialize()
+				P.node1.build_network()
+			if (P.node2)
+				P.node2.initialize()
+				P.node2.build_network()
+			if (P.node3)
+				P.node3.initialize()
+				P.node3.build_network()
+
 		if(PIPE_SCRUBBER)		//scrubber
 			var/obj/machinery/atmospherics/unary/vent_scrubber/S = new(src.loc)
 			S.dir = dir
@@ -593,6 +934,52 @@ var/global/list/pipeID2State = list(
 			if (C.node)
 				C.node.initialize()
 				C.node.build_network()
+///// Z-Level stuff
+/*		if(PIPE_UP)
+			var/obj/machinery/atmospherics/pipe/zpipe/up/P = new(src.loc)
+			P.dir = dir
+			P.initialize_directions = pipe_dir
+			if (pipename)
+				P.name = pipename
+			var/turf/T = P.loc
+			P.level = T.intact ? 2 : 1
+			P.initialize()
+			P.build_network()
+			if (P.node1)
+				P.node1.initialize()
+				P.node1.build_network()
+			if (P.node2)
+				P.node2.initialize()
+				P.node2.build_network()
+		if(PIPE_DOWN)
+			var/obj/machinery/atmospherics/pipe/zpipe/down/P = new(src.loc)
+			P.dir = dir
+			P.initialize_directions = pipe_dir
+			if (pipename)
+				P.name = pipename
+			var/turf/T = P.loc
+			P.level = T.intact ? 2 : 1
+			P.initialize()
+			P.build_network()
+			if (P.node1)
+				P.node1.initialize()
+				P.node1.build_network()
+			if (P.node2)
+				P.node2.initialize()
+				P.node2.build_network()*/
+///// Z-Level stuff
+		if(PIPE_OMNI_MIXER)
+			var/obj/machinery/atmospherics/omni/mixer/P = new(loc)
+			var/turf/T = P.loc
+			P.level = T.intact ? 2 : 1
+			P.initialize()
+			P.build_network()
+		if(PIPE_OMNI_FILTER)
+			var/obj/machinery/atmospherics/omni/filter/P = new(loc)
+			var/turf/T = P.loc
+			P.level = T.intact ? 2 : 1
+			P.initialize()
+			P.build_network()
 
 	playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 	user.visible_message( \
@@ -649,4 +1036,14 @@ var/global/list/pipeID2State = list(
 #undef PIPE_VOLUME_PUMP
 #undef PIPE_OUTLET_INJECT
 #undef PIPE_MTVALVE
-//#undef PIPE_MANIFOLD4W
+#undef PIPE_GAS_FILTER_M
+#undef PIPE_GAS_MIXER_T
+#undef PIPE_GAS_MIXER_M
+#undef PIPE_SUPPLY_STRAIGHT
+#undef PIPE_SUPPLY_BENT
+#undef PIPE_SCRUBBERS_STRAIGHT
+#undef PIPE_SCRUBBERS_BENT
+#undef PIPE_SUPPLY_MANIFOLD
+#undef PIPE_SCRUBBERS_MANIFOLD
+#undef PIPE_UNIVERSAL
+//#undef PIPE_MANIFOLD4W

code/game/machinery/pipe/pipe_dispenser.dm

@@ -22,7 +22,18 @@
 <A href='?src=\ref[src];make=20;dir=1'>Pipe Cap</A><BR>
 <A href='?src=\ref[src];make=19;dir=1'>4-Way Manifold</A><BR>
 <A href='?src=\ref[src];make=18;dir=1'>Manual T-Valve</A><BR>
+<b>Supply pipes:</b><BR>
+<A href='?src=\ref[src];make=29;dir=1'>Pipe</A><BR>
+<A href='?src=\ref[src];make=30;dir=5'>Bent Pipe</A><BR>
+<A href='?src=\ref[src];make=33;dir=1'>Manifold</A><BR>
+<A href='?src=\ref[src];make=35;dir=1'>4-Way Manifold</A><BR>
+<b>Scrubbers pipes:</b><BR>
+<A href='?src=\ref[src];make=31;dir=1'>Pipe</A><BR>
+<A href='?src=\ref[src];make=32;dir=5'>Bent Pipe</A><BR>
+<A href='?src=\ref[src];make=34;dir=1'>Manifold</A><BR>
+<A href='?src=\ref[src];make=36;dir=1'>4-Way Manifold</A><BR>
 <b>Devices:</b><BR>
+<A href='?src=\ref[src];make=28;dir=1'>Universal Pipe Adapter</A><BR>
 <A href='?src=\ref[src];make=4;dir=1'>Connector</A><BR>
 <A href='?src=\ref[src];make=7;dir=1'>Unary Vent</A><BR>
 <A href='?src=\ref[src];make=9;dir=1'>Gas Pump</A><BR>

code/game/objects/items/devices/pipe_painter.dm

@@ -3,19 +3,30 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "labeler1"
 	item_state = "flight"
-	var/list/modes = list("grey","red","blue","cyan","green","yellow","purple")
-	var/mode = "grey"
+	var/list/modes
+	var/mode
+
+/obj/item/device/pipe_painter/New()
+	..()
+	modes = new()
+	for(var/C in pipe_colors)
+		modes += "[C]"
+	mode = pick(modes)
 
 /obj/item/device/pipe_painter/afterattack(atom/A, mob/user as mob)
-	if(!istype(A,/obj/machinery/atmospherics/pipe) || istype(A,/obj/machinery/atmospherics/pipe/tank) || istype(A,/obj/machinery/atmospherics/pipe/vent) || istype(A,/obj/machinery/atmospherics/pipe/simple/heat_exchanging) || istype(A,/obj/machinery/atmospherics/pipe/simple/insulated))
+	if(!istype(A,/obj/machinery/atmospherics/pipe) || istype(A,/obj/machinery/atmospherics/pipe/tank) || istype(A,/obj/machinery/atmospherics/pipe/vent) || istype(A,/obj/machinery/atmospherics/pipe/simple/heat_exchanging) || istype(A,/obj/machinery/atmospherics/pipe/simple/insulated) || !in_range(user, A))
 		return
 	var/obj/machinery/atmospherics/pipe/P = A
-	P._color = mode
-	user.visible_message("<span class='notice'>[user] paints \the [P] [mode].</span>","<span class='notice'>You paint \the [P] [mode].</span>")
-	P.update_icon()
+
+	var/turf/T = P.loc
+	if (P.level < 2 && T.level==1 && isturf(T) && T.intact)
+		user << "\red You must remove the plating first."
+		return
+
+	P.change_color(pipe_colors[mode])
 
 /obj/item/device/pipe_painter/attack_self(mob/user as mob)
-	mode = input("Which colour do you want to use?","Pipe painter") in modes
+	mode = input("Which colour do you want to use?", "Pipe painter", mode) in modes
 
 /obj/item/device/pipe_painter/examine()
 	..()

code/game/objects/items/devices/scanners.dm

@@ -66,11 +66,13 @@ REAGENT SCANNER
 
 			if(O.invisibility == 101)
 				O.invisibility = 0
+				O.alpha = 128
 				spawn(pulse_duration)
 					if(O)
 						var/turf/U = O.loc
 						if(U.intact)
 							O.invisibility = 101
+							O.alpha = 255
 		for(var/mob/living/M in T.contents)
 			var/oldalpha = M.alpha
 			if(M.alpha < 255 && istype(M))

code/game/objects/structures/window.dm

@@ -381,7 +381,7 @@ var/global/wcColored
 /obj/structure/window/New(Loc,re=0)
 	..()
 	ini_dir = dir
-	if(!color)
+	if(!color && !istype(src,/obj/structure/window/plasmabasic) && !istype(src,/obj/structure/window/plasmareinforced))
 		color = color_windows(src)
 	update_nearby_tiles(need_rebuild=1)
 	update_nearby_icons()

code/game/turfs/simulated/floor_types.dm

@@ -50,6 +50,7 @@
 	icon_state = "engine"
 	thermal_conductivity = 0.025
 	heat_capacity = 325000
+	intact = 0
 
 /turf/simulated/floor/engine/attackby(obj/item/weapon/C as obj, mob/user as mob)
 	if(!C)

code/modules/admin/topic.dm

@@ -1604,7 +1604,7 @@
 		var/obj/item/fax = locate(href_list["AdminFaxView"])
 		if (istype(fax, /obj/item/weapon/paper))
 			var/obj/item/weapon/paper/P = fax
-			P.show_content(usr)
+			P.show_content(usr,1)
 		else if (istype(fax, /obj/item/weapon/photo))
 			var/obj/item/weapon/photo/H = fax
 			H.show(usr)

code/modules/admin/verbs/atmosdebug.dm

@@ -1,11 +1,16 @@
 /client/proc/atmosscan()
 	set category = "Mapping"
-	set name = "Check Plumbing"
+	set name = "Check Piping"
+	set background = 1
 	if(!src.holder)
 		src << "Only administrators may use this command."
 		return
 	feedback_add_details("admin_verb","CP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	
+	if(alert("WARNING: This command should not be run on a live server. Do you want to continue?", "Check Piping", "No", "Yes") == "No")
+		return
 
+	usr << "Checking for disconnected pipes..."
 	//all plumbing - yes, some things might get stated twice, doesn't matter.
 	for (var/obj/machinery/atmospherics/plumbing in world)
 		if (plumbing.nodealert)
@@ -21,6 +26,19 @@
 		if (!pipe.node1 || !pipe.node2)
 			usr << "Unconnected [pipe.name] located at [pipe.x],[pipe.y],[pipe.z] ([get_area(pipe.loc)])"
 
+	usr << "Checking for overlapping pipes..."
+	next_turf:
+		for(var/turf/T in world)
+			for(var/dir in cardinal)
+				var/check = 0
+				for(var/obj/machinery/atmospherics/pipe in T)
+					if(dir & pipe.initialize_directions)
+						check++
+						if(check > 1)
+							usr << "Overlapping pipe ([pipe.name]) located at [T.x],[T.y],[T.z] ([get_area(T)])"
+							continue next_turf
+	usr << "Done"
+
 /client/proc/powerdebug()
 	set category = "Mapping"
 	set name = "Check Power"

code/modules/events/blob.dm

@@ -7,7 +7,7 @@
 
 /datum/event/blob/announce()
 	command_alert("Confirmed outbreak of level 7 biohazard aboard [station_name()]. Nanotrasen has issued a directive 7-10. The station is to be considered quarantined.", "Biohazard Alert")
-	world << sound('sound/AI/outbreak7.ogg')
+	world << sound('sound/AI/blob_confirmed.ogg')
 		
 	for (var/mob/living/silicon/ai/aiPlayer in player_list)
 		if (aiPlayer.client)

code/modules/events/mass_hallucination.dm

@@ -1,3 +1,4 @@
 /datum/event/mass_hallucination/start()
-	for(var/mob/living/carbon/C in living_mob_list)
-		C.hallucination += rand(70, 100)
+	for(var/mob/living/carbon/human/C in living_mob_list)
+		if(!(C.species.flags & IS_SYNTHETIC))
+			C.hallucination += rand(70, 100)

code/modules/mob/living/carbon/human/human_damage.dm

@@ -21,7 +21,7 @@
 	if (stat == CONSCIOUS && (src in dead_mob_list)) //Defib fix
 		update_revive()
 	return
-	
+
 /mob/living/carbon/human/proc/update_revive() // handles revival through other means than cloning or adminbus (defib, IPC repair)
 	stat = CONSCIOUS
 	dead_mob_list -= src
@@ -29,7 +29,7 @@
 	mob_list |= src
 	ear_deaf = 0
 	tod = 0
-	timeofdeath = 0	
+	timeofdeath = 0
 
 /mob/living/carbon/human/getBrainLoss()
 	if(species && species.flags & NO_INTORGANS) return
@@ -139,7 +139,7 @@
 				var/datum/organ/external/O = pick(candidates)
 				O.mutate()
 				src << "<span class = 'notice'>Something is not right with your [O.display_name]...</span>"
-				O.add_autopsy_data("Mutation", amount)				
+				O.add_autopsy_data("Mutation", amount)
 				return
 	else
 		if (prob(heal_prob))
@@ -292,7 +292,8 @@ This function restores all organs.
 	//Handle BRUTE and BURN damage
 	handle_suit_punctures(damagetype, damage)
 
-	if(blocked >= 2)	return 0
+	blocked = (100-blocked)/100
+	if(blocked <= 0)	return 0
 
 	var/datum/organ/external/organ = null
 	if(isorgan(def_zone))
@@ -302,8 +303,7 @@ This function restores all organs.
 		organ = get_organ(check_zone(def_zone))
 	if(!organ)	return 0
 
-	if(blocked)
-		damage = (damage/(blocked+1))
+	damage = damage * blocked
 
 	switch(damagetype)
 		if(BRUTE)

code/modules/mob/living/carbon/human/human_defense.dm

@@ -185,9 +185,6 @@ emp_act
 				buckled.unbuckle()
 			src.loc = picked
 			return 1
-	if(species.flags & HAS_CHITTIN && (prob(50 - round(damage / 3))))
-		visible_message("\red <B> The [attack_text] bounces off [src]' natural armor!</B>")
-		return 1
 	return 0
 
 /mob/living/carbon/human/emp_act(severity)
@@ -206,14 +203,6 @@ emp_act
 /mob/living/carbon/human/proc/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone)
 	if(!I || !user)	return 0
 
-	var/target_zone = def_zone? check_zone(def_zone) : get_zone_with_miss_chance(user.zone_sel.selecting, src)
-
-	if(user == src) // Attacking yourself can't miss
-		target_zone = user.zone_sel.selecting
-	if(!target_zone && !src.stat && !I.discrete)
-		visible_message("\red <B>[user] misses [src] with \the [I]!")
-		return 0
-
 	if(istype(I, /obj/item/weapon/butch/meatcleaver) && src.stat == DEAD && user.a_intent == "harm")
 		var/obj/item/weapon/reagent_containers/food/snacks/meat/human/newmeat = new /obj/item/weapon/reagent_containers/food/snacks/meat/human(get_turf(src.loc))
 		newmeat.name = src.real_name + newmeat.name
@@ -235,7 +224,7 @@ emp_act
 
 			del(src)
 
-	var/datum/organ/external/affecting = get_organ(target_zone)
+	var/datum/organ/external/affecting = get_organ(ran_zone(user.zone_sel.selecting))
 	if (!affecting)
 		return 0
 	if(affecting.status & ORGAN_DESTROYED)
@@ -267,11 +256,11 @@ emp_act
 	var/armor = run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened hit to your [hit_area].")
 	var/weapon_sharp = is_sharp(I)
 	var/weapon_edge = has_edge(I)
-	if ((weapon_sharp || weapon_edge) && prob(getarmor(target_zone, "melee")))
+	if ((weapon_sharp || weapon_edge) && prob(getarmor(user.zone_sel.selecting, "melee")))
 		weapon_sharp = 0
 		weapon_edge = 0
 
-	if(armor >= 2)	return 0
+	if(armor >= 100)	return 0
 	if(!I.force)	return 0
 	var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords)
 
@@ -348,25 +337,13 @@ emp_act
 /mob/living/carbon/human/hitby(atom/movable/AM as mob|obj,var/speed = 5)
 	if(istype(AM,/obj/))
 		var/obj/O = AM
+		var/zone = ran_zone("chest", 65)
 		var/dtype = BRUTE
 		if(istype(O,/obj/item/weapon))
 			var/obj/item/weapon/W = O
 			dtype = W.damtype
 		var/throw_damage = O.throwforce*(speed/5)
 
-		var/zone
-		if (istype(O.thrower, /mob/living))
-			var/mob/living/L = O.thrower
-			zone = check_zone(L.zone_sel.selecting)
-		else
-			zone = ran_zone("chest",75)	//Hits a random part of the body, geared towards the chest
-
-		//check if we hit
-		if (O.throw_source)
-			var/distance = get_dist(O.throw_source, loc)
-			zone = get_zone_with_miss_chance(zone, src, min(15*(distance-2), 0))
-		else
-			zone = get_zone_with_miss_chance(zone, src, 15)
 		/*
 		if(!zone)
 			visible_message("\blue \The [O] misses [src] narrowly!")
@@ -383,8 +360,8 @@ emp_act
 		src.visible_message("\red [src] has been hit in the [hit_area] by [O].")
 		var/armor = run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened hit to your [hit_area].") //I guess "melee" is the best fit here
 
-		if(armor < 2)
-			apply_damage(throw_damage, dtype, zone, armor, is_sharp(O), has_edge(O), O)
+
+		apply_damage(throw_damage, dtype, zone, armor, is_sharp(O), has_edge(O), O)
 
 		if(ismob(O.thrower))
 			var/mob/M = O.thrower

code/modules/mob/living/carbon/human/life.dm

@@ -200,8 +200,8 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 
 	pressure_adjustment_coefficient = min(1,max(pressure_adjustment_coefficient,0)) // So it isn't less than 0 or larger than 1.
 
-	return pressure_adjustment_coefficient	
-	
+	return pressure_adjustment_coefficient
+
 /mob/living/carbon/human/calculate_affecting_pressure(var/pressure)
 	var/pressure_difference
 
@@ -422,7 +422,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 			if(istype(loc, /obj/))
 				var/obj/location_as_object = loc
 				location_as_object.handle_internal_lifeform(src, 0)
-				
+
 		else
 			//First, check for air from internal atmosphere (using an air tank and mask generally)
 			breath = get_breath_from_internal(BREATH_VOLUME) // Super hacky -- TLE
@@ -513,7 +513,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 			var/oxyloss = 0
 			if(reagents.has_reagent("inaprovaline"))
 				return
-			if(suiciding)	
+			if(suiciding)
 				oxyloss = 2
 				adjustOxyLoss(oxyloss)//If you are suiciding, you should die a little bit faster
 				failed_last_breath = 1
@@ -527,9 +527,9 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 				oxyloss = HUMAN_CRIT_MAX_OXYLOSS
 				adjustOxyLoss(oxyloss)
 				failed_last_breath = 1
-				
-			var/datum/organ/external/affected = get_organ("chest")	
-			affected.add_autopsy_data("Suffocation", oxyloss) 
+
+			var/datum/organ/external/affected = get_organ("chest")
+			affected.add_autopsy_data("Suffocation", oxyloss)
 
 			oxygen_alert = max(oxygen_alert, 1)
 
@@ -1649,7 +1649,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 		if(health < 0)// health 0 makes you immediately collapse
 			shock_stage = max(shock_stage, 61)
 
-		if(traumatic_shock >= 80)
+		if(traumatic_shock >= 100)
 			shock_stage += 1
 		else
 			shock_stage = min(shock_stage, 160)
@@ -1668,6 +1668,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 			src << "<font color='red'><b>"+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")
 
 		if(shock_stage >=60)
+			if(shock_stage == 60) emote("me",1,"'s body becomes limp.")
 			if (prob(2))
 				src << "<font color='red'><b>"+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")
 				Weaken(20)

code/modules/mob/living/carbon/shock.dm

@@ -5,26 +5,26 @@
 /mob/living/carbon/proc/updateshock()
 	src.traumatic_shock = 			\
 	1	* src.getOxyLoss() + 		\
-	0.7	* src.getToxLoss() + 		\
-	1.5	* src.getFireLoss() + 		\
-	1.2	* src.getBruteLoss() + 		\
-	1.7	* src.getCloneLoss() + 		\
-	2	* src.halloss
+	1	* src.getToxLoss() + 		\
+	1	* src.getFireLoss() + 		\
+	1	* src.getBruteLoss() + 		\
+	1	* src.getCloneLoss() + 		\
+	1	* src.halloss
 
 	if(reagents.has_reagent("alkysine"))
-		src.traumatic_shock -= 10
+		src.traumatic_shock -= 5
 	if(reagents.has_reagent("inaprovaline"))
-		src.traumatic_shock -= 25
+		src.traumatic_shock -= 15
 	if(reagents.has_reagent("synaptizine"))
-		src.traumatic_shock -= 40
+		src.traumatic_shock -= 30
 	if(reagents.has_reagent("paracetamol"))
-		src.traumatic_shock -= 50
+		src.traumatic_shock -= 40
 	if(reagents.has_reagent("tramadol"))
-		src.traumatic_shock -= 80
+		src.traumatic_shock -= 60
 	if(reagents.has_reagent("oxycodone"))
 		src.traumatic_shock -= 200
 	if(src.slurring)
-		src.traumatic_shock -= 20
+		src.traumatic_shock -= 10
 	if(src.analgesic)
 		src.traumatic_shock = 0
 
@@ -35,11 +35,11 @@
 			if (!organ)
 				continue
 			if((organ.status & ORGAN_DESTROYED) && !organ.amputated)
-				src.traumatic_shock += 60
-			else if(organ.status & ORGAN_BROKEN || organ.open)
 				src.traumatic_shock += 30
+			else if(organ.status & ORGAN_BROKEN || organ.open)
+				src.traumatic_shock += 15
 				if(organ.status & ORGAN_SPLINTED)
-					src.traumatic_shock -= 25
+					src.traumatic_shock -= 15
 
 	if(src.traumatic_shock < 0)
 		src.traumatic_shock = 0

code/modules/mob/living/carbon/species.dm

@@ -457,7 +457,10 @@
 	language = "Chittin"
 	unarmed_type = /datum/unarmed_attack/claws
 
-	flags = IS_WHITELISTED | HAS_CHITTIN
+
+	brute_mod = 0.8
+
+	flags = IS_WHITELISTED
 	bloodflags = BLOOD_GREEN
 	bodyflags = FEET_CLAWS
 

code/modules/mob/living/damage_procs.dm

@@ -9,29 +9,30 @@
 	standard 0 if fail
 */
 /mob/living/proc/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/used_weapon = null, var/sharp = 0, var/edge = 0)
-	if(!damage || (blocked >= 2))	return 0
+	blocked = (100-blocked)/100
+	if(!damage || (blocked <= 0))	return 0
 	switch(damagetype)
 		if(BRUTE)
-			adjustBruteLoss(damage/(blocked+1))
+			adjustBruteLoss(damage * blocked)
 		if(BURN)
 			if(M_RESIST_HEAT in mutations)	damage = 0
-			adjustFireLoss(damage/(blocked+1))
+			adjustFireLoss(damage * blocked)
 		if(TOX)
-			adjustToxLoss(damage/(blocked+1))
+			adjustToxLoss(damage * blocked)
 		if(OXY)
-			adjustOxyLoss(damage/(blocked+1))
+			adjustOxyLoss(damage * blocked)
 		if(CLONE)
-			adjustCloneLoss(damage/(blocked+1))
+			adjustCloneLoss(damage * blocked)
 		if(HALLOSS)
-			adjustHalLoss(damage/(blocked+1))
+			adjustHalLoss(damage * blocked)
 		if(STAMINA)
-			adjustStaminaLoss(damage/(blocked+1))
+			adjustStaminaLoss(damage * blocked)
 	updatehealth()
 	return 1
 
 
 /mob/living/proc/apply_damages(var/brute = 0, var/burn = 0, var/tox = 0, var/oxy = 0, var/clone = 0, var/halloss = 0, var/def_zone = null, var/blocked = 0, var/stamina = 0)
-	if(blocked >= 2)	return 0
+	if(blocked >= 100)	return 0
 	if(brute)	apply_damage(brute, BRUTE, def_zone, blocked)
 	if(burn)	apply_damage(burn, BURN, def_zone, blocked)
 	if(tox)		apply_damage(tox, TOX, def_zone, blocked)
@@ -44,27 +45,28 @@
 
 
 /mob/living/proc/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0)
-	if(!effect || (blocked >= 2))	return 0
+	blocked = (100-blocked)/100
+	if(!effect || (blocked <= 0))	return 0
 	switch(effecttype)
 		if(STUN)
-			Stun(effect/(blocked+1))
+			Stun(effect * blocked)
 		if(WEAKEN)
-			Weaken(effect/(blocked+1))
+			Weaken(effect * blocked)
 		if(PARALYZE)
-			Paralyse(effect/(blocked+1))
+			Paralyse(effect * blocked)
 		if(AGONY)
 			halloss += effect // Useful for objects that cause "subdual" damage. PAIN!
 		if(IRRADIATE)
-			radiation += max((((effect - (effect*(getarmor(null, "rad")/100))))/(blocked+1)),0)//Rads auto check armor
+			radiation += max(effect * ((100-run_armor_check(null, "rad", "Your clothes feel warm.", "Your clothes feel warm."))/100),0)//Rads auto check armor
 		if(STUTTER)
 			if(status_flags & CANSTUN) // stun is usually associated with stutter
-				stuttering = max(stuttering,(effect/(blocked+1)))
+				stuttering = max(stuttering,(effect * blocked))
 		if(EYE_BLUR)
-			eye_blurry = max(eye_blurry,(effect/(blocked+1)))
+			eye_blurry = max(eye_blurry,(effect * blocked))
 		if(DROWSY)
-			drowsyness = max(drowsyness,(effect/(blocked+1)))
+			drowsyness = max(drowsyness,(effect * blocked))
 		if(JITTER)
-			jitteriness = max(jitteriness,(effect/(blocked+1)))
+			jitteriness = max(jitteriness,(effect * blocked))
 	updatehealth()
 	return 1
 
@@ -79,7 +81,7 @@
 	return ..()
 
 /mob/living/proc/apply_effects(var/stun = 0, var/weaken = 0, var/paralyze = 0, var/irradiate = 0, var/stutter = 0, var/eyeblur = 0, var/drowsy = 0, var/agony = 0, var/blocked = 0, var/stamina = 0, var/jitter = 0)
-	if(blocked >= 2)	return 0
+	if(blocked >= 100)	return 0
 	if(stun)		apply_effect(stun, STUN, blocked)
 	if(weaken)		apply_effect(weaken, WEAKEN, blocked)
 	if(paralyze)	apply_effect(paralyze, PARALYZE, blocked)

code/modules/mob/living/living_defense.dm

@@ -12,25 +12,18 @@
 */
 /mob/living/proc/run_armor_check(var/def_zone = null, var/attack_flag = "melee", var/absorb_text = null, var/soften_text = null)
 	var/armor = getarmor(def_zone, attack_flag)
-	var/absorb = 0
-	if(prob(armor))
-		absorb += 1
-	if(prob(armor))
-		absorb += 1
-	if(absorb >= 2)
-		if(absorb_text)
-			show_message("[absorb_text]")
-		else
-			show_message("\red Your armor absorbs the blow!")
-		return 2
-	if(absorb == 1)
-		if(absorb_text)
-			show_message("[soften_text]",4)
-		else
-			show_message("\red Your armor softens the blow!")
-		return 1
-	return 0
 
+	if(armor >= 100)
+		if(absorb_text)
+			src << "<span class='userdanger'>[absorb_text]</span>"
+		else
+			src << "<span class='userdanger'>Your armor absorbs the blow!</span>"
+	else if(armor > 0)
+		if(soften_text)
+			src << "<span class='userdanger'>[soften_text]</span>"
+		else
+			src << "<span class='userdanger'>Your armor softens the blow!</span>"
+	return armor
 
 //if null is passed for def_zone, then this should return something appropriate for all zones (e.g. area effect damage)
 /mob/living/proc/getarmor(var/def_zone, var/type)
@@ -73,21 +66,20 @@
 */
 
 	//Armor
-	var/absorb = run_armor_check(def_zone, P.flag)
+	var/armor = run_armor_check(def_zone, P.flag)
 	var/proj_sharp = is_sharp(P)
 	var/proj_edge = has_edge(P)
 	if ((proj_sharp || proj_edge) && prob(getarmor(def_zone, P.flag)))
 		proj_sharp = 0
 		proj_edge = 0
 
-	if(!P.nodamage)
-		apply_damage(P.damage, P.damage_type, def_zone, absorb, 0, P, sharp=proj_sharp, edge=proj_edge)
-
-	P.on_hit(src, absorb, def_zone)
-	if(istype(P, /obj/item/projectile/beam/lightning))
+	if(istype(P, /obj/item/projectile/beam/lightning)) //Stupid snowflake lightning gun.
 		if(P.damage >= 200)
 			src.dust()
-	return absorb
+
+	if(!P.nodamage)
+		apply_damage(P.damage, P.damage_type, def_zone, armor)
+	return P.on_hit(src, armor, def_zone)
 
 //Handles the effects of "stun" weapons
 /mob/living/proc/stun_effect_act(var/stun_amount, var/agony_amount, var/def_zone, var/used_weapon=null)
@@ -117,6 +109,7 @@
 /mob/living/hitby(atom/movable/AM as mob|obj,var/speed = 5)//Standardization and logging -Sieve
 	if(istype(AM,/obj/))
 		var/obj/O = AM
+		var/zone = ran_zone("chest", 65)//Hits a random part of the body, geared towards the chest
 		var/dtype = BRUTE
 		if(istype(O,/obj/item/weapon))
 			var/obj/item/weapon/W = O
@@ -138,10 +131,9 @@
 			return
 		*/
 		src.visible_message("\red [src] has been hit by [O].")
-		var/armor = run_armor_check(null, "melee")
+		var/armor = run_armor_check(zone, "melee")
 
-		if(armor < 2)
-			apply_damage(throw_damage, dtype, null, armor, is_sharp(O), has_edge(O), O)
+		apply_damage(throw_damage, dtype, zone, armor, is_sharp(O), has_edge(O), O)
 
 		O.throwing = 0		//it hit, so stop moving
 

code/modules/mob/mob_helpers.dm

@@ -172,71 +172,24 @@ proc/hasorgans(A)
 // If "chest" was passed in as zone, then on a "miss" will return "head", "l_arm", or "r_arm"
 // Do not use this if someone is intentionally trying to hit a specific body part.
 // Use get_zone_with_miss_chance() for that.
-/proc/ran_zone(zone, probability)
-	zone = check_zone(zone)
-	if(!probability)	probability = 90
-	if(probability == 100)	return zone
+/proc/ran_zone(zone, probability = 80)
 
-	if(zone == "chest")
-		if(prob(probability))	return "chest"
-		var/t = rand(1, 9)
-		switch(t)
-			if(1 to 3)	return "head"
-			if(4 to 6)	return "l_arm"
-			if(7 to 9)	return "r_arm"
-
-	if(prob(probability * 0.75))	return zone
-	return "chest"
-
-// Emulates targetting a specific body part, and miss chances
-// May return null if missed
-// miss_chance_mod may be negative.
-/proc/get_zone_with_miss_chance(zone, var/mob/target, var/miss_chance_mod = 0)
 	zone = check_zone(zone)
 
-	// you can only miss if your target is standing and not restrained
-	if(!target.buckled && !target.lying)
-		var/miss_chance = 10
-		switch(zone)
-			if("head")
-				miss_chance = 40
-			if("l_leg")
-				miss_chance = 20
-			if("r_leg")
-				miss_chance = 20
-			if("l_arm")
-				miss_chance = 20
-			if("r_arm")
-				miss_chance = 20
-			if("l_hand")
-				miss_chance = 50
-			if("r_hand")
-				miss_chance = 50
-			if("l_foot")
-				miss_chance = 50
-			if("r_foot")
-				miss_chance = 50
-		miss_chance = max(miss_chance + miss_chance_mod, 0)
-		if(prob(miss_chance))
-			if(prob(70))
-				return null
-			else
-				var/t = rand(1, 10)
-				switch(t)
-					if(1)	return "head"
-					if(2)	return "l_arm"
-					if(3)	return "r_arm"
-					if(4) 	return "chest"
-					if(5) 	return "l_foot"
-					if(6)	return "r_foot"
-					if(7)	return "l_hand"
-					if(8)	return "r_hand"
-					if(9)	return "l_leg"
-					if(10)	return "r_leg"
+	if(prob(probability))
+		return zone
+
+	var/t = rand(1, 18) // randomly pick a different zone, or maybe the same one
+	switch(t)
+		if(1)		 return "head"
+		if(2)		 return "chest"
+		if(3 to 6)	 return "l_arm"
+		if(7 to 10)	 return "r_arm"
+		if(11 to 14) return "l_leg"
+		if(15 to 18) return "r_leg"
 
 	return zone
 
-
 /proc/stars(n, pr)
 	if (pr == null)
 		pr = 25

code/modules/power/singularity/particle_accelerator/particle.dm

@@ -75,14 +75,14 @@
 
 
 /obj/effect/accelerated_particle/proc/toxmob(var/mob/living/M)
-	var/radiation = (energy*2)
-/*			if(istype(M,/mob/living/carbon/human))
+	/*var/radiation = (energy*2)
+			if(istype(M,/mob/living/carbon/human))
 		if(M:wear_suit) //TODO: check for radiation protection
 			radiation = round(radiation/2,1)
 	if(istype(M,/mob/living/carbon/monkey))
 		if(M:wear_suit) //TODO: check for radiation protection
 			radiation = round(radiation/2,1)*/
-	M.apply_effect((radiation*3),IRRADIATE,0)
+	M.apply_effect((energy*6),IRRADIATE,0)
 	M.updatehealth()
 	//M << "\red You feel odd."
 	return

code/modules/projectiles/projectile.dm

@@ -76,12 +76,10 @@
 		qdel(src)
 
 	proc/on_hit(var/atom/target, var/blocked = 0)
-		if(blocked >= 2)		return 0//Full block
 		if(!isliving(target))	return 0
 		if(isanimal(target))	return 0
 		var/mob/living/L = target
-		L.apply_effects(stun, weaken, paralyze, irradiate, stutter, eyeblur, drowsy, agony, blocked, stamina, jitter) // add in AGONY!
-		return 1
+		return L.apply_effects(stun, weaken, paralyze, irradiate, stutter, eyeblur, drowsy, agony, blocked, stamina, jitter)
 
 	proc/check_fire(var/mob/living/target as mob, var/mob/living/user as mob)  //Checks if you can hit them or not.
 		if(!istype(target) || !istype(user))
@@ -111,21 +109,8 @@
 
 			//Lower accurancy/longer range tradeoff. Distance matters a lot here, so at
 			// close distance, actually RAISE the chance to hit.
-			var/distance = get_dist(starting,loc)
-			var/miss_modifier = -30
-			if (istype(shot_from,/obj/item/weapon/gun))	//If you aim at someone beforehead, it'll hit more often.
-				var/obj/item/weapon/gun/daddy = shot_from //Kinda balanced by fact you need like 2 seconds to aim
-				if (daddy.target && original in daddy.target) //As opposed to no-delay pew pew
-					miss_modifier += -30
-			if(istype(src, /obj/item/projectile/beam/lightning)) //Lightning is quite accurate
-				miss_modifier += -200
-				def_zone = get_zone_with_miss_chance(def_zone, M, miss_modifier)
-				var/turf/simulated/floor/f = get_turf(A.loc)
-				if(f && istype(f))
-					f.break_tile()
-					f.hotspot_expose(1000,CELL_VOLUME)
-			else
-				def_zone = get_zone_with_miss_chance(def_zone, M, miss_modifier + 8*distance)
+			var/distance = get_dist(get_turf(A), starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations.
+			def_zone = ran_zone(def_zone, max(100-(7*distance), 5)) //Lower accurancy/longer range tradeoff. 7 is a balanced number to use.
 			/*
 			if(!def_zone)
 				visible_message("\blue \The [src] misses [M] narrowly!")

code/modules/recycling/disposal.dm

@@ -735,10 +735,10 @@
 	// this will be revealed if a T-scanner is used
 	// if visible, use regular icon_state
 	proc/updateicon()
-		if(invisibility)
+		/*if(invisibility)
 			icon_state = "[base_icon_state]f"
 		else
-			icon_state = base_icon_state
+			icon_state = base_icon_state*/
 		return
 
 

maps/RandomZLevels/centcomAway.dmm

@@ -547,159 +547,160 @@
 "kA" = (/obj/machinery/door/poddoor/shutters{id = "XCCsec1"; name = "XCC Checkpoint 1 Shutters"},/turf/simulated/floor{icon_state = "delivery"},/area/awaymission/centcomAway/general)
 "kB" = (/obj/machinery/door/poddoor/shutters{id = "XCCsec2"; name = "XCC Checkpoint 2 Shutters"},/turf/simulated/floor{icon_state = "delivery"},/area/awaymission/centcomAway/general)
 "kC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/awaymission/centcomAway/general)
-"kD" = (/obj/structure/sign/vacuum,/turf/simulated/wall/r_wall,/area/awaymission/centcomAway/general)
-"kE" = (/obj/structure/flora/ausbushes,/turf/simulated/floor{dir = 6; icon_state = "asteroid8"; name = "sand"; tag = "icon-asteroid8 (SOUTHEAST)"},/area/awaymission/centcomAway/general)
-"kF" = (/obj/structure/flora/ausbushes,/turf/simulated/floor{tag = "icon-asteroid5"; name = "plating"; icon_state = "asteroid5"},/area/awaymission/centcomAway/general)
-"kG" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/general)
-"kH" = (/obj/machinery/gateway{dir = 9},/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
-"kI" = (/obj/machinery/gateway{dir = 1},/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
-"kJ" = (/obj/machinery/gateway{dir = 5},/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
-"kK" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/awaymission/centcomAway/general)
-"kL" = (/obj/machinery/gateway{dir = 8},/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
-"kM" = (/obj/machinery/gateway/centeraway,/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
-"kN" = (/obj/machinery/gateway{dir = 4},/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
-"kO" = (/obj/machinery/door_control{id = "XCCFerry"; name = "Hangar Bay Shutters"; pixel_x = -28; pixel_y = 7; req_access_txt = "2"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/awaymission/centcomAway/hangar)
-"kP" = (/obj/machinery/gateway{dir = 10},/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
-"kQ" = (/obj/machinery/gateway,/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
-"kR" = (/obj/machinery/gateway{dir = 6},/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
-"kS" = (/turf/simulated/floor{tag = "icon-delivery (SOUTHEAST)"; icon_state = "delivery"; dir = 6},/area/awaymission/centcomAway/general)
-"kT" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/awaymission/centcomAway/general)
-"kU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/awaymission/centcomAway/general)
-"kV" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/awaymission/centcomAway/general)
-"kW" = (/obj/structure/table,/obj/item/device/flashlight/flare,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/hangar)
-"kX" = (/obj/structure/table,/obj/item/device/flashlight/flare,/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
-"kY" = (/obj/structure/table,/obj/item/device/multitool,/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
-"kZ" = (/obj/structure/table/reinforced,/obj/item/weapon/paper/pamphlet/ccaInfo,/turf/simulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/awaymission/centcomAway/general)
-"la" = (/obj/structure/table/reinforced,/obj/machinery/door_control{id = "XCCsec1"; name = "XCC Shutter 1 Control"},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/general)
-"lb" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/general)
-"lc" = (/obj/machinery/computer/secure_data,/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/awaymission/centcomAway/general)
-"ld" = (/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/general)
-"le" = (/obj/item/weapon/paper_bin,/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/general)
-"lf" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/awaymission/centcomAway/general)
-"lg" = (/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/awaymission/centcomAway/general)
-"lh" = (/turf/simulated/floor{icon_state = "neutral"; dir = 4},/area/awaymission/centcomAway/general)
-"li" = (/obj/machinery/computer/card,/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/awaymission/centcomAway/general)
-"lj" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/general)
-"lk" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/general)
-"ll" = (/obj/machinery/photocopier,/turf/simulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/awaymission/centcomAway/general)
-"lm" = (/obj/item/weapon/clipboard,/obj/structure/table,/obj/item/device/taperecorder,/obj/item/weapon/stamp,/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/awaymission/centcomAway/general)
-"ln" = (/obj/machinery/door/window/northright{icon_state = "right"; dir = 2},/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/general)
-"lo" = (/obj/structure/table/reinforced,/obj/machinery/door_control{id = "XCCsec2"; name = "XCC Shutter 2 Control"},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/general)
-"lp" = (/turf/simulated/floor{dir = 8; icon_state = "red"},/area/awaymission/centcomAway/general)
-"lq" = (/turf/simulated/floor{icon_state = "red"; dir = 10},/area/awaymission/centcomAway/general)
-"lr" = (/turf/simulated/floor{icon_state = "red"; dir = 2},/area/awaymission/centcomAway/general)
-"ls" = (/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/awaymission/centcomAway/general)
-"lt" = (/obj/structure/table,/obj/item/weapon/storage/box/handcuffs,/obj/item/weapon/stamp,/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/awaymission/centcomAway/general)
-"lu" = (/obj/machinery/door/airlock/external,/turf/simulated/floor{icon_state = "red"; dir = 10},/area/awaymission/centcomAway/general)
-"lv" = (/obj/machinery/door/airlock/external,/turf/simulated/floor{icon_state = "green"; dir = 6},/area/awaymission/centcomAway/general)
-"lw" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/awaymission/centcomAway/general)
-"lx" = (/obj/structure/table/woodentable,/obj/item/clothing/tie/medal,/turf/simulated/floor/carpet,/area/awaymission/centcomAway/general)
-"ly" = (/obj/structure/table/woodentable,/turf/simulated/floor/carpet,/area/awaymission/centcomAway/general)
-"lz" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/golden_cup,/turf/simulated/floor/carpet,/area/awaymission/centcomAway/general)
-"lA" = (/obj/structure/table/woodentable,/obj/item/clothing/tie/medal/gold,/turf/simulated/floor/carpet,/area/awaymission/centcomAway/general)
-"lB" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/plating,/area/awaymission/centcomAway/general)
-"lC" = (/turf/simulated/wall/r_wall,/area/awaymission/centcomAway/thunderdome)
-"lD" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 1},/turf/space,/area)
-"lE" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 1},/turf/space,/area)
-"lF" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_l"; dir = 1},/turf/space,/area)
-"lG" = (/obj/structure/table,/obj/item/device/paicard,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"lH" = (/obj/structure/table,/obj/item/device/camera,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"lI" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/plating,/area/awaymission/centcomAway/thunderdome)
-"lJ" = (/obj/machinery/vending/coffee,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"lK" = (/obj/structure/table,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"lL" = (/obj/machinery/vending/cigarette,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"lM" = (/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"lN" = (/obj/machinery/door/airlock/external,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"lO" = (/obj/machinery/door/airlock/centcom,/turf/simulated/floor{tag = "icon-barber (WEST)"; icon_state = "barber"; dir = 8; heat_capacity = 1},/area/awaymission/centcomAway/thunderdome)
-"lP" = (/obj/machinery/door/window/southleft,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"lQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/awaymission/centcomAway/thunderdome)
-"lR" = (/obj/machinery/door/window/southright,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"lS" = (/obj/structure/stool/bed/chair,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"lT" = (/turf/simulated/floor{tag = "icon-barber (WEST)"; icon_state = "barber"; dir = 8; heat_capacity = 1},/area/awaymission/centcomAway/thunderdome)
-"lU" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/snacks/popcorn,/turf/simulated/floor{tag = "icon-barber (WEST)"; icon_state = "barber"; dir = 8; heat_capacity = 1},/area/awaymission/centcomAway/thunderdome)
-"lV" = (/turf/simulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/awaymission/centcomAway/thunderdome)
-"lW" = (/obj/structure/reagent_dispensers/beerkeg,/turf/simulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/awaymission/centcomAway/thunderdome)
-"lX" = (/obj/structure/closet/crate/trashcart,/turf/simulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/awaymission/centcomAway/thunderdome)
-"lY" = (/obj/structure/reagent_dispensers/water_cooler,/turf/simulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/awaymission/centcomAway/thunderdome)
-"lZ" = (/obj/machinery/vending/snack,/turf/simulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/awaymission/centcomAway/thunderdome)
-"ma" = (/obj/structure/table,/obj/item/weapon/lipstick,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"mb" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/condiment/sugar,/obj/item/weapon/reagent_containers/food/drinks/milk,/obj/item/weapon/reagent_containers/food/drinks/ice,/turf/simulated/floor{tag = "icon-barber (WEST)"; icon_state = "barber"; dir = 8; heat_capacity = 1},/area/awaymission/centcomAway/thunderdome)
-"mc" = (/obj/machinery/icecream_vat,/turf/simulated/floor{tag = "icon-barber (WEST)"; icon_state = "barber"; dir = 8; heat_capacity = 1},/area/awaymission/centcomAway/thunderdome)
-"md" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"me" = (/obj/structure/stool/bed/chair,/turf/simulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/awaymission/centcomAway/thunderdome)
-"mf" = (/turf/simulated/floor{dir = 8; icon_state = "red"},/area/awaymission/centcomAway/thunderdome)
-"mg" = (/obj/structure/rack,/obj/item/weapon/legcuffs/beartrap,/obj/item/weapon/twohanded/fireaxe,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/thunderdome)
-"mh" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/awaymission/centcomAway/thunderdome)
-"mi" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/awaymission/centcomAway/thunderdome)
-"mj" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/awaymission/centcomAway/thunderdome)
-"mk" = (/turf/simulated/floor{icon_state = "green"; dir = 4},/area/awaymission/centcomAway/thunderdome)
-"ml" = (/obj/machinery/door/poddoor{id = "XCCtdomemelee"; name = "XCC Thunderdome Melee"},/turf/simulated/floor{icon_state = "delivery"},/area/awaymission/centcomAway/thunderdome)
-"mm" = (/obj/machinery/portable_atmospherics/scrubber/huge,/turf/simulated/floor{icon_state = "red"; dir = 9},/area/awaymission/centcomAway/thunderdome)
-"mn" = (/turf/simulated/floor{icon_state = "red"; dir = 1},/area/awaymission/centcomAway/thunderdome)
-"mo" = (/turf/simulated/floor{icon_state = "red"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"mp" = (/turf/simulated/floor{icon_state = "redcorner"; dir = 1},/area/awaymission/centcomAway/thunderdome)
-"mq" = (/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/thunderdome)
-"mr" = (/turf/simulated/floor{dir = 4; icon_state = "greencorner"},/area/awaymission/centcomAway/thunderdome)
-"ms" = (/turf/simulated/floor{dir = 1; icon_state = "green"},/area/awaymission/centcomAway/thunderdome)
-"mt" = (/turf/simulated/floor{dir = 9; icon_state = "green"},/area/awaymission/centcomAway/thunderdome)
-"mu" = (/obj/machinery/portable_atmospherics/scrubber/huge,/turf/simulated/floor{dir = 5; icon_state = "green"},/area/awaymission/centcomAway/thunderdome)
-"mv" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -28},/turf/simulated/floor{icon_state = "white"},/area/awaymission/centcomAway/thunderdome)
-"mw" = (/turf/simulated/floor{icon_state = "white"},/area/awaymission/centcomAway/thunderdome)
-"mx" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor{icon_state = "white"},/area/awaymission/centcomAway/thunderdome)
-"my" = (/obj/structure/rack,/obj/item/clothing/under/color/red,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/head/helmet/thunderdome,/obj/item/weapon/hatchet,/obj/item/weapon/shield/riot,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/thunderdome)
-"mz" = (/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/thunderdome)
-"mA" = (/obj/machinery/recharger{pixel_y = 4},/turf/simulated/floor/plating,/area/awaymission/centcomAway/thunderdome)
-"mB" = (/turf/simulated/floor/plating,/area/awaymission/centcomAway/thunderdome)
-"mC" = (/obj/machinery/door/poddoor{id = "XCCtdome"; name = "XCC Thunderdome"},/turf/simulated/floor{icon_state = "delivery"},/area/awaymission/centcomAway/thunderdome)
-"mD" = (/obj/machinery/igniter,/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/thunderdome)
-"mE" = (/obj/structure/rack,/obj/item/clothing/under/color/green,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/head/helmet/thunderdome,/obj/item/weapon/hatchet,/obj/item/weapon/shield/riot,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/thunderdome)
-"mF" = (/obj/machinery/door/airlock/centcom,/turf/simulated/floor{icon_state = "white"},/area/awaymission/centcomAway/thunderdome)
-"mG" = (/turf/simulated/floor{dir = 2; icon_state = "redcorner"},/area/awaymission/centcomAway/thunderdome)
-"mH" = (/turf/simulated/floor{icon_state = "red"},/area/awaymission/centcomAway/thunderdome)
-"mI" = (/turf/simulated/floor{dir = 8; icon_state = "greencorner"},/area/awaymission/centcomAway/thunderdome)
-"mJ" = (/obj/structure/mirror{pixel_x = 28},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/awaymission/centcomAway/thunderdome)
-"mK" = (/turf/simulated/floor{icon_state = "red"; dir = 4},/area/awaymission/centcomAway/thunderdome)
-"mL" = (/turf/simulated/floor{tag = "icon-plaque"; icon_state = "plaque"},/area/awaymission/centcomAway/thunderdome)
-"mM" = (/turf/simulated/floor{icon_state = "green"; dir = 8},/area/awaymission/centcomAway/thunderdome)
-"mN" = (/turf/simulated/floor{dir = 1; icon_state = "whitered"},/area/awaymission/centcomAway/thunderdome)
-"mO" = (/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/awaymission/centcomAway/thunderdome)
-"mP" = (/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/awaymission/centcomAway/thunderdome)
-"mQ" = (/turf/simulated/floor{dir = 2; icon_state = "greencorner"},/area/awaymission/centcomAway/thunderdome)
-"mR" = (/turf/simulated/floor{dir = 1; icon_state = "greencorner"},/area/awaymission/centcomAway/thunderdome)
-"mS" = (/turf/simulated/floor{dir = 1; icon_state = "whitegreen"},/area/awaymission/centcomAway/thunderdome)
-"mT" = (/obj/structure/urinal{pixel_y = 32},/turf/simulated/floor{icon_state = "white"},/area/awaymission/centcomAway/thunderdome)
-"mU" = (/obj/machinery/shower{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/awaymission/centcomAway/thunderdome)
-"mV" = (/turf/simulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/awaymission/centcomAway/thunderdome)
-"mW" = (/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/awaymission/centcomAway/thunderdome)
-"mX" = (/obj/machinery/shower{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/awaymission/centcomAway/thunderdome)
-"mY" = (/obj/machinery/door/airlock/centcom{name = "Thunderdome"; opacity = 1; req_access_txt = "101"},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/thunderdome)
-"mZ" = (/obj/machinery/door/poddoor{id = "XCCtdomeguns"; name = "XCC Thunderdome Guns"},/turf/simulated/floor{icon_state = "delivery"},/area/awaymission/centcomAway/thunderdome)
-"na" = (/obj/machinery/portable_atmospherics/scrubber/huge,/turf/simulated/floor{icon_state = "red"; dir = 10},/area/awaymission/centcomAway/thunderdome)
-"nb" = (/turf/simulated/floor{icon_state = "red"; dir = 6},/area/awaymission/centcomAway/thunderdome)
-"nc" = (/turf/simulated/floor{dir = 2; icon_state = "green"},/area/awaymission/centcomAway/thunderdome)
-"nd" = (/turf/simulated/floor{dir = 10; icon_state = "green"},/area/awaymission/centcomAway/thunderdome)
-"ne" = (/obj/machinery/portable_atmospherics/scrubber/huge,/turf/simulated/floor{icon_state = "green"; dir = 6},/area/awaymission/centcomAway/thunderdome)
-"nf" = (/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor{icon_state = "white"},/area/awaymission/centcomAway/thunderdome)
-"ng" = (/obj/structure/rack,/obj/item/weapon/gun/energy/laser/retro,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/thunderdome)
-"nh" = (/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"ni" = (/obj/structure/stool/bed/chair/office/dark{dir = 1},/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"nj" = (/obj/structure/table/woodentable,/obj/item/device/radio/off,/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"nk" = (/obj/structure/stool/bed/chair/comfy/black{dir = 1},/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"nl" = (/obj/machinery/door/airlock/centcom{name = "Thunderdome Administration"; opacity = 1; req_access_txt = "102"},/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"nm" = (/obj/structure/stool{pixel_y = 8},/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"nn" = (/obj/structure/table,/obj/machinery/recharger{pixel_y = 4},/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"no" = (/obj/structure/table,/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"np" = (/obj/structure/computerframe,/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"nq" = (/obj/machinery/computer/area_atmos,/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"nr" = (/obj/structure/closet/secure_closet/bar,/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"ns" = (/obj/structure/table,/obj/item/weapon/storage/box/handcuffs,/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"nt" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/snacks/popcorn,/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"nu" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/electrical,/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"nv" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
-"nw" = (/obj/machinery/door_control{id = "XCCtdomemelee"; name = "XCC Thunderdome Melee!"},/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/thunderdome)
-"nx" = (/obj/structure/stool/bed/chair/comfy/teal,/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/thunderdome)
-"ny" = (/obj/machinery/door_control{id = "XCCtdomeguns"; name = "XCC Thunderdome Guns!"},/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/thunderdome)
-"nz" = (/obj/machinery/door_control{id = "XCCtdome"; name = "XCC Thunderdome Go!"},/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/thunderdome)
+"kD" = (/obj/effect/landmark{name = "awaystart"},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/hangar)
+"kE" = (/obj/structure/sign/vacuum,/turf/simulated/wall/r_wall,/area/awaymission/centcomAway/general)
+"kF" = (/obj/structure/flora/ausbushes,/turf/simulated/floor{dir = 6; icon_state = "asteroid8"; name = "sand"; tag = "icon-asteroid8 (SOUTHEAST)"},/area/awaymission/centcomAway/general)
+"kG" = (/obj/structure/flora/ausbushes,/turf/simulated/floor{tag = "icon-asteroid5"; name = "plating"; icon_state = "asteroid5"},/area/awaymission/centcomAway/general)
+"kH" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/general)
+"kI" = (/obj/machinery/gateway{dir = 9},/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
+"kJ" = (/obj/machinery/gateway{dir = 1},/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
+"kK" = (/obj/machinery/gateway{dir = 5},/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
+"kL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/awaymission/centcomAway/general)
+"kM" = (/obj/machinery/gateway{dir = 8},/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
+"kN" = (/obj/machinery/gateway/centeraway,/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
+"kO" = (/obj/machinery/gateway{dir = 4},/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
+"kP" = (/obj/machinery/door_control{id = "XCCFerry"; name = "Hangar Bay Shutters"; pixel_x = -28; pixel_y = 7; req_access_txt = "2"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/awaymission/centcomAway/hangar)
+"kQ" = (/obj/machinery/gateway{dir = 10},/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
+"kR" = (/obj/machinery/gateway,/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
+"kS" = (/obj/machinery/gateway{dir = 6},/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
+"kT" = (/turf/simulated/floor{tag = "icon-delivery (SOUTHEAST)"; icon_state = "delivery"; dir = 6},/area/awaymission/centcomAway/general)
+"kU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/awaymission/centcomAway/general)
+"kV" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/awaymission/centcomAway/general)
+"kW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/awaymission/centcomAway/general)
+"kX" = (/obj/structure/table,/obj/item/device/flashlight/flare,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/hangar)
+"kY" = (/obj/structure/table,/obj/item/device/flashlight/flare,/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
+"kZ" = (/obj/structure/table,/obj/item/device/multitool,/turf/simulated/floor/plating,/area/awaymission/centcomAway/hangar)
+"la" = (/obj/structure/table/reinforced,/obj/item/weapon/paper/pamphlet/ccaInfo,/turf/simulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/awaymission/centcomAway/general)
+"lb" = (/obj/structure/table/reinforced,/obj/machinery/door_control{id = "XCCsec1"; name = "XCC Shutter 1 Control"},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/general)
+"lc" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/general)
+"ld" = (/obj/machinery/computer/secure_data,/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/awaymission/centcomAway/general)
+"le" = (/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/general)
+"lf" = (/obj/item/weapon/paper_bin,/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/general)
+"lg" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/awaymission/centcomAway/general)
+"lh" = (/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/awaymission/centcomAway/general)
+"li" = (/turf/simulated/floor{icon_state = "neutral"; dir = 4},/area/awaymission/centcomAway/general)
+"lj" = (/obj/machinery/computer/card,/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/awaymission/centcomAway/general)
+"lk" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/general)
+"ll" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/general)
+"lm" = (/obj/machinery/photocopier,/turf/simulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/awaymission/centcomAway/general)
+"ln" = (/obj/item/weapon/clipboard,/obj/structure/table,/obj/item/device/taperecorder,/obj/item/weapon/stamp,/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/awaymission/centcomAway/general)
+"lo" = (/obj/machinery/door/window/northright{icon_state = "right"; dir = 2},/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/general)
+"lp" = (/obj/structure/table/reinforced,/obj/machinery/door_control{id = "XCCsec2"; name = "XCC Shutter 2 Control"},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/general)
+"lq" = (/turf/simulated/floor{dir = 8; icon_state = "red"},/area/awaymission/centcomAway/general)
+"lr" = (/turf/simulated/floor{icon_state = "red"; dir = 10},/area/awaymission/centcomAway/general)
+"ls" = (/turf/simulated/floor{icon_state = "red"; dir = 2},/area/awaymission/centcomAway/general)
+"lt" = (/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/awaymission/centcomAway/general)
+"lu" = (/obj/structure/table,/obj/item/weapon/storage/box/handcuffs,/obj/item/weapon/stamp,/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/awaymission/centcomAway/general)
+"lv" = (/obj/machinery/door/airlock/external,/turf/simulated/floor{icon_state = "red"; dir = 10},/area/awaymission/centcomAway/general)
+"lw" = (/obj/machinery/door/airlock/external,/turf/simulated/floor{icon_state = "green"; dir = 6},/area/awaymission/centcomAway/general)
+"lx" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/awaymission/centcomAway/general)
+"ly" = (/obj/structure/table/woodentable,/obj/item/clothing/tie/medal,/turf/simulated/floor/carpet,/area/awaymission/centcomAway/general)
+"lz" = (/obj/structure/table/woodentable,/turf/simulated/floor/carpet,/area/awaymission/centcomAway/general)
+"lA" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/golden_cup,/turf/simulated/floor/carpet,/area/awaymission/centcomAway/general)
+"lB" = (/obj/structure/table/woodentable,/obj/item/clothing/tie/medal/gold,/turf/simulated/floor/carpet,/area/awaymission/centcomAway/general)
+"lC" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/plating,/area/awaymission/centcomAway/general)
+"lD" = (/turf/simulated/wall/r_wall,/area/awaymission/centcomAway/thunderdome)
+"lE" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 1},/turf/space,/area)
+"lF" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 1},/turf/space,/area)
+"lG" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_l"; dir = 1},/turf/space,/area)
+"lH" = (/obj/structure/table,/obj/item/device/paicard,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"lI" = (/obj/structure/table,/obj/item/device/camera,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"lJ" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/plating,/area/awaymission/centcomAway/thunderdome)
+"lK" = (/obj/machinery/vending/coffee,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"lL" = (/obj/structure/table,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"lM" = (/obj/machinery/vending/cigarette,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"lN" = (/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"lO" = (/obj/machinery/door/airlock/external,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"lP" = (/obj/machinery/door/airlock/centcom,/turf/simulated/floor{tag = "icon-barber (WEST)"; icon_state = "barber"; dir = 8; heat_capacity = 1},/area/awaymission/centcomAway/thunderdome)
+"lQ" = (/obj/machinery/door/window/southleft,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"lR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/awaymission/centcomAway/thunderdome)
+"lS" = (/obj/machinery/door/window/southright,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"lT" = (/obj/structure/stool/bed/chair,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"lU" = (/turf/simulated/floor{tag = "icon-barber (WEST)"; icon_state = "barber"; dir = 8; heat_capacity = 1},/area/awaymission/centcomAway/thunderdome)
+"lV" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/snacks/popcorn,/turf/simulated/floor{tag = "icon-barber (WEST)"; icon_state = "barber"; dir = 8; heat_capacity = 1},/area/awaymission/centcomAway/thunderdome)
+"lW" = (/turf/simulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/awaymission/centcomAway/thunderdome)
+"lX" = (/obj/structure/reagent_dispensers/beerkeg,/turf/simulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/awaymission/centcomAway/thunderdome)
+"lY" = (/obj/structure/closet/crate/trashcart,/turf/simulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/awaymission/centcomAway/thunderdome)
+"lZ" = (/obj/structure/reagent_dispensers/water_cooler,/turf/simulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/awaymission/centcomAway/thunderdome)
+"ma" = (/obj/machinery/vending/snack,/turf/simulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/awaymission/centcomAway/thunderdome)
+"mb" = (/obj/structure/table,/obj/item/weapon/lipstick,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"mc" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/condiment/sugar,/obj/item/weapon/reagent_containers/food/drinks/milk,/obj/item/weapon/reagent_containers/food/drinks/ice,/turf/simulated/floor{tag = "icon-barber (WEST)"; icon_state = "barber"; dir = 8; heat_capacity = 1},/area/awaymission/centcomAway/thunderdome)
+"md" = (/obj/machinery/icecream_vat,/turf/simulated/floor{tag = "icon-barber (WEST)"; icon_state = "barber"; dir = 8; heat_capacity = 1},/area/awaymission/centcomAway/thunderdome)
+"me" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"mf" = (/obj/structure/stool/bed/chair,/turf/simulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/awaymission/centcomAway/thunderdome)
+"mg" = (/turf/simulated/floor{dir = 8; icon_state = "red"},/area/awaymission/centcomAway/thunderdome)
+"mh" = (/obj/structure/rack,/obj/item/weapon/legcuffs/beartrap,/obj/item/weapon/twohanded/fireaxe,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/thunderdome)
+"mi" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/awaymission/centcomAway/thunderdome)
+"mj" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/awaymission/centcomAway/thunderdome)
+"mk" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/awaymission/centcomAway/thunderdome)
+"ml" = (/turf/simulated/floor{icon_state = "green"; dir = 4},/area/awaymission/centcomAway/thunderdome)
+"mm" = (/obj/machinery/door/poddoor{id = "XCCtdomemelee"; name = "XCC Thunderdome Melee"},/turf/simulated/floor{icon_state = "delivery"},/area/awaymission/centcomAway/thunderdome)
+"mn" = (/obj/machinery/portable_atmospherics/scrubber/huge,/turf/simulated/floor{icon_state = "red"; dir = 9},/area/awaymission/centcomAway/thunderdome)
+"mo" = (/turf/simulated/floor{icon_state = "red"; dir = 1},/area/awaymission/centcomAway/thunderdome)
+"mp" = (/turf/simulated/floor{icon_state = "red"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"mq" = (/turf/simulated/floor{icon_state = "redcorner"; dir = 1},/area/awaymission/centcomAway/thunderdome)
+"mr" = (/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/thunderdome)
+"ms" = (/turf/simulated/floor{dir = 4; icon_state = "greencorner"},/area/awaymission/centcomAway/thunderdome)
+"mt" = (/turf/simulated/floor{dir = 1; icon_state = "green"},/area/awaymission/centcomAway/thunderdome)
+"mu" = (/turf/simulated/floor{dir = 9; icon_state = "green"},/area/awaymission/centcomAway/thunderdome)
+"mv" = (/obj/machinery/portable_atmospherics/scrubber/huge,/turf/simulated/floor{dir = 5; icon_state = "green"},/area/awaymission/centcomAway/thunderdome)
+"mw" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -28},/turf/simulated/floor{icon_state = "white"},/area/awaymission/centcomAway/thunderdome)
+"mx" = (/turf/simulated/floor{icon_state = "white"},/area/awaymission/centcomAway/thunderdome)
+"my" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor{icon_state = "white"},/area/awaymission/centcomAway/thunderdome)
+"mz" = (/obj/structure/rack,/obj/item/clothing/under/color/red,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/head/helmet/thunderdome,/obj/item/weapon/hatchet,/obj/item/weapon/shield/riot,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/thunderdome)
+"mA" = (/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/thunderdome)
+"mB" = (/obj/machinery/recharger{pixel_y = 4},/turf/simulated/floor/plating,/area/awaymission/centcomAway/thunderdome)
+"mC" = (/turf/simulated/floor/plating,/area/awaymission/centcomAway/thunderdome)
+"mD" = (/obj/machinery/door/poddoor{id = "XCCtdome"; name = "XCC Thunderdome"},/turf/simulated/floor{icon_state = "delivery"},/area/awaymission/centcomAway/thunderdome)
+"mE" = (/obj/machinery/igniter,/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/thunderdome)
+"mF" = (/obj/structure/rack,/obj/item/clothing/under/color/green,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/head/helmet/thunderdome,/obj/item/weapon/hatchet,/obj/item/weapon/shield/riot,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/thunderdome)
+"mG" = (/obj/machinery/door/airlock/centcom,/turf/simulated/floor{icon_state = "white"},/area/awaymission/centcomAway/thunderdome)
+"mH" = (/turf/simulated/floor{dir = 2; icon_state = "redcorner"},/area/awaymission/centcomAway/thunderdome)
+"mI" = (/turf/simulated/floor{icon_state = "red"},/area/awaymission/centcomAway/thunderdome)
+"mJ" = (/turf/simulated/floor{dir = 8; icon_state = "greencorner"},/area/awaymission/centcomAway/thunderdome)
+"mK" = (/obj/structure/mirror{pixel_x = 28},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/awaymission/centcomAway/thunderdome)
+"mL" = (/turf/simulated/floor{icon_state = "red"; dir = 4},/area/awaymission/centcomAway/thunderdome)
+"mM" = (/turf/simulated/floor{tag = "icon-plaque"; icon_state = "plaque"},/area/awaymission/centcomAway/thunderdome)
+"mN" = (/turf/simulated/floor{icon_state = "green"; dir = 8},/area/awaymission/centcomAway/thunderdome)
+"mO" = (/turf/simulated/floor{dir = 1; icon_state = "whitered"},/area/awaymission/centcomAway/thunderdome)
+"mP" = (/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/awaymission/centcomAway/thunderdome)
+"mQ" = (/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/awaymission/centcomAway/thunderdome)
+"mR" = (/turf/simulated/floor{dir = 2; icon_state = "greencorner"},/area/awaymission/centcomAway/thunderdome)
+"mS" = (/turf/simulated/floor{dir = 1; icon_state = "greencorner"},/area/awaymission/centcomAway/thunderdome)
+"mT" = (/turf/simulated/floor{dir = 1; icon_state = "whitegreen"},/area/awaymission/centcomAway/thunderdome)
+"mU" = (/obj/structure/urinal{pixel_y = 32},/turf/simulated/floor{icon_state = "white"},/area/awaymission/centcomAway/thunderdome)
+"mV" = (/obj/machinery/shower{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/awaymission/centcomAway/thunderdome)
+"mW" = (/turf/simulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/awaymission/centcomAway/thunderdome)
+"mX" = (/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/awaymission/centcomAway/thunderdome)
+"mY" = (/obj/machinery/shower{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/awaymission/centcomAway/thunderdome)
+"mZ" = (/obj/machinery/door/airlock/centcom{name = "Thunderdome"; opacity = 1; req_access_txt = "101"},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/thunderdome)
+"na" = (/obj/machinery/door/poddoor{id = "XCCtdomeguns"; name = "XCC Thunderdome Guns"},/turf/simulated/floor{icon_state = "delivery"},/area/awaymission/centcomAway/thunderdome)
+"nb" = (/obj/machinery/portable_atmospherics/scrubber/huge,/turf/simulated/floor{icon_state = "red"; dir = 10},/area/awaymission/centcomAway/thunderdome)
+"nc" = (/turf/simulated/floor{icon_state = "red"; dir = 6},/area/awaymission/centcomAway/thunderdome)
+"nd" = (/turf/simulated/floor{dir = 2; icon_state = "green"},/area/awaymission/centcomAway/thunderdome)
+"ne" = (/turf/simulated/floor{dir = 10; icon_state = "green"},/area/awaymission/centcomAway/thunderdome)
+"nf" = (/obj/machinery/portable_atmospherics/scrubber/huge,/turf/simulated/floor{icon_state = "green"; dir = 6},/area/awaymission/centcomAway/thunderdome)
+"ng" = (/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor{icon_state = "white"},/area/awaymission/centcomAway/thunderdome)
+"nh" = (/obj/structure/rack,/obj/item/weapon/gun/energy/laser/retro,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/centcomAway/thunderdome)
+"ni" = (/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"nj" = (/obj/structure/stool/bed/chair/office/dark{dir = 1},/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"nk" = (/obj/structure/table/woodentable,/obj/item/device/radio/off,/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"nl" = (/obj/structure/stool/bed/chair/comfy/black{dir = 1},/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"nm" = (/obj/machinery/door/airlock/centcom{name = "Thunderdome Administration"; opacity = 1; req_access_txt = "102"},/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"nn" = (/obj/structure/stool{pixel_y = 8},/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"no" = (/obj/structure/table,/obj/machinery/recharger{pixel_y = 4},/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"np" = (/obj/structure/table,/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"nq" = (/obj/structure/computerframe,/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"nr" = (/obj/machinery/computer/area_atmos,/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"ns" = (/obj/structure/closet/secure_closet/bar,/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"nt" = (/obj/structure/table,/obj/item/weapon/storage/box/handcuffs,/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"nu" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/snacks/popcorn,/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"nv" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/electrical,/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"nw" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/awaymission/centcomAway/thunderdome)
+"nx" = (/obj/machinery/door_control{id = "XCCtdomemelee"; name = "XCC Thunderdome Melee!"},/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/thunderdome)
+"ny" = (/obj/structure/stool/bed/chair/comfy/teal,/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/thunderdome)
+"nz" = (/obj/machinery/door_control{id = "XCCtdomeguns"; name = "XCC Thunderdome Guns!"},/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/thunderdome)
+"nA" = (/obj/machinery/door_control{id = "XCCtdome"; name = "XCC Thunderdome Go!"},/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "floor"},/area/awaymission/centcomAway/thunderdome)
 
 (1,1,1) = {"
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -778,48 +779,48 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaWaWaWaWaWaWaWaWaWaW
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaWbegXcUcUgXcUcUcUgXgXgXgXgXgXgXgXcUcUgXaWeFeFeFeFeFeFeFkeeFkpkqkreFiYkskjeOeOeOkkkskneFfGfHfHjheFfGjhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaktbogXgXgXgXcUcUgXgXgXgXgXhsgXgXgXgXcUgXaWilililililileFeOeOkukueOeFeFeFkveOeOeOkweFeFeFeOkukueOkxfDkxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaktbogXgXgXcUgXgXgXgXgXgXgXgXgXgXgXgXgXgXkyeOeOeOeOeOeOiDeOeOkzkzeOiDkAiDeOeOeOeOeOiDkBiDeOeOeOeOkCfHjhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaktbogXgXgXgXgXgXgXhshsgXgXgXgXgXgXgXgXgXaWfGfHfHfHfHjheFeOeOkzkzeOeFkAeFkjeOeOeOkkeFkBeFeOeOeOeOkDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaktbogXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXgXaWiYkEiYklkFkleFeOeOkGkGeOfgkAfggAeOeOeOgufgkBfgeOeOeOeOeFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaktbogXgXgXcUcUgXgXgXgXgXgXgXgXgXgXgXgXgXaWfGfHfHfHfHjheFeOeOeOeOeOeFkAeFkjeOeOeOkkeFkBeFeOeOeOeOkDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaktbogXgXcUkHkIkJcUgXgXgXgXgXgXgXgXgXcUgXkyeOeOeOeOeOeOiDeOeOeOeOeOiDkAiDeOeOeOeOeOiDkBiDeOeOeOeOkKfHjhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaktbogXcUcUkLkMkNcUgXgXgXgXcUgXgXgXcUcUgXaWgogogogogogoeFeOeOeOeOeOeFkAeFkjeOeOeOkkeFkBeFeOeOeOeOkxfDkxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaWkOgXcUgXkPkQkRcUcUgXgXgXgXgXgXcUcUcUcUaWeFfGfHfHjheFeFkSkSkSkSkSeFkAkTjNgogogojOkUkBeFeOeOeOeOgxgykVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaWiAcUcUcUcUcUcUgXgXcUgXgXgXgXkWkXkYijaWaWbmaaaaaaaaaaeFkZjxjEjPjVeFeFeFgvfJeGfGgzeFeFeFeOeOeOeOkxfDkxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaWaWaWaWaWaWaWaWaWaWaWaWaWaWaWaWaWaWaWaabmbmaaaaaaaaeFjGhglalblceFldlelflgeGlhgKleldeFkSkSkSkSfGfHjhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmbmaaaaaaeFjGhghghglieFeOljldlgeGlhldlkeOeFjxjEjPjVeFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmbmaaaaeFllhghghglmeFfglnfglgeGlhfglnfgeFjGlolblceFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmbmaaeFjGhghghgjseFlpeOeOeOhkeOeOeOgueFjGhghglieFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmbmeFjyjthgjsjsiElqlrlrlsksivgogojOiEjGjGjslteFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmeFeFeFeFeFeFeFeFeFeFluiclveFeFeFeFeFeFeFeFeFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmlwlxhkeGeGeGhklylwbmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmhylzhyeGeGeGhylzhybmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmkslzhyeGeGeGhylAksbmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmeFeFhylBlwlBhyeFeFbmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalClClClClClDlElFlCaaaaaaaaksfDksfDksaaaaaaaalClDlElFlClClClClCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalClClGlHlHlClClClClClClClClClClIlClIlClClClClClClClClClClJlKlLlClCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalClClMlMlMlMlMlMlMlMlMlMlMlMlMlClMlMlMlClMlMlMlMlMlMlMlMlMlMlMlMlMlClCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalClMlMlMlMlMlMlMlMlMlMlMlMlMlMlNlMlMlMlNlMlMlMlMlMlMlMlMlMlMlMlMlMlMlCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalClMlMlClOlClClClClClClClClClClClPlQlRlClClClClClClClMlSlSlSlMlMlMlMlCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalClMlMlClTlTlTlTlTlUlVlVlVlVlWlVlVlVlVlVlWlXlWlYlZlClMlKlKlKlMlMlMlMlCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalClMlMlClTlTlTlTlTlUlVlVlVlVlVlVlVlVlVlVlVlVlVlVlVlClMmalKlKlMlMlMlMlCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalClMlMlCmbmbmcmclTlUlVlVlVlVlVlVlVlVlVlVlVlVlVlVlVlClMmdmdmdlMlMlMlMlCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalClClMlMlClClClClClClCmememememememememememememememelClClClClClClMlMlMlClCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalClCmflMlMlClCmgmgmgmglCmhmimimimimimimimimimimimimimjlCmgmgmgmglClMlMlMmklClCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalClClClClClCmflMlClClCmlmlmlmllCmmmnmomnmomnmpmqmrmsmtmsmtmsmulCmlmlmlmllClClClMmklClClClClClCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalCmvmwmwmxlCmflMlCmymzmAmBmBmBmCmfmqmqmqmqmDmqmqmqmDmqmqmqmqmkmCmBmBmBmAmzmElClMmklCmxmwmwmwlCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalCmwmwmwmwmFmflMlCmymzmAmBmBmBmCmfmqmGmqmqmqmpmHmrmqmqmqmImqmkmCmBmBmBmAmzmElClMmkmFmwmwmwmJlCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalCmwmxmxmxlCmflMlCmymzmBmBmBmBmCmfmqmKmqmDmqmKmLmMmqmDmqmMmqmkmCmBmBmBmBmzmElClMmklCmxmxmxmwlCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalCmNlClClClCmflMlCmymzmAmBmBmBmCmfmqmOmqmqmqmPmsmQmqmqmqmRmqmkmCmBmBmBmAmzmElClMmklClClClCmSlCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalCmwmTmwmUlCmflMlCmVmzmAmBmBmBmCmfmqmqmqmqmDmqmqmqmDmqmqmqmqmkmCmBmBmBmAmzmWlClMmklCmXmwmTmwlCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalCmwmwmwmUlCmflMlCmYlCmZmZmZmZlCnamHnbmHnbmHmPmqmQncndncndncnelCmZmZmZmZlCmYlClMmklCmXmwmwmwlCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalClCmwnfmUlCmflMlMlMlCngngngnglCmhmimimimimimimimimimimimimimjlCngngngnglClMlMlMmklCmXmwmwlClCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalClClClClCmflMlMlMlClClClClClCnhnhnininininhnjnhnininininhnhlClClClClClClMlMlMmklClClClClCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalClClClClMlMlMlMlMlMlMlCnhnhnhnhnhnhnhnknhnhnhnhnhnhnhlClMlMlMlMlMlMlMlClClClCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalClClMlMlMlMlMlMnlnhnhnhnmnhnhnhnhnhnhnhnhnhnhnhnllMlMlMlMlMlMlClCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalClClClClClClClCnnnonpnpnqnhnhnhnhnhnrnsntnunvlClClClClClClClCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalClClClClClClCnwnxnylClClClClClClCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalClCnzlClCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalClClCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaktbogXgXkDkDkDkDgXhshsgXgXgXgXgXgXgXgXgXaWfGfHfHfHfHjheFeOeOkzkzeOeFkAeFkjeOeOeOkkeFkBeFeOeOeOeOkEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaktbogXgXkDkDkDkDgXgXgXgXgXgXgXgXgXgXgXgXaWiYkFiYklkGkleFeOeOkHkHeOfgkAfggAeOeOeOgufgkBfgeOeOeOeOeFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaktbogXgXgXcUcUgXgXgXgXgXgXgXgXgXgXgXgXgXaWfGfHfHfHfHjheFeOeOeOeOeOeFkAeFkjeOeOeOkkeFkBeFeOeOeOeOkEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaktbogXgXcUkIkJkKcUgXgXgXgXgXgXgXgXgXcUgXkyeOeOeOeOeOeOiDeOeOeOeOeOiDkAiDeOeOeOeOeOiDkBiDeOeOeOeOkLfHjhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaktbogXcUcUkMkNkOcUgXgXgXgXcUgXgXgXcUcUgXaWgogogogogogoeFeOeOeOeOeOeFkAeFkjeOeOeOkkeFkBeFeOeOeOeOkxfDkxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaWkPgXcUgXkQkRkScUcUgXgXgXgXgXgXcUcUcUcUaWeFfGfHfHjheFeFkTkTkTkTkTeFkAkUjNgogogojOkVkBeFeOeOeOeOgxgykWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaWiAcUcUcUcUcUcUgXgXcUgXgXgXgXkXkYkZijaWaWbmaaaaaaaaaaeFlajxjEjPjVeFeFeFgvfJeGfGgzeFeFeFeOeOeOeOkxfDkxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaWaWaWaWaWaWaWaWaWaWaWaWaWaWaWaWaWaWaWaabmbmaaaaaaaaeFjGhglblcldeFlelflglheGligKlfleeFkTkTkTkTfGfHjhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmbmaaaaaaeFjGhghghgljeFeOlklelheGlilelleOeFjxjEjPjVeFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmbmaaaaeFlmhghghglneFfglofglheGlifglofgeFjGlplcldeFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmbmaaeFjGhghghgjseFlqeOeOeOhkeOeOeOgueFjGhghgljeFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmbmeFjyjthgjsjsiElrlslsltksivgogojOiEjGjGjslueFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmeFeFeFeFeFeFeFeFeFeFlviclweFeFeFeFeFeFeFeFeFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmlxlyhkeGeGeGhklzlxbmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmhylAhyeGeGeGhylAhybmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmkslAhyeGeGeGhylBksbmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmeFeFhylClxlChyeFeFbmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDlDlDlDlDlElFlGlDaaaaaaaaksfDksfDksaaaaaaaalDlElFlGlDlDlDlDlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDlDlHlIlIlDlDlDlDlDlDlDlDlDlDlJlDlJlDlDlDlDlDlDlDlDlDlDlKlLlMlDlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDlDlNlNlNlNlNlNlNlNlNlNlNlNlNlDlNlNlNlDlNlNlNlNlNlNlNlNlNlNlNlNlNlDlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDlNlNlNlNlNlNlNlNlNlNlNlNlNlNlOlNlNlNlOlNlNlNlNlNlNlNlNlNlNlNlNlNlNlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDlNlNlDlPlDlDlDlDlDlDlDlDlDlDlDlQlRlSlDlDlDlDlDlDlDlNlTlTlTlNlNlNlNlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDlNlNlDlUlUlUlUlUlVlWlWlWlWlXlWlWlWlWlWlXlYlXlZmalDlNlLlLlLlNlNlNlNlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDlNlNlDlUlUlUlUlUlVlWlWlWlWlWlWlWlWlWlWlWlWlWlWlWlDlNmblLlLlNlNlNlNlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDlNlNlDmcmcmdmdlUlVlWlWlWlWlWlWlWlWlWlWlWlWlWlWlWlDlNmememelNlNlNlNlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDlDlNlNlDlDlDlDlDlDlDmfmfmfmfmfmfmfmfmfmfmfmfmfmfmflDlDlDlDlDlDlNlNlNlDlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDlDmglNlNlDlDmhmhmhmhlDmimjmjmjmjmjmjmjmjmjmjmjmjmjmklDmhmhmhmhlDlNlNlNmllDlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDlDlDlDlDlDmglNlDlDlDmmmmmmmmlDmnmompmompmomqmrmsmtmumtmumtmvlDmmmmmmmmlDlDlDlNmllDlDlDlDlDlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDmwmxmxmylDmglNlDmzmAmBmCmCmCmDmgmrmrmrmrmEmrmrmrmEmrmrmrmrmlmDmCmCmCmBmAmFlDlNmllDmymxmxmxlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDmxmxmxmxmGmglNlDmzmAmBmCmCmCmDmgmrmHmrmrmrmqmImsmrmrmrmJmrmlmDmCmCmCmBmAmFlDlNmlmGmxmxmxmKlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDmxmymymylDmglNlDmzmAmCmCmCmCmDmgmrmLmrmEmrmLmMmNmrmEmrmNmrmlmDmCmCmCmCmAmFlDlNmllDmymymymxlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDmOlDlDlDlDmglNlDmzmAmBmCmCmCmDmgmrmPmrmrmrmQmtmRmrmrmrmSmrmlmDmCmCmCmBmAmFlDlNmllDlDlDlDmTlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDmxmUmxmVlDmglNlDmWmAmBmCmCmCmDmgmrmrmrmrmEmrmrmrmEmrmrmrmrmlmDmCmCmCmBmAmXlDlNmllDmYmxmUmxlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDmxmxmxmVlDmglNlDmZlDnanananalDnbmIncmIncmImQmrmRndnendnendnflDnanananalDmZlDlNmllDmYmxmxmxlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDlDmxngmVlDmglNlNlNlDnhnhnhnhlDmimjmjmjmjmjmjmjmjmjmjmjmjmjmklDnhnhnhnhlDlNlNlNmllDmYmxmxlDlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDlDlDlDlDmglNlNlNlDlDlDlDlDlDnininjnjnjnjninkninjnjnjnjninilDlDlDlDlDlDlNlNlNmllDlDlDlDlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDlDlDlDlNlNlNlNlNlNlNlDninininininininlnininininininilDlNlNlNlNlNlNlNlDlDlDlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDlDlNlNlNlNlNlNnmninininnninininininininininininmlNlNlNlNlNlNlDlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDlDlDlDlDlDlDlDnonpnqnqnrninininininsntnunvnwlDlDlDlDlDlDlDlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDlDlDlDlDlDlDnxnynzlDlDlDlDlDlDlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDlDnAlDlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalDlDlDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

maps/RandomZLevels/moonoutpost19.dmm

@@ -93,7 +93,7 @@
 "bO" = (/obj/structure/grille,/obj/structure/window/full/basic,/turf/simulated/floor/plating{heat_capacity = 1e+006},/area/awaycontent/a4{has_gravity = 1; name = "Syndicate Outpost"})
 "bP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/door/airlock/highsecurity{icon_state = "door_locked"; locked = 1; name = "Gateway"; req_access_txt = "150"},/turf/simulated/floor{heat_capacity = 1e+006},/area/awaycontent/a4{has_gravity = 1; name = "Syndicate Outpost"})
 "bQ" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/item/clothing/gloves/yellow,/obj/item/device/multitool,/turf/simulated/floor/plating{dir = 9; heat_capacity = 1e+006; icon_state = "warnplate"},/area/awaycontent/a4{has_gravity = 1; name = "Syndicate Outpost"})
-"bR" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/computer,/turf/simulated/floor/plating{dir = 5; heat_capacity = 1e+006; icon_state = "warnplate"; tag = "icon-warnplate (NORTHEAST)"},/area/awaycontent/a4{has_gravity = 1; name = "Syndicate Outpost"})
+"bR" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/computer3frame,/turf/simulated/floor/plating{dir = 5; heat_capacity = 1e+006; icon_state = "warnplate"; tag = "icon-warnplate (NORTHEAST)"},/area/awaycontent/a4{has_gravity = 1; name = "Syndicate Outpost"})
 "bS" = (/obj/machinery/power/smes{charge = 0; chargelevel = 10000; charging = 0; output = 15000; online = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating{heat_capacity = 1e+006},/area/awaycontent/a4{has_gravity = 1; name = "Syndicate Outpost"})
 "bT" = (/obj/machinery/portable_atmospherics/canister/air,/obj/machinery/alarm{frequency = 1439; locked = 1; pixel_y = 23; req_access = "150"},/turf/simulated/floor/plating{dir = 9; heat_capacity = 1e+006; icon_state = "warnplate"},/area/awaycontent/a4{has_gravity = 1; name = "Syndicate Outpost"})
 "bU" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating{dir = 5; heat_capacity = 1e+006; icon_state = "warnplate"; tag = "icon-warnplate (NORTHEAST)"},/area/awaycontent/a4{has_gravity = 1; name = "Syndicate Outpost"})
@@ -214,7 +214,7 @@
 "ef" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{heat_capacity = 1e+006},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "eg" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/machinery/portable_atmospherics/canister,/obj/structure/alien/weeds,/turf/simulated/floor{heat_capacity = 1e+006},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "eh" = (/obj/machinery/atmospherics/binary/pump{dir = 4},/turf/simulated/floor{dir = 4; heat_capacity = 1e+006; icon_state = "whitehall"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
-"ei" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 10},/obj/structure/alien/weeds{icon_state = "weeds1"},/turf/simulated/floor{icon_state = "white"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
+"ei" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/machinery/atmospherics/pipe/simple/visible{dir = 10},/obj/structure/alien/weeds{icon_state = "weeds1"},/turf/simulated/floor{icon_state = "white"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "ej" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/alien/weeds{icon_state = "weeds2"},/turf/simulated/floor{dir = 8; heat_capacity = 1e+006; icon_state = "warning"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "ek" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/shieldwallgen{locked = 0; req_access = null},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating{heat_capacity = 1e+006},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "el" = (/obj/structure/alien/weeds{icon_state = "weeds2"},/obj/structure/stool/bed/nest,/obj/effect/decal/cleanable/blood/gibs,/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
@@ -229,7 +229,7 @@
 "eu" = (/turf/simulated/floor{heat_capacity = 1e+006},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "ev" = (/obj/machinery/light/small{active_power_usage = 0; dir = 4; icon_state = "bulb-broken"; status = 2},/turf/simulated/floor{dir = 8; heat_capacity = 1e+006; icon_state = "floorgrime"; tag = "icon-floorgrime (WEST)"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "ew" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/machinery/portable_atmospherics/canister,/obj/structure/alien/weeds{icon_state = "weeds1"},/turf/simulated/floor{heat_capacity = 1e+006},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
-"ex" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/atmospherics/pipe/manifold{dir = 4; icon_state = "manifold"; level = 2},/turf/simulated/floor{icon_state = "white"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
+"ex" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/atmospherics/pipe/manifold/visible{color = "cyan"; dir = 4; initialize_directions = 11; level = 2},/turf/simulated/floor{icon_state = "white"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "ey" = (/obj/structure/table/reinforced,/obj/structure/alien/weeds,/obj/machinery/computer/security/telescreen{desc = "Used for watching the contents of the xenobiology containment pen."; dir = 8; name = "xenobiology monitor"; network = list("MO19X")},/turf/simulated/floor{dir = 8; heat_capacity = 1e+006; icon_state = "warning"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "ez" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/door/poddoor/preopen{desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating."; id = "Awaylab"; name = "Acid-Proof containment chamber blast door"; unacidable = 1},/obj/structure/cable,/obj/structure/grille,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating{heat_capacity = 1e+006},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "eA" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall/r_wall,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
@@ -245,7 +245,7 @@
 "eK" = (/turf/simulated/floor{dir = 2; heat_capacity = 1e+006; icon_state = "whitehall"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "eL" = (/obj/structure/alien/weeds{icon_state = "weeds2"},/turf/simulated/floor{dir = 2; heat_capacity = 1e+006; icon_state = "whitehall"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "eM" = (/obj/machinery/light/small{active_power_usage = 0; dir = 8; icon_state = "bulb-broken"; status = 2},/obj/machinery/camera{c_tag = "Xenobiology"; dir = 4; network = list("MO19","MO19R")},/turf/simulated/floor{dir = 6; heat_capacity = 1e+006; icon_state = "whitehall"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
-"eN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/structure/stool/bed/chair/office/light{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
+"eN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/visible,/obj/structure/stool/bed/chair/office/light{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "eO" = (/obj/structure/table/reinforced,/obj/machinery/door_control{id = "Awaylab"; name = "Containment Chamber Blast Doors"; pixel_x = 4; pixel_y = -2; req_access_txt = "201"},/obj/machinery/ignition_switch{id = "awayxenobio"; pixel_x = 4; pixel_y = 8},/obj/structure/alien/weeds{icon_state = "weeds2"},/turf/simulated/floor{dir = 8; heat_capacity = 1e+006; icon_state = "warning"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "eP" = (/obj/structure/alien/weeds{icon_state = "weeds1"},/obj/structure/alien/weeds{desc = "A large mottled egg."; health = 100; icon_state = "egg_hatched"; name = "egg"},/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "eQ" = (/obj/structure/alien/weeds{icon_state = "weeds1"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
@@ -269,7 +269,7 @@
 "fi" = (/obj/structure/closet/crate/freezer,/obj/structure/alien/weeds{icon_state = "weeds1"},/obj/item/clothing/mask/facehugger{icon_state = "facehugger_impregnated"; item_state = "facehugger_impregnated"; stat = 2},/obj/item/xenos_claw,/turf/simulated/floor{dir = 8; heat_capacity = 1e+006; icon_state = "floorgrime"; tag = "icon-floorgrime (WEST)"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "fj" = (/obj/machinery/door/firedoor,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{dir = 4; heat_capacity = 1e+006; icon_state = "warning"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "fk" = (/turf/simulated/floor{icon_state = "white"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
-"fl" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/floor{icon_state = "white"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
+"fl" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/floor{icon_state = "white"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "fm" = (/obj/structure/closet/l3closet/scientist,/obj/structure/window/reinforced,/obj/structure/alien/weeds{icon_state = "weeds1"},/turf/simulated/floor{dir = 8; heat_capacity = 1e+006; icon_state = "warning"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "fn" = (/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/door/poddoor/preopen{desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating."; id = "Awaylab"; name = "Acid-Proof containment chamber blast door"; unacidable = 1},/obj/structure/grille,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating{heat_capacity = 1e+006},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "fo" = (/obj/structure/alien/weeds{icon_state = "weeds2"},/obj/structure/alien/weeds{desc = "A large mottled egg."; health = 100; icon_state = "egg_hatched"; name = "egg"},/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
@@ -286,13 +286,13 @@
 "fz" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor{heat_capacity = 1e+006},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "fA" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/door/firedoor,/turf/simulated/floor{dir = 4; heat_capacity = 1e+006; icon_state = "warning"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "fB" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/alien/weeds/node,/turf/simulated/floor{icon_state = "white"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
-"fC" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 5},/turf/simulated/floor{icon_state = "white"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
-"fD" = (/obj/machinery/atmospherics/pipe/simple/general/visible{desc = "A one meter section of pipe. This one has been applied with an acid-proof coating."; dir = 4; name = "Acid-Proof Pipe"; unacidable = 1},/obj/item/stack/rods,/obj/item/stack/cable_coil{amount = 5},/obj/item/weapon/shard{icon_state = "small"},/turf/simulated/floor{dir = 8; heat_capacity = 1e+006; icon_state = "warning"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
-"fE" = (/obj/machinery/door/poddoor/preopen{desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating."; id = "Awaylab"; name = "Acid-Proof containment chamber blast door"; unacidable = 1},/obj/machinery/atmospherics/pipe/simple/general/visible{desc = "A one meter section of pipe. This one has been applied with an acid-proof coating."; dir = 4; name = "Acid-Proof Pipe"; unacidable = 1},/obj/item/stack/rods,/obj/item/stack/cable_coil{amount = 5},/obj/item/weapon/shard{icon_state = "medium"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
-"fF" = (/obj/machinery/atmospherics/pipe/simple/general/visible{desc = "A one meter section of pipe. This one has been applied with an acid-proof coating."; dir = 4; name = "Acid-Proof Pipe"; unacidable = 1},/obj/structure/alien/weeds{icon_state = "weeds1"},/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
-"fG" = (/obj/machinery/atmospherics/pipe/simple/general/visible{desc = "A one meter section of pipe. This one has been applied with an acid-proof coating."; dir = 4; name = "Acid-Proof Pipe"; unacidable = 1},/obj/structure/alien/weeds{icon_state = "weeds1"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
-"fH" = (/obj/machinery/atmospherics/pipe/simple/general/visible{desc = "A one meter section of pipe. This one has been applied with an acid-proof coating."; dir = 4; name = "Acid-Proof Pipe"; unacidable = 1},/obj/structure/alien/weeds{icon_state = "weeds1"},/obj/structure/alien/resin/wall,/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
-"fI" = (/obj/machinery/atmospherics/pipe/simple/general/visible{desc = "A one meter section of pipe. This one has been applied with an acid-proof coating."; dir = 4; name = "Acid-Proof Pipe"; unacidable = 1},/obj/structure/alien/weeds,/obj/structure/alien/resin/wall,/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
+"fC" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/machinery/atmospherics/pipe/simple/visible{dir = 5},/turf/simulated/floor{icon_state = "white"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
+"fD" = (/obj/machinery/atmospherics/pipe/simple/visible{desc = "A one meter section of pipe. This one has been applied with an acid-proof coating."; dir = 4; name = "Acid-Proof Pipe"; unacidable = 1},/obj/item/stack/rods,/obj/item/stack/cable_coil{amount = 5},/obj/item/weapon/shard{icon_state = "small"},/turf/simulated/floor{dir = 8; heat_capacity = 1e+006; icon_state = "warning"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
+"fE" = (/obj/machinery/door/poddoor/preopen{desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating."; id = "Awaylab"; name = "Acid-Proof containment chamber blast door"; unacidable = 1},/obj/machinery/atmospherics/pipe/simple/visible{desc = "A one meter section of pipe. This one has been applied with an acid-proof coating."; dir = 4; name = "Acid-Proof Pipe"; unacidable = 1},/obj/item/stack/rods,/obj/item/stack/cable_coil{amount = 5},/obj/item/weapon/shard{icon_state = "medium"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
+"fF" = (/obj/machinery/atmospherics/pipe/simple/visible{desc = "A one meter section of pipe. This one has been applied with an acid-proof coating."; dir = 4; name = "Acid-Proof Pipe"; unacidable = 1},/obj/structure/alien/weeds{icon_state = "weeds1"},/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
+"fG" = (/obj/machinery/atmospherics/pipe/simple/visible{desc = "A one meter section of pipe. This one has been applied with an acid-proof coating."; dir = 4; name = "Acid-Proof Pipe"; unacidable = 1},/obj/structure/alien/weeds{icon_state = "weeds1"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
+"fH" = (/obj/machinery/atmospherics/pipe/simple/visible{desc = "A one meter section of pipe. This one has been applied with an acid-proof coating."; dir = 4; name = "Acid-Proof Pipe"; unacidable = 1},/obj/structure/alien/weeds{icon_state = "weeds1"},/obj/structure/alien/resin/wall,/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
+"fI" = (/obj/machinery/atmospherics/pipe/simple/visible{desc = "A one meter section of pipe. This one has been applied with an acid-proof coating."; dir = 4; name = "Acid-Proof Pipe"; unacidable = 1},/obj/structure/alien/weeds,/obj/structure/alien/resin/wall,/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "fJ" = (/obj/machinery/atmospherics/unary/outlet_injector{desc = "Has a valve and pump attached to it. This one has been applied with an acid-proof coating."; dir = 8; icon_state = "on"; name = "Acid-Proof Air Injector"; on = 1; unacidable = 1},/obj/structure/alien/weeds,/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "fK" = (/obj/machinery/light{active_power_usage = 0; dir = 4; icon_state = "tube-broken"; status = 2},/obj/structure/alien/weeds{icon_state = "weeds2"},/obj/machinery/camera{c_tag = "Xenobiology Containment East"; dir = 8; network = list("MO19X")},/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
 "fL" = (/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor/plating{heat_capacity = 1e+006},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
@@ -478,7 +478,7 @@
 "jj" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{heat_capacity = 1e+006; icon_state = "bar"},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
 "jk" = (/turf/simulated/floor{heat_capacity = 1e+006; icon_state = "bar"},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
 "jl" = (/obj/structure/stool,/turf/simulated/floor/carpet{heat_capacity = 1e+006},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
-"jm" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/item/weapon/reagent_containers/food/condiment/peppermill{pixel_x = 3},/obj/item/weapon/reagent_containers/food/condiment/saltshaker{pixel_x = -3; pixel_y = 0},/obj/machinery/door/poddoor/shutters{id = "awaykitchen"; name = "Serving Hatch"},/turf/simulated/floor/carpet{heat_capacity = 1e+006},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
+"jm" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/item/weapon/reagent_containers/food/condiment/peppermill{pixel_x = 3},/obj/item/weapon/reagent_containers/food/condiment/saltshaker{pixel_x = -3; pixel_y = 0},/obj/machinery/door/poddoor/shutters{dir = 8; id = "awaykitchen"; name = "Serving Hatch"},/turf/simulated/floor/carpet{heat_capacity = 1e+006},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
 "jn" = (/obj/effect/decal/cleanable/flour,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
 "jo" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/table,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
 "jp" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/effect/decal/cleanable/oil,/turf/simulated/floor/plating{heat_capacity = 1e+006},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
@@ -506,7 +506,7 @@
 "jL" = (/obj/structure/noticeboard{pixel_y = 32},/obj/item/weapon/paper{info = "<b><h2>I Can't Believe It's Not Pasta: Half off on Wednesdays</h2></b><br><br><b><h2><font color=blue>Burger night every Friday 6PM-10PM, free drinks with purchase of meal!</font></h2></b><br><br><b><h2><font color=red>Premiering Tonight: The comedy stylings of Shoe Snatching Willy! 11AM-7PM</font></h2></b>"; name = "Specials This Week"},/turf/simulated/floor{burnt = 1; dir = 8; heat_capacity = 1e+006; icon_state = "floorscorched1"; tag = "icon-floorscorched1 (WEST)"},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
 "jM" = (/obj/structure/grille,/obj/structure/window/full/basic,/turf/simulated/floor/plating{heat_capacity = 1e+006},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
 "jN" = (/obj/item/weapon/cigbutt,/turf/simulated/floor{heat_capacity = 1e+006; icon_state = "bar"},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
-"jO" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/machinery/door/poddoor/shutters{id = "awaykitchen"; name = "Serving Hatch"},/turf/simulated/floor/carpet{heat_capacity = 1e+006},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
+"jO" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/machinery/door/poddoor/shutters{dir = 8; id = "awaykitchen"; name = "Serving Hatch"},/turf/simulated/floor/carpet{heat_capacity = 1e+006},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
 "jP" = (/obj/structure/table,/obj/item/weapon/book/manual/barman_recipes{pixel_y = 5},/obj/item/weapon/reagent_containers/food/drinks/shaker,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
 "jQ" = (/obj/structure/table,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
 "jR" = (/obj/machinery/vending/dinnerware,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
@@ -531,7 +531,7 @@
 "kk" = (/obj/machinery/light/small,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor{dir = 8; heat_capacity = 1e+006; icon_state = "floorgrime"; tag = "icon-floorgrime (WEST)"},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
 "kl" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{heat_capacity = 1e+006},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
 "km" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Diner"},/turf/simulated/floor{heat_capacity = 1e+006},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
-"kn" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/item/weapon/reagent_containers/glass/rag{pixel_y = 5},/obj/machinery/door/poddoor/shutters{id = "awaykitchen"; name = "Serving Hatch"},/turf/simulated/floor/carpet{heat_capacity = 1e+006},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
+"kn" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/item/weapon/reagent_containers/glass/rag{pixel_y = 5},/obj/machinery/door/poddoor/shutters{dir = 8; id = "awaykitchen"; name = "Serving Hatch"},/turf/simulated/floor/carpet{heat_capacity = 1e+006},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
 "ko" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
 "kp" = (/obj/structure/table,/obj/item/weapon/kitchen/rollingpin,/obj/item/weapon/kitchenknife,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
 "kq" = (/obj/structure/table,/obj/item/weapon/book/manual/chef_recipes{pixel_x = 2; pixel_y = 6},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})

maps/RandomZLevels/spacehotel.dmm

@@ -154,115 +154,114 @@
 "cX" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/red,/turf/simulated/floor/carpet,/area/awaymission)
 "cY" = (/obj/machinery/vending/coffee,/turf/simulated/floor,/area/awaymission)
 "cZ" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/condiment/enzyme{layer = 5},/turf/simulated/floor,/area/awaymission)
-"da" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor,/area/awaymission)
+"da" = (/obj/structure/table,/turf/simulated/floor,/area/awaymission)
 "db" = (/obj/machinery/atmospherics/pipe/simple{icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/structure/table,/turf/simulated/floor,/area/awaymission)
-"dc" = (/obj/structure/table,/turf/simulated/floor,/area/awaymission)
-"dd" = (/obj/effect/gibspawner/xeno,/turf/simulated/floor/carpet,/area/awaymission)
-"de" = (/obj/effect/decal/remains/human,/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/awaymission)
-"df" = (/obj/structure/stool/bed/alien,/obj/item/clothing/suit/xenos,/turf/simulated/floor/carpet,/area/awaymission)
-"dg" = (/obj/machinery/optable,/obj/effect/decal/cleanable/blood/old,/turf/simulated/floor/carpet,/area/awaymission)
-"dh" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/red,/obj/effect/decal/cleanable/blood/gibs/old,/turf/simulated/floor/carpet,/area/awaymission)
-"di" = (/obj/machinery/vending/boozeomat,/turf/simulated/floor,/area/awaymission)
-"dj" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = 5},/turf/simulated/floor,/area/awaymission)
-"dk" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/condiment/saltshaker{pixel_x = -3; pixel_y = 0},/obj/item/weapon/reagent_containers/food/condiment/peppermill{pixel_x = 3},/turf/simulated/floor,/area/awaymission)
-"dl" = (/obj/structure/table,/obj/item/weapon/kitchen/rollingpin,/turf/simulated/floor,/area/awaymission)
-"dm" = (/obj/machinery/atmospherics/pipe/simple{icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/structure/table,/obj/item/weapon/book/manual/chef_recipes,/turf/simulated/floor,/area/awaymission)
-"dn" = (/obj/structure/window,/obj/structure/alien/weeds/node,/turf/simulated/floor/carpet,/area/awaymission)
-"do" = (/obj/structure/window,/obj/structure/alien/weeds{icon_state = "weeds1"},/turf/simulated/floor/carpet,/area/awaymission)
-"dp" = (/obj/machinery/door/window/southright,/obj/structure/alien/weeds{icon_state = "weeds1"},/turf/simulated/floor/carpet,/area/awaymission)
-"dq" = (/obj/structure/table/woodentable,/obj/item/weapon/lipstick/black,/turf/simulated/floor/carpet,/area/awaymission)
-"dr" = (/obj/structure/window,/obj/effect/decal/cleanable/blood/old,/obj/effect/decal/cleanable/blood/gibs/old,/turf/simulated/floor/carpet,/area/awaymission)
-"ds" = (/obj/structure/window,/obj/effect/decal/cleanable/blood/old,/turf/simulated/floor/carpet,/area/awaymission)
-"dt" = (/obj/machinery/door/window/southright,/obj/effect/decal/cleanable/blood/old,/turf/simulated/floor/carpet,/area/awaymission)
-"du" = (/obj/machinery/vending/dinnerware,/turf/simulated/floor,/area/awaymission)
-"dv" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/alien/weeds,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission)
-"dw" = (/obj/structure/toilet{dir = 1},/obj/structure/alien/weeds{icon_state = "weeds2"},/obj/item/alien_embryo,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission)
-"dx" = (/obj/machinery/door/window/eastleft,/obj/structure/alien/weeds,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission)
-"dy" = (/obj/machinery/shower{dir = 8},/obj/structure/alien/egg,/obj/structure/alien/weeds{icon_state = "weeds1"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission)
-"dz" = (/obj/machinery/light,/turf/simulated/floor,/area/awaymission)
-"dA" = (/obj/machinery/processor,/turf/simulated/floor,/area/awaymission)
-"dB" = (/obj/machinery/chem_master/condimaster,/turf/simulated/floor,/area/awaymission)
-"dC" = (/obj/structure/table,/obj/machinery/reagentgrinder,/turf/simulated/floor,/area/awaymission)
-"dD" = (/obj/structure/table,/obj/machinery/microwave,/turf/simulated/floor,/area/awaymission)
-"dE" = (/obj/structure/closet/secure_closet/freezer/meat,/turf/simulated/floor,/area/awaymission)
-"dF" = (/obj/structure/closet/secure_closet/freezer/fridge,/turf/simulated/floor,/area/awaymission)
-"dG" = (/obj/structure/kitchenspike,/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/awaymission)
-"dH" = (/obj/machinery/door/airlock,/obj/effect/decal/cleanable/blood/old,/turf/simulated/floor,/area/awaymission)
-"dI" = (/obj/item/weapon/bananapeel,/obj/item/toy/spinningtoy,/turf/simulated/floor/carpet,/area/awaymission)
-"dJ" = (/obj/structure/barricade/wooden,/turf/simulated/floor/carpet,/area/awaymission)
-"dK" = (/obj/item/target/syndicate,/turf/simulated/floor/carpet,/area/awaymission)
-"dL" = (/obj/item/trash/candy,/turf/simulated/floor/carpet,/area/awaymission)
-"dM" = (/obj/item/toy/spinningtoy,/turf/simulated/floor/carpet,/area/awaymission)
-"dN" = (/obj/item/toy/crossbow,/turf/simulated/floor/carpet,/area/awaymission)
-"dO" = (/obj/structure/barricade/wooden,/obj/structure/barricade/wooden,/turf/simulated/floor/carpet,/area/awaymission)
-"dP" = (/obj/machinery/door/airlock,/turf/simulated/floor/carpet,/area/awaymission)
-"dQ" = (/obj/effect/decal/cleanable/blood/old,/turf/simulated/wall,/area/awaymission)
-"dR" = (/obj/effect/decal/remains/human,/obj/item/clothing/head/soft/red,/turf/simulated/floor/carpet,/area/awaymission)
-"dS" = (/obj/item/toy/prize/honk,/turf/simulated/floor/carpet,/area/awaymission)
-"dT" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/carpet,/area/awaymission)
-"dU" = (/obj/machinery/vending/sovietsoda,/turf/simulated/floor/carpet,/area/awaymission)
-"dV" = (/obj/structure/table,/obj/machinery/computer/security/telescreen{desc = "Not used to spy on hotel rooms."; dir = 4; network = "Hotel"; use_power = 1},/turf/simulated/floor/carpet,/area/awaymission)
-"dW" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/decal/cleanable/flour{desc = "Probably."},/obj/effect/decal/cleanable/pie_smudge,/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/awaymission)
-"dX" = (/obj/structure/table,/obj/machinery/computer/security/telescreen{desc = "Not used to spy on hotel rooms."; network = "Hotel"; use_power = 0},/turf/simulated/floor/carpet,/area/awaymission)
-"dY" = (/turf/simulated/wall/cult,/area/awaymission)
-"dZ" = (/obj/effect/decal/cleanable/blood/old,/turf/simulated/floor/engine/cult,/area/awaymission)
-"ea" = (/obj/effect/decal/remains/human,/turf/simulated/floor/carpet,/area/awaymission)
-"eb" = (/obj/item/trash/candle,/obj/item/trash/candle,/obj/item/trash/candle,/turf/simulated/floor/carpet,/area/awaymission)
-"ec" = (/obj/machinery/vending/snack,/turf/simulated/floor/carpet,/area/awaymission)
-"ed" = (/obj/structure/stool/bed/chair{dir = 1},/obj/effect/decal/cleanable/flour{desc = "Probably."},/obj/effect/decal/cleanable/pie_smudge,/turf/simulated/floor/carpet,/area/awaymission)
-"ee" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor/carpet,/area/awaymission)
-"ef" = (/turf/simulated/floor/engine/cult,/area/awaymission)
-"eg" = (/obj/effect/gibspawner/human,/obj/effect/decal/cleanable/blood/old,/turf/simulated/floor/engine/cult,/area/awaymission)
-"eh" = (/obj/item/toy/sword,/turf/simulated/floor/carpet,/area/awaymission)
-"ei" = (/obj/machinery/vending/cola,/turf/simulated/floor/carpet,/area/awaymission)
-"ej" = (/obj/item/candle,/obj/effect/decal/cleanable/blood/old,/turf/simulated/floor/engine/cult,/area/awaymission)
-"ek" = (/obj/effect/rune,/obj/item/brain,/turf/simulated/floor/engine/cult,/area/awaymission)
-"el" = (/obj/item/candle,/turf/simulated/floor/engine/cult,/area/awaymission)
-"em" = (/obj/item/weapon/tome,/turf/simulated/floor/engine/cult,/area/awaymission)
-"en" = (/obj/effect/rune,/turf/simulated/floor/engine/cult,/area/awaymission)
-"eo" = (/obj/structure/stool/bed/chair/comfy,/obj/item/device/soulstone,/obj/effect/decal/cleanable/blood/old,/obj/effect/decal/remains/human,/turf/simulated/floor/engine/cult,/area/awaymission)
-"ep" = (/obj/effect/gibspawner/human,/turf/simulated/floor/engine/cult,/area/awaymission)
-"eq" = (/obj/item/trash/sosjerky,/turf/simulated/floor/carpet,/area/awaymission)
-"er" = (/obj/structure/table/woodentable,/obj/item/weapon/paper/pamphlet,/turf/simulated/floor/carpet,/area/awaymission)
-"es" = (/obj/item/latexballon,/obj/item/latexballon,/turf/simulated/floor/carpet,/area/awaymission)
-"et" = (/obj/structure/rack,/obj/item/key,/obj/item/key,/obj/item/key,/obj/item/key,/obj/item/key,/turf/simulated/floor/carpet,/area/awaymission)
-"eu" = (/obj/structure/stool/bed/chair/comfy,/obj/effect/decal/cleanable/flour{desc = "Probably."},/obj/effect/decal/cleanable/pie_smudge,/turf/simulated/floor/carpet,/area/awaymission)
-"ev" = (/obj/structure/stool/bed/chair/comfy,/obj/effect/decal/cleanable/flour{desc = "Probably."},/obj/effect/decal/cleanable/flour{desc = "Probably."},/obj/effect/decal/cleanable/pie_smudge,/turf/simulated/floor/carpet,/area/awaymission)
-"ew" = (/obj/item/weapon/legcuffs,/turf/simulated/floor/engine/cult,/area/awaymission)
-"ex" = (/obj/machinery/space_heater,/turf/simulated/floor/carpet,/area/awaymission)
-"ey" = (/obj/structure/table/woodentable,/turf/simulated/floor/carpet,/area/awaymission)
-"ez" = (/obj/structure/table,/obj/machinery/computer/security/telescreen{desc = "Not used to spy on hotel rooms."; dir = 1; network = "Hotel"; use_power = 0},/turf/simulated/floor/carpet,/area/awaymission)
-"eA" = (/obj/item/weapon/melee/cultblade,/turf/simulated/floor/engine/cult,/area/awaymission)
-"eB" = (/obj/item/weapon/butch{blood_DNA = 1e+009},/obj/effect/decal/cleanable/blood/old,/turf/simulated/floor/engine/cult,/area/awaymission)
-"eC" = (/obj/structure/table/woodentable,/obj/item/weapon/pen,/turf/simulated/floor/carpet,/area/awaymission)
-"eD" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/decal/remains/human,/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/awaymission)
-"eE" = (/obj/structure/table/woodentable,/obj/item/weapon/clipboard,/obj/item/weapon/paper,/turf/simulated/floor/carpet,/area/awaymission)
-"eF" = (/obj/structure/filingcabinet/filingcabinet,/turf/simulated/floor/carpet,/area/awaymission)
-"eG" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin,/turf/simulated/floor/carpet,/area/awaymission)
-"eH" = (/turf/unsimulated/wall/fakeglass{dir = 10; icon_state = "fakewindows"},/area)
-"eI" = (/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows2"; dir = 8},/area)
-"eJ" = (/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows"; dir = 4},/area)
-"eK" = (/obj/machinery/door/airlock/external{name = "Arrival Airlock"},/turf/simulated/floor/plating,/area/awaymission)
-"eL" = (/turf/simulated/shuttle/wall{icon_state = "swall_s6"; dir = 2},/area/awaymission)
-"eM" = (/obj/effect/decal/cleanable/blood/old,/turf/simulated/shuttle/wall{icon_state = "swall12"; dir = 2},/area/awaymission)
-"eN" = (/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows"; dir = 8},/area)
-"eO" = (/turf/simulated/shuttle/wall{icon_state = "swall12"; dir = 2},/area/awaymission)
-"eP" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/shuttle/plating,/area/awaymission)
-"eQ" = (/turf/simulated/shuttle/wall{icon_state = "swall_s10"; dir = 2},/area/awaymission)
-"eR" = (/obj/effect/decal/cleanable/blood/old,/turf/simulated/shuttle/wall{icon_state = "swallc4"; dir = 2},/area/awaymission)
-"eS" = (/obj/effect/decal/remains/human,/turf/simulated/shuttle/floor,/area/awaymission)
-"eT" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/shuttle/floor,/area/awaymission)
-"eU" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor,/area/awaymission)
-"eV" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/turf/simulated/floor/plating/airless,/area/awaymission)
-"eW" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 8},/turf/space,/area/awaymission)
-"eX" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/blood/old,/turf/simulated/shuttle/floor,/area/awaymission)
-"eY" = (/obj/machinery/door/airlock/glass,/turf/simulated/shuttle/floor,/area/awaymission)
-"eZ" = (/obj/structure/window/reinforced{dir = 4},/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/blood/old,/turf/simulated/shuttle/floor,/area/awaymission)
-"fa" = (/turf/simulated/shuttle/wall{icon_state = "swall_s5"; dir = 2},/area/awaymission)
-"fb" = (/turf/simulated/shuttle/wall{icon_state = "swallc1"; dir = 2},/area/awaymission)
-"fc" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/decal/remains/human,/turf/simulated/shuttle/floor,/area/awaymission)
-"fd" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/decal/cleanable/blood/old,/turf/simulated/shuttle/floor,/area/awaymission)
-"fe" = (/turf/simulated/shuttle/wall{icon_state = "swall_s9"; dir = 2},/area/awaymission)
+"dc" = (/obj/effect/gibspawner/xeno,/turf/simulated/floor/carpet,/area/awaymission)
+"dd" = (/obj/effect/decal/remains/human,/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/awaymission)
+"de" = (/obj/structure/stool/bed/alien,/obj/item/clothing/suit/xenos,/turf/simulated/floor/carpet,/area/awaymission)
+"df" = (/obj/machinery/optable,/obj/effect/decal/cleanable/blood/old,/turf/simulated/floor/carpet,/area/awaymission)
+"dg" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/red,/obj/effect/decal/cleanable/blood/gibs/old,/turf/simulated/floor/carpet,/area/awaymission)
+"dh" = (/obj/machinery/vending/boozeomat,/turf/simulated/floor,/area/awaymission)
+"di" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = 5},/turf/simulated/floor,/area/awaymission)
+"dj" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/condiment/saltshaker{pixel_x = -3; pixel_y = 0},/obj/item/weapon/reagent_containers/food/condiment/peppermill{pixel_x = 3},/turf/simulated/floor,/area/awaymission)
+"dk" = (/obj/structure/table,/obj/item/weapon/kitchen/rollingpin,/turf/simulated/floor,/area/awaymission)
+"dl" = (/obj/machinery/atmospherics/pipe/simple{icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/structure/table,/obj/item/weapon/book/manual/chef_recipes,/turf/simulated/floor,/area/awaymission)
+"dm" = (/obj/structure/window,/obj/structure/alien/weeds/node,/turf/simulated/floor/carpet,/area/awaymission)
+"dn" = (/obj/structure/window,/obj/structure/alien/weeds{icon_state = "weeds1"},/turf/simulated/floor/carpet,/area/awaymission)
+"do" = (/obj/machinery/door/window/southright,/obj/structure/alien/weeds{icon_state = "weeds1"},/turf/simulated/floor/carpet,/area/awaymission)
+"dp" = (/obj/structure/table/woodentable,/obj/item/weapon/lipstick/black,/turf/simulated/floor/carpet,/area/awaymission)
+"dq" = (/obj/structure/window,/obj/effect/decal/cleanable/blood/old,/obj/effect/decal/cleanable/blood/gibs/old,/turf/simulated/floor/carpet,/area/awaymission)
+"dr" = (/obj/structure/window,/obj/effect/decal/cleanable/blood/old,/turf/simulated/floor/carpet,/area/awaymission)
+"ds" = (/obj/machinery/door/window/southright,/obj/effect/decal/cleanable/blood/old,/turf/simulated/floor/carpet,/area/awaymission)
+"dt" = (/obj/machinery/vending/dinnerware,/turf/simulated/floor,/area/awaymission)
+"du" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/alien/weeds,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission)
+"dv" = (/obj/structure/toilet{dir = 1},/obj/structure/alien/weeds{icon_state = "weeds2"},/obj/item/alien_embryo,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission)
+"dw" = (/obj/machinery/door/window/eastleft,/obj/structure/alien/weeds,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission)
+"dx" = (/obj/machinery/shower{dir = 8},/obj/structure/alien/egg,/obj/structure/alien/weeds{icon_state = "weeds1"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission)
+"dy" = (/obj/machinery/light,/turf/simulated/floor,/area/awaymission)
+"dz" = (/obj/machinery/processor,/turf/simulated/floor,/area/awaymission)
+"dA" = (/obj/machinery/chem_master/condimaster,/turf/simulated/floor,/area/awaymission)
+"dB" = (/obj/structure/table,/obj/machinery/reagentgrinder,/turf/simulated/floor,/area/awaymission)
+"dC" = (/obj/structure/table,/obj/machinery/microwave,/turf/simulated/floor,/area/awaymission)
+"dD" = (/obj/structure/closet/secure_closet/freezer/meat,/turf/simulated/floor,/area/awaymission)
+"dE" = (/obj/structure/closet/secure_closet/freezer/fridge,/turf/simulated/floor,/area/awaymission)
+"dF" = (/obj/structure/kitchenspike,/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/awaymission)
+"dG" = (/obj/machinery/door/airlock,/obj/effect/decal/cleanable/blood/old,/turf/simulated/floor,/area/awaymission)
+"dH" = (/obj/item/weapon/bananapeel,/obj/item/toy/spinningtoy,/turf/simulated/floor/carpet,/area/awaymission)
+"dI" = (/obj/structure/barricade/wooden,/turf/simulated/floor/carpet,/area/awaymission)
+"dJ" = (/obj/item/target/syndicate,/turf/simulated/floor/carpet,/area/awaymission)
+"dK" = (/obj/item/trash/candy,/turf/simulated/floor/carpet,/area/awaymission)
+"dL" = (/obj/item/toy/spinningtoy,/turf/simulated/floor/carpet,/area/awaymission)
+"dM" = (/obj/item/toy/crossbow,/turf/simulated/floor/carpet,/area/awaymission)
+"dN" = (/obj/structure/barricade/wooden,/obj/structure/barricade/wooden,/turf/simulated/floor/carpet,/area/awaymission)
+"dO" = (/obj/machinery/door/airlock,/turf/simulated/floor/carpet,/area/awaymission)
+"dP" = (/obj/effect/decal/cleanable/blood/old,/turf/simulated/wall,/area/awaymission)
+"dQ" = (/obj/effect/decal/remains/human,/obj/item/clothing/head/soft/red,/turf/simulated/floor/carpet,/area/awaymission)
+"dR" = (/obj/item/toy/prize/honk,/turf/simulated/floor/carpet,/area/awaymission)
+"dS" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/carpet,/area/awaymission)
+"dT" = (/obj/machinery/vending/sovietsoda,/turf/simulated/floor/carpet,/area/awaymission)
+"dU" = (/obj/structure/table,/obj/machinery/computer/security/telescreen{desc = "Not used to spy on hotel rooms."; dir = 4; network = "Hotel"; use_power = 1},/turf/simulated/floor/carpet,/area/awaymission)
+"dV" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/decal/cleanable/flour{desc = "Probably."},/obj/effect/decal/cleanable/pie_smudge,/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/awaymission)
+"dW" = (/obj/structure/table,/obj/machinery/computer/security/telescreen{desc = "Not used to spy on hotel rooms."; network = "Hotel"; use_power = 0},/turf/simulated/floor/carpet,/area/awaymission)
+"dX" = (/turf/simulated/wall/cult,/area/awaymission)
+"dY" = (/obj/effect/decal/cleanable/blood/old,/turf/simulated/floor/engine/cult,/area/awaymission)
+"dZ" = (/obj/effect/decal/remains/human,/turf/simulated/floor/carpet,/area/awaymission)
+"ea" = (/obj/item/trash/candle,/obj/item/trash/candle,/obj/item/trash/candle,/turf/simulated/floor/carpet,/area/awaymission)
+"eb" = (/obj/machinery/vending/snack,/turf/simulated/floor/carpet,/area/awaymission)
+"ec" = (/obj/structure/stool/bed/chair{dir = 1},/obj/effect/decal/cleanable/flour{desc = "Probably."},/obj/effect/decal/cleanable/pie_smudge,/turf/simulated/floor/carpet,/area/awaymission)
+"ed" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor/carpet,/area/awaymission)
+"ee" = (/turf/simulated/floor/engine/cult,/area/awaymission)
+"ef" = (/obj/effect/gibspawner/human,/obj/effect/decal/cleanable/blood/old,/turf/simulated/floor/engine/cult,/area/awaymission)
+"eg" = (/obj/item/toy/sword,/turf/simulated/floor/carpet,/area/awaymission)
+"eh" = (/obj/machinery/vending/cola,/turf/simulated/floor/carpet,/area/awaymission)
+"ei" = (/obj/item/candle,/obj/effect/decal/cleanable/blood/old,/turf/simulated/floor/engine/cult,/area/awaymission)
+"ej" = (/obj/effect/rune,/obj/item/brain,/turf/simulated/floor/engine/cult,/area/awaymission)
+"ek" = (/obj/item/candle,/turf/simulated/floor/engine/cult,/area/awaymission)
+"el" = (/obj/item/weapon/tome,/turf/simulated/floor/engine/cult,/area/awaymission)
+"em" = (/obj/effect/rune,/turf/simulated/floor/engine/cult,/area/awaymission)
+"en" = (/obj/structure/stool/bed/chair/comfy,/obj/item/device/soulstone,/obj/effect/decal/cleanable/blood/old,/obj/effect/decal/remains/human,/turf/simulated/floor/engine/cult,/area/awaymission)
+"eo" = (/obj/effect/gibspawner/human,/turf/simulated/floor/engine/cult,/area/awaymission)
+"ep" = (/obj/item/trash/sosjerky,/turf/simulated/floor/carpet,/area/awaymission)
+"eq" = (/obj/structure/table/woodentable,/obj/item/weapon/paper/pamphlet,/turf/simulated/floor/carpet,/area/awaymission)
+"er" = (/obj/item/latexballon,/obj/item/latexballon,/turf/simulated/floor/carpet,/area/awaymission)
+"es" = (/obj/structure/rack,/obj/item/key,/obj/item/key,/obj/item/key,/obj/item/key,/obj/item/key,/turf/simulated/floor/carpet,/area/awaymission)
+"et" = (/obj/structure/stool/bed/chair/comfy,/obj/effect/decal/cleanable/flour{desc = "Probably."},/obj/effect/decal/cleanable/pie_smudge,/turf/simulated/floor/carpet,/area/awaymission)
+"eu" = (/obj/structure/stool/bed/chair/comfy,/obj/effect/decal/cleanable/flour{desc = "Probably."},/obj/effect/decal/cleanable/flour{desc = "Probably."},/obj/effect/decal/cleanable/pie_smudge,/turf/simulated/floor/carpet,/area/awaymission)
+"ev" = (/obj/item/weapon/legcuffs,/turf/simulated/floor/engine/cult,/area/awaymission)
+"ew" = (/obj/machinery/space_heater,/turf/simulated/floor/carpet,/area/awaymission)
+"ex" = (/obj/structure/table/woodentable,/turf/simulated/floor/carpet,/area/awaymission)
+"ey" = (/obj/structure/table,/obj/machinery/computer/security/telescreen{desc = "Not used to spy on hotel rooms."; dir = 1; network = "Hotel"; use_power = 0},/turf/simulated/floor/carpet,/area/awaymission)
+"ez" = (/obj/item/weapon/melee/cultblade,/turf/simulated/floor/engine/cult,/area/awaymission)
+"eA" = (/obj/item/weapon/butch{blood_DNA = 1e+009},/obj/effect/decal/cleanable/blood/old,/turf/simulated/floor/engine/cult,/area/awaymission)
+"eB" = (/obj/structure/table/woodentable,/obj/item/weapon/pen,/turf/simulated/floor/carpet,/area/awaymission)
+"eC" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/decal/remains/human,/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/awaymission)
+"eD" = (/obj/structure/table/woodentable,/obj/item/weapon/clipboard,/obj/item/weapon/paper,/turf/simulated/floor/carpet,/area/awaymission)
+"eE" = (/obj/structure/filingcabinet/filingcabinet,/turf/simulated/floor/carpet,/area/awaymission)
+"eF" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin,/turf/simulated/floor/carpet,/area/awaymission)
+"eG" = (/turf/unsimulated/wall/fakeglass{dir = 10; icon_state = "fakewindows"},/area)
+"eH" = (/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows2"; dir = 8},/area)
+"eI" = (/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows"; dir = 4},/area)
+"eJ" = (/obj/machinery/door/airlock/external{name = "Arrival Airlock"},/turf/simulated/floor/plating,/area/awaymission)
+"eK" = (/turf/simulated/shuttle/wall{icon_state = "swall_s6"; dir = 2},/area/awaymission)
+"eL" = (/obj/effect/decal/cleanable/blood/old,/turf/simulated/shuttle/wall{icon_state = "swall12"; dir = 2},/area/awaymission)
+"eM" = (/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows"; dir = 8},/area)
+"eN" = (/turf/simulated/shuttle/wall{icon_state = "swall12"; dir = 2},/area/awaymission)
+"eO" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/shuttle/plating,/area/awaymission)
+"eP" = (/turf/simulated/shuttle/wall{icon_state = "swall_s10"; dir = 2},/area/awaymission)
+"eQ" = (/obj/effect/decal/cleanable/blood/old,/turf/simulated/shuttle/wall{icon_state = "swallc4"; dir = 2},/area/awaymission)
+"eR" = (/obj/effect/decal/remains/human,/turf/simulated/shuttle/floor,/area/awaymission)
+"eS" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/shuttle/floor,/area/awaymission)
+"eT" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor,/area/awaymission)
+"eU" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/turf/simulated/floor/plating/airless,/area/awaymission)
+"eV" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 8},/turf/space,/area/awaymission)
+"eW" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/blood/old,/turf/simulated/shuttle/floor,/area/awaymission)
+"eX" = (/obj/machinery/door/airlock/glass,/turf/simulated/shuttle/floor,/area/awaymission)
+"eY" = (/obj/structure/window/reinforced{dir = 4},/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/blood/old,/turf/simulated/shuttle/floor,/area/awaymission)
+"eZ" = (/turf/simulated/shuttle/wall{icon_state = "swall_s5"; dir = 2},/area/awaymission)
+"fa" = (/turf/simulated/shuttle/wall{icon_state = "swallc1"; dir = 2},/area/awaymission)
+"fb" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/decal/remains/human,/turf/simulated/shuttle/floor,/area/awaymission)
+"fc" = (/obj/structure/stool/bed/chair{dir = 8},/obj/effect/decal/cleanable/blood/old,/turf/simulated/shuttle/floor,/area/awaymission)
+"fd" = (/turf/simulated/shuttle/wall{icon_state = "swall_s9"; dir = 2},/area/awaymission)
 
 (1,1,1) = {"
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabacacacadacacacaeacacacacacacacabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -299,30 +298,30 @@ aaaaaaaaboaHbpaHaHaHbpaHaHaHbpaHaHaHbpaHaHaHbpaHaHaHaHbtaobuaobvaHaHaobvaHaHaHaH
 aaaaaaaabsaHaHaHaHaHbqaHaHaHaHaHbqaHaHaHaHaHaHaHaHaHaHaHbnaHbnaHaHaHaHaHcDcDcDcDcDcDcDcDcDcDcDcDcDcDcDcDcDbtaoabaaaaaaaa
 aaaaaaabaoaoaocEaoaoaoaoaocFaoaoaoaoaocGaoaoaoaHaHaHaHaHbpaHbpaHaHaHaHcBcBcBcBcBcBcBcBcBcBcBcBcBcBcBcBcBcBcBaoabaaaaaaaa
 aaaaaaabaoaHcHcIaHcJaoaHcKcLaHavaocMcNcOaHavaoaHaHaHaHaHaHaHaHaHaHaHaHcBcPcPcPcQcPcPcPcPcPcPcPcPcPcPcPcQcPcPaoabaaaaaaaa
-aaaaaaabaoaHcRaHcScTaobvaHaHaHcUaocVcWcWaHcXaoaHaHaHaHaHaHaHaHaHaHaHaHaocYcPcZdadbdbcPcPcPcPcPdcdcdcdcdccPcYaoabaaaaaaaa
-aaaaaaaabRaHdddecSdfaoaHaHaHaHcUaocWdgcWaHdhaoaHaHaHaHaHbpaHbpaHaHaHaHaodicPdadjdkdlcPcPcPcQcPdcdcdmdcdccPdiaoabaaaaaaaa
-aaaaaaabaodndodpdodqaobTbTbUbTbVaodrdsdtdsbVaoaHaHaHaHaHaHaHaHaHaHaHaHaoducPcQcPcPcPcPcPcPcPcPcPcPcPcPcPcPduaoabaaaaaaaa
-aaaaaaabbWdvdwdxdyaobWbXaYaZbYaobWbXaYaZbYaoaoaHaHaHaHaHbqaHbqaHaHaHaHaocPdzdAdBdCdDcQdzcPdzcPcPdEdFdGcPdzcQaoabaaaaaaaa
-aaaaaaabaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaHaHaHaHbtaobuaobvaHaHaHaoaoaoaoaoaoaoaoaodHaoaoaoaoaoaoaoaoaoaoabaaaaaaaa
-aaaaaaabaoaHaHaHaHaHaHaHaHaHdIaHaHaHaHaHdJdJdJaHaHaHaHaHbnaHbnaHaHaHaHaHaHaHaHbnaHaHaHaHaHaHaHaHaHaHcWaHaHcWbmaaaaaaaaaa
-aaaaaaabaodKaHdLaHaHaHaHaHaHaHdIaHaHaHaHdJdJdJaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHcWcWcWcWaHboaaaaaaaaaa
-aaaaaaabaoaHaHaHaHaHaHdIaHaHaHaHaHdMaHaHaHdJdJdJaHaHaHaHbpaHbpaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHcWcWaHcWaHaHbsaaaaaaaaaa
-aaaaaaabaodNaHdKaHaHaHaHaHaHaHdMaHaHaHaHaHaHdOaoaHaHaHaHaHaHaHaHaHaHaHaoaoaoaodPaoaoaoaoaoaodQdQdQaoaoaoaoaoaoabaaaaaaaa
-aaaaaaabaodRdSaHaHaHaHdMaHaHaHaHaHaHdMaHaHaHaHaodTaHaHaHaHaHaHaHaHaHdUaodVdWaHaHaHdXdXdXaodYdYdZdYdYdYdYdYdYaoabaaaaaaaa
-aaaaaaabaoaoeaebaHdIaHaHaHdIaHaHdIaHaHaHaHaHaHaodTaHaHaHbpaHbpaHaHaHecaodVcCaHaHaHedeeeeaodYefegefdYdYdYdYefaoabaaaaaaaa
-aaaaaaababaoehdKaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaodTaHaHaHaHaHaHaHaHaHeiaodVdWaHaHaHaHaHaHaodYefefejekelefefemaoabaaaaaaaa
-aaaaaaaaabaoaHaHaHaHaHdMaHaHaHaHaHdIaHaHaHdJdJaoaoaoaoaodPaodPaoaoaoaoaodVcCaHaHaHaHaHaHaoefefefeneoenefepefaoabaaaaaaaa
-aaaaaaaaabaoaHeqaHaHaHaHaHaHaHaHdIaHaHaHaHdJdJaoaHaHaHaHaHbnaHaHeresetaobvaHaHbreubreveuaodYefefelenelefewefaoabaaaaaaaa
-aaaaaaaaabaoexexaHaHaHaHaHaHaHaHaHaHaHaHaHdJdJdPaHaHaHaHbpaHbpaHeyaHaHdPaHaHaHezezezezezaodYeAepefefeBefdYdYaoabaaaaaaaa
-aaaaaaaaabaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaobvaHaHaHaHaHaHaHeCeDaHdQaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoabaaaaaaaa
-aaaaaaaaabababababababababababababababababababbmaHaHaHaHaHaHaHaHeEcCeFaoababababababababababababababababababababaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaboaHaHaHaHbpaHbpaHeyaHeFaoabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaboaHaHaHaHaHaHaHbqeyeGeyaoabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeHeIeIeJaoeKaoeKaoaoaoaoaoabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabeKaoeKababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeLeMeNeIeJeOePeOePeOeNeIeJeOeQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeLbReReSeTeTeTbDbDbDbDbDeTeTeTeUeVeWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabReXeYbDbDbDbDbDeTeTeTbDbDbDbDeZeVeWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafabRfbbDeTeXeTbDbDeSbDbDfcfdeTeUeVeWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaeOeNeIeJeOeMeMeMeOeNeIeJeOfeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaabaoaHcRaHcScTaobvaHaHaHcUaocVcWcWaHcXaoaHaHaHaHaHaHaHaHaHaHaHaHaocYcPcZdadbdbcPcPcPcPcPdadadadadacPcYaoabaaaaaaaa
+aaaaaaaabRaHdcddcSdeaoaHaHaHaHcUaocWdfcWaHdgaoaHaHaHaHaHbpaHbpaHaHaHaHaodhcPdadidjdkcPcPcPcQcPdadadldadacPdhaoabaaaaaaaa
+aaaaaaabaodmdndodndpaobTbTbUbTbVaodqdrdsdrbVaoaHaHaHaHaHaHaHaHaHaHaHaHaodtcPcQcPcPcPcPcPcPcPcPcPcPcPcPcPcPdtaoabaaaaaaaa
+aaaaaaabbWdudvdwdxaobWbXaYaZbYaobWbXaYaZbYaoaoaHaHaHaHaHbqaHbqaHaHaHaHaocPdydzdAdBdCcQdycPdycPcPdDdEdFcPdycQaoabaaaaaaaa
+aaaaaaabaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaHaHaHaHbtaobuaobvaHaHaHaoaoaoaoaoaoaoaoaodGaoaoaoaoaoaoaoaoaoaoabaaaaaaaa
+aaaaaaabaoaHaHaHaHaHaHaHaHaHdHaHaHaHaHaHdIdIdIaHaHaHaHaHbnaHbnaHaHaHaHaHaHaHaHbnaHaHaHaHaHaHaHaHaHaHcWaHaHcWbmaaaaaaaaaa
+aaaaaaabaodJaHdKaHaHaHaHaHaHaHdHaHaHaHaHdIdIdIaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHcWcWcWcWaHboaaaaaaaaaa
+aaaaaaabaoaHaHaHaHaHaHdHaHaHaHaHaHdLaHaHaHdIdIdIaHaHaHaHbpaHbpaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHcWcWaHcWaHaHbsaaaaaaaaaa
+aaaaaaabaodMaHdJaHaHaHaHaHaHaHdLaHaHaHaHaHaHdNaoaHaHaHaHaHaHaHaHaHaHaHaoaoaoaodOaoaoaoaoaoaodPdPdPaoaoaoaoaoaoabaaaaaaaa
+aaaaaaabaodQdRaHaHaHaHdLaHaHaHaHaHaHdLaHaHaHaHaodSaHaHaHaHaHaHaHaHaHdTaodUdVaHaHaHdWdWdWaodXdXdYdXdXdXdXdXdXaoabaaaaaaaa
+aaaaaaabaoaodZeaaHdHaHaHaHdHaHaHdHaHaHaHaHaHaHaodSaHaHaHbpaHbpaHaHaHebaodUcCaHaHaHecededaodXeeefeedXdXdXdXeeaoabaaaaaaaa
+aaaaaaababaoegdJaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaodSaHaHaHaHaHaHaHaHaHehaodUdVaHaHaHaHaHaHaodXeeeeeiejekeeeeelaoabaaaaaaaa
+aaaaaaaaabaoaHaHaHaHaHdLaHaHaHaHaHdHaHaHaHdIdIaoaoaoaoaodOaodOaoaoaoaoaodUcCaHaHaHaHaHaHaoeeeeeeemenemeeeoeeaoabaaaaaaaa
+aaaaaaaaabaoaHepaHaHaHaHaHaHaHaHdHaHaHaHaHdIdIaoaHaHaHaHaHbnaHaHeqeresaobvaHaHbretbreuetaodXeeeeekemekeeeveeaoabaaaaaaaa
+aaaaaaaaabaoewewaHaHaHaHaHaHaHaHaHaHaHaHaHdIdIdOaHaHaHaHbpaHbpaHexaHaHdOaHaHaHeyeyeyeyeyaodXezeoeeeeeAeedXdXaoabaaaaaaaa
+aaaaaaaaabaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaobvaHaHaHaHaHaHaHeBeCaHdPaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoabaaaaaaaa
+aaaaaaaaabababababababababababababababababababbmaHaHaHaHaHaHaHaHeDcCeEaoababababababababababababababababababababaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaboaHaHaHaHbpaHbpaHexaHeEaoabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaboaHaHaHaHaHaHaHbqexeFexaoabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeGeHeHeIaoeJaoeJaoaoaoaoaoabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabeJaoeJababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeKeLeMeHeIeNeOeNeOeNeMeHeIeNePaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeKbReQeReSeSeSbDbDbDbDbDeSeSeSeTeUeVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabReWeXbDbDbDbDbDeSeSeSbDbDbDbDeYeUeVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeZbRfabDeSeWeSbDbDeRbDbDfbfceSeTeUeVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeZeNeMeHeIeNeLeLeLeNeMeHeIeNfdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 "}

nano/templates/omni_filter.tmpl

@@ -1,82 +1,82 @@
 <div class="item">
 	<div class="itemContent" style="padding: 5px">
-		{{:helper.link(data.power ? 'On' : 'Off', null, {'command' : 'power'}, null, data.power ? 'selected' : 'redBackground')}}
+		{{:~link(power ? 'On' : 'Off', null, {'command' : 'power'}, null, power ? 'selected' : 'redBackground')}}
 	</div>
 	<div class="itemContent" style="padding: 5px">
-		{{:helper.link('Configure', null, {'command' : 'configure'}, null, data.config ? 'selected' : null)}}
+		{{:~link('Configure', null, {'command' : 'configure'}, null, config ? 'selected' : null)}}
 	</div>
 
-    {{if data.config}}
+	{{if config}}
 
-        <div style="width: 315px; text-align: center">
-            <div style="float: left">
-                <div class="white" style="height: 26">Port</div>
-                {{for data.ports}}
-                    <div class="average" style="height: 26">{{:value.dir}} Port</div>
-                {{/for}}
-            </div>
-            <div style="float: left; margin-left: 10">
-                <div class="white" style="height: 26">Input</div>
-                {{for data.ports}}
-                    <div style="height: 26">
-                        {{:helper.link(' ', null, {'command' : 'switch_mode', 'mode' : 'in', 'dir' : value.dir}, null, value.input ? 'selected' : null)}}
-                    </div>
-                {{/for}}
-            </div>
-            <div style="float: left; margin-left: 10">
-                <div class="white" style="height: 26">Output</div>
-                {{for data.ports}}
-                    <div style="height: 26">
-                        {{:helper.link(' ', null, {'command' : 'switch_mode', 'mode' : 'out', 'dir' : value.dir}, null, value.output ? 'selected' : null)}}
-                    </div>
-                {{/for}}
-            </div>
-            <div style="float: left; margin-left: 10">
-                <div class="white" style="height: 26">Filter</div>
-                {{for data.ports}}
-                    <div style="height: 26">
-                        {{:helper.link(value.f_type ? value.f_type : 'None', null, {'command' : 'switch_filter', 'mode' : value.f_type, 'dir' : value.dir}, value.filter ? null : 'disabled', value.f_type ? 'selected' : null)}}
-                    </div>
-                {{/for}}
-            </div>
-        </div>
+	<div style="width: 315px; text-align: center">
+		<div style="float: left">
+			<div class="white" style="height: 26">Port</div>
+			{{for ports}}
+				<div class="average" style="height: 26">{{:dir}} Port</div>
+			{{/for}}
+		</div>
+		<div style="float: left; margin-left: 10">
+			<div class="white" style="height: 26">Input</div>
+			{{for ports}}
+				<div style="height: 26">
+					{{:~link(' ', null, {'command' : 'switch_mode', 'mode' : 'in', 'dir' : dir}, null, input ? 'selected' : null)}}
+				</div>
+			{{/for}}
+		</div>
+		<div style="float: left; margin-left: 10">
+			<div class="white" style="height: 26">Output</div>
+			{{for ports}}
+				<div style="height: 26">
+					{{:~link(' ', null, {'command' : 'switch_mode', 'mode' : 'out', 'dir' : dir}, null, output ? 'selected' : null)}}
+				</div>
+			{{/for}}
+		</div>
+		<div style="float: left; margin-left: 10">
+			<div class="white" style="height: 26">Filter</div>
+			{{for ports}}
+				<div style="height: 26">
+					{{:~link(f_type ? f_type : 'None', null, {'command' : 'switch_filter', 'mode' : f_type, 'dir' : dir}, filter ? null : 'disabled', f_type ? 'selected' : null)}}
+				</div>
+			{{/for}}
+		</div>
+	</div>
 
-        <div class="itemContent" style="padding: 5px">
-            Target Output Pressure: {{:helper.round(data.pressure)}} kPa
-        </div>
-        <div class="itemContent" style="padding: 5px">
-            {{:helper.link('Set Target Pressure', null, {'command' : 'set_pressure'})}}
-        </div>
+	<div class="itemContent" style="padding: 5px">
+		Target Output Pressure: {{:~round(pressure)}} kPa
+	</div>
+	<div class="itemContent" style="padding: 5px">
+		{{:~link('Set Target Pressure', null, {'command' : 'set_pressure'})}}
+	</div>
 
-    {{else}}
+	{{else}}
 
-        <div style="width: 315px; text-align: center">
-            <div style="float: left">
-                <div class="white" style="height: 26">Port</div>
-                {{for data.ports}}
-                    <div class="average" style="height: 26">{{:value.dir}} Port</div>
-                {{/for}}
-            </div>
-            <div style="float: left; margin-left: 10">
-                <div class="white" style="height: 26">Mode</div>
-                {{for data.ports}}
-                    <div style="height: 26">
-                            {{if value.input}}
-                                Input
-                            {{else value.output}}
-                                Output
-                            {{else value.f_type}}
-                                {{:value.f_type}}
-                            {{else}}
-                                Disabled
-                            {{/if}}
-                    </div>
-                {{/for}}
-            </div>
-        </div>
+	<div style="width: 315px; text-align: center">
+		<div style="float: left">
+			<div class="white" style="height: 26">Port</div>
+			{{for ports}}
+				<div class="average" style="height: 26">{{:dir}} Port</div>
+			{{/for}}
+		</div>
+		<div style="float: left; margin-left: 10">
+			<div class="white" style="height: 26">Mode</div>
+			{{for ports}}
+				<div style="height: 26">
+						{{if input}}
+							Input
+						{{else output}}
+							Output
+						{{else f_type}}
+							{{:f_type}}
+						{{else}}
+							Disabled
+						{{/if}}
+				</div>
+			{{/for}}
+		</div>
+	</div>
 
-        <div class="itemContent" style="padding: 5px">
-            Target Output Pressure: {{:helper.round(data.pressure)}} kPa
-        </div>
-    {{/if}}
+	<div class="itemContent" style="padding: 5px">
+		Target Output Pressure: {{:~round(pressure)}} kPa
+	</div>
+	{{/if}}
 </div>

paradise.dme

@@ -22,6 +22,7 @@
 #define FILE_DIR "icons"
 #define FILE_DIR "icons/48x48"
 #define FILE_DIR "icons/ass"
+#define FILE_DIR "icons/atmos"
 #define FILE_DIR "icons/effects"
 #define FILE_DIR "icons/mecha"
 #define FILE_DIR "icons/misc"
@@ -135,6 +136,7 @@
 #include "code\_onclick\hud\other_mobs.dm"
 #include "code\_onclick\hud\robot.dm"
 #include "code\_onclick\hud\screen_objects.dm"
+#include "code\ATMOSPHERICS\_atmos_setup.dm"
 #include "code\ATMOSPHERICS\atmospherics.dm"
 #include "code\ATMOSPHERICS\chiller.dm"
 #include "code\ATMOSPHERICS\datum_pipe_network.dm"
@@ -150,6 +152,10 @@
 #include "code\ATMOSPHERICS\components\binary_devices\passive_gate.dm"
 #include "code\ATMOSPHERICS\components\binary_devices\pump.dm"
 #include "code\ATMOSPHERICS\components\binary_devices\volume_pump.dm"
+#include "code\ATMOSPHERICS\components\omni_devices\_omni_extras.dm"
+#include "code\ATMOSPHERICS\components\omni_devices\filter.dm"
+#include "code\ATMOSPHERICS\components\omni_devices\mixer.dm"
+#include "code\ATMOSPHERICS\components\omni_devices\omni_base.dm"
 #include "code\ATMOSPHERICS\components\trinary_devices\filter.dm"
 #include "code\ATMOSPHERICS\components\trinary_devices\mixer.dm"
 #include "code\ATMOSPHERICS\components\trinary_devices\trinary_base.dm"