Merge remote-tracking branch 'loganbacca/atmosmerge' into power-net

code/ATMOSPHERICS/_atmos_setup.dm

@@ -22,6 +22,8 @@ var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_
 			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

code/ATMOSPHERICS/atmospherics.dm

@@ -9,7 +9,6 @@ Pipes -> Pipelines
 Pipelines + Other Objects -> Pipe network
 
 */
-
 /obj/machinery/atmospherics
 	anchored = 1
 	idle_power_usage = 0

code/ATMOSPHERICS/components/binary_devices/pump.dm

@@ -14,7 +14,7 @@ Thus, the two variables affect pump operation are set in New():
 
 /obj/machinery/atmospherics/binary/pump
 	icon = 'icons/atmos/pump.dmi'
-	icon_state = "map"
+	icon_state = "map_off"
 	level = 1
 
 	name = "gas pump"
@@ -38,6 +38,7 @@ Thus, the two variables affect pump operation are set in New():
 	var/datum/radio_frequency/radio_connection
 
 /obj/machinery/atmospherics/binary/pump/on
+	icon_state = "map_on"
 	on = 1
 
 

code/ATMOSPHERICS/components/binary_devices/volume_pump.dm

@@ -1,6 +1,6 @@
 /obj/machinery/atmospherics/binary/pump/high_power
 	icon = 'icons/atmos/volume_pump.dmi'
-	icon_state = "map"
+	icon_state = "map_off"
 	level = 1
 
 	name = "high power gas pump"
@@ -10,9 +10,10 @@
 
 /obj/machinery/atmospherics/binary/pump/high_power/on
 	on = 1
+	icon_state = "map_on"
 
 /obj/machinery/atmospherics/binary/pump/high_power/update_icon()
 	if(!powered())
 		icon_state = "off"
 	else
-		icon_state = "[on ? "on" : "off"]"
+		icon_state = "[on ? "on" : "off"]"

code/ATMOSPHERICS/components/unary/vent_scrubber.dm

@@ -52,9 +52,6 @@
 	if(!istype(T))
 		return
 
-	if(T.intact && node && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
-		scrubber_icon += "h"
-		
 	if(!powered())
 		scrubber_icon += "off"
 	else