Further atmos fixes

code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm

@@ -10,6 +10,8 @@
 
 	level = 1
 
+	connect_types = list(1,2,3) //connects to regular, supply and scrubbers pipes	
+	
 	var/on = 0
 	var/pump_direction = 1 //0 = siphoning, 1 = releasing
 
@@ -69,8 +71,14 @@
 		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)
+			if (node1)
+				add_underlay(T, node1, turn(dir, -180), node1.icon_connect_type)
+			else
+				add_underlay(T, node1, turn(dir, -180))
+			if (node2)
+				add_underlay(T, node2, dir, node2.icon_connect_type)
+			else
+				add_underlay(T, node2, dir)
 
 /obj/machinery/atmospherics/binary/dp_vent_pump/hide(var/i)
 	update_icon()

code/ATMOSPHERICS/components/omni_devices/omni_base.dm

@@ -182,9 +182,11 @@
 		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))
+			//pipe_state = icon_manager.get_atmos_icon("underlay_down", P.dir, color_cache_name(P.node))
+			pipe_state = icon_manager.get_atmos_icon("underlay", P.dir, color_cache_name(P.node), "down")
 		else
-			pipe_state = icon_manager.get_atmos_icon("underlay_intact", P.dir, color_cache_name(P.node))
+			//pipe_state = icon_manager.get_atmos_icon("underlay_intact", P.dir, color_cache_name(P.node))
+			pipe_state = icon_manager.get_atmos_icon("underlay", P.dir, color_cache_name(P.node), "intact")
 
 		return list("on_icon" = ic_on, "off_icon" = ic_off, "pipe_icon" = pipe_state)
 

code/ATMOSPHERICS/components/unary/vent_scrubber.dm

@@ -15,6 +15,8 @@
 
 	var/on = 0
 	var/scrubbing = 1 //0 = siphoning, 1 = scrubbing
+	var/scrub_O2 = 0
+	var/scrub_N2 = 0
 	var/scrub_CO2 = 1
 	var/scrub_Toxins = 0
 	var/scrub_N2O = 0
@@ -96,6 +98,8 @@
 		"power" = on,
 		"scrubbing" = scrubbing,
 		"panic" = panic,
+		"filter_o2" = scrub_O2,
+		"filter_n2" = scrub_N2,
 		"filter_co2" = scrub_CO2,
 		"filter_toxins" = scrub_Toxins,
 		"filter_n2o" = scrub_N2O,
@@ -142,6 +146,12 @@
 			//Filter it
 			var/datum/gas_mixture/filtered_out = new
 			filtered_out.temperature = removed.temperature
+			if(scrub_O2)
+				filtered_out.oxygen = removed.oxygen
+				removed.oxygen = 0
+			if(scrub_N2)
+				filtered_out.nitrogen = removed.nitrogen
+				removed.nitrogen = 0				
 			if(scrub_Toxins)
 				filtered_out.toxins = removed.toxins
 				removed.toxins = 0
@@ -219,6 +229,16 @@
 		scrubbing = text2num(signal.data["scrubbing"])
 	if(signal.data["toggle_scrubbing"])
 		scrubbing = !scrubbing
+	
+	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["n2_scrub"] != null)
+		scrub_N2 = text2num(signal.data["n2_scrub"])
+	if(signal.data["toggle_n2_scrub"])
+		scrub_N2 = !scrub_N2
 
 	if(signal.data["co2_scrub"] != null)
 		scrub_CO2 = text2num(signal.data["co2_scrub"])