Merge branch 'master' into diagonal-movement

code/ATMOSPHERICS/atmospherics.dm

@@ -11,7 +11,8 @@ Pipelines + Other Objects -> Pipe network
 GLOBAL_DATUM_INIT(pipe_icon_manager, /datum/pipe_icon_manager, new())
 /obj/machinery/atmospherics
 	anchored = 1
-	layer = 2.4 //under wires with their 2.44
+	layer = GAS_PIPE_HIDDEN_LAYER  //under wires
+	plane = FLOOR_PLANE	
 	idle_power_usage = 0
 	active_power_usage = 0
 	power_channel = ENVIRON
@@ -61,10 +62,14 @@ GLOBAL_DATUM_INIT(pipe_icon_manager, /datum/pipe_icon_manager, new())
 
 // Icons/overlays/underlays
 /obj/machinery/atmospherics/update_icon()
-	return null
+	var/turf/T = loc
+	if(level == 2 || !T.intact)
+		plane = GAME_PLANE
+	else
+		plane = FLOOR_PLANE	
 
 /obj/machinery/atmospherics/proc/update_pipe_image()
-	pipe_image = image(src, loc, layer = 20, dir = dir) //the 20 puts it above Byond's darkness (not its opacity view)
+	pipe_image = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) //the 20 puts it above Byond's darkness (not its opacity view)
 	pipe_image.plane = HUD_PLANE
 
 /obj/machinery/atmospherics/proc/check_icon_cache(var/safety = 0)
@@ -328,3 +333,4 @@ GLOBAL_DATUM_INIT(pipe_icon_manager, /datum/pipe_icon_manager, new())
 
 /obj/machinery/atmospherics/update_remote_sight(mob/user)
 	user.sight |= (SEE_TURFS|BLIND)
+	. = ..()

code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm

@@ -3,6 +3,8 @@
 	initialize_directions = SOUTH|NORTH
 	use_power = IDLE_POWER_USE
 
+	layer = GAS_PUMP_LAYER
+
 	var/datum/gas_mixture/air1
 	var/datum/gas_mixture/air2
 

code/ATMOSPHERICS/components/binary_devices/circulator.dm

@@ -15,8 +15,6 @@
 
 	var/obj/machinery/power/generator/generator
 
-	layer = 2.45 // Just above wires
-
 	anchored = 1
 	density = 1
 
@@ -112,6 +110,8 @@
 		..()
 
 /obj/machinery/atmospherics/binary/circulator/update_icon()
+	..()
+	
 	if(stat & (BROKEN|NOPOWER))
 		icon_state = "circ[side]-p"
 	else if(last_pressure_delta > 0)

code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm

@@ -71,6 +71,8 @@
 		add_underlay(T, node2, dir)
 
 /obj/machinery/atmospherics/binary/dp_vent_pump/update_icon(var/safety = 0)
+	..()
+	
 	if(!check_icon_cache())
 		return
 

code/ATMOSPHERICS/components/binary_devices/passive_gate.dm

@@ -28,6 +28,7 @@
 	return ..()
 
 /obj/machinery/atmospherics/binary/passive_gate/update_icon()
+	..()
 	icon_state = "[on ? "on" : "off"]"
 
 /obj/machinery/atmospherics/binary/passive_gate/update_underlays()

code/ATMOSPHERICS/components/binary_devices/pump.dm

@@ -79,6 +79,8 @@ Thus, the two variables affect pump operation are set in New():
 	on = 1
 
 /obj/machinery/atmospherics/binary/pump/update_icon()
+	..()
+	
 	if(!powered())
 		icon_state = "off"
 	else

code/ATMOSPHERICS/components/binary_devices/valve.dm

@@ -16,6 +16,8 @@
 	icon_state = "map_valve1"
 
 /obj/machinery/atmospherics/binary/valve/update_icon(animation)
+	..()
+	
 	if(animation)
 		flick("valve[src.open][!src.open]",src)
 	else

code/ATMOSPHERICS/components/binary_devices/volume_pump.dm

@@ -83,6 +83,8 @@ Thus, the two variables affect pump operation are set in New():
 	set_frequency(frequency)
 
 /obj/machinery/atmospherics/binary/volume_pump/update_icon()
+	..()
+	
 	if(!powered())
 		icon_state = "off"
 	else

code/ATMOSPHERICS/components/omni_devices/omni_base.dm

@@ -72,6 +72,8 @@
 	update_ports()
 
 /obj/machinery/atmospherics/omni/update_icon()
+	..()
+
 	if(stat & NOPOWER)
 		overlays = overlays_off
 		on = 0
@@ -83,8 +85,6 @@
 
 	underlays = underlays_current
 
-	return
-
 /obj/machinery/atmospherics/omni/proc/error_check()
 	return
 

code/ATMOSPHERICS/components/trinary_devices/filter.dm

@@ -79,6 +79,8 @@ Filter types:
 		radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA)
 
 /obj/machinery/atmospherics/trinary/filter/update_icon()
+	..()
+	
 	if(flipped)
 		icon_state = "m"
 	else

code/ATMOSPHERICS/components/trinary_devices/mixer.dm

@@ -57,6 +57,8 @@
 		update_icon()
 
 /obj/machinery/atmospherics/trinary/mixer/update_icon(safety = 0)
+	..()
+	
 	if(flipped)
 		icon_state = "m"
 	else

code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm

@@ -4,6 +4,7 @@
 	use_power = IDLE_POWER_USE
 
 	var/on = 0
+	layer = GAS_FILTER_LAYER
 
 	var/datum/gas_mixture/air1
 	var/datum/gas_mixture/air2

code/ATMOSPHERICS/components/trinary_devices/tvalve.dm

@@ -135,6 +135,7 @@
 
 /obj/machinery/atmospherics/trinary/tvalve/digital/update_icon()
 	..()
+	
 	if(!powered())
 		icon_state = "tvalvenopower"
 

code/ATMOSPHERICS/components/unary_devices/cold_sink.dm

@@ -13,6 +13,8 @@
 	var/current_heat_capacity = 50000 //totally random
 
 /obj/machinery/atmospherics/unary/cold_sink/update_icon()
+	..()
+
 	if(node)
 		icon_state = "intact_[on?("on"):("off")]"
 	else
@@ -20,8 +22,6 @@
 
 		on = 0
 
-	return
-
 /obj/machinery/atmospherics/unary/cold_sink/process_atmos()
 	..()
 	if(!on)

code/ATMOSPHERICS/components/unary_devices/generator_input.dm

@@ -9,12 +9,12 @@
 	var/update_cycle
 
 /obj/machinery/atmospherics/unary/generator_input/update_icon()
+	..()
+
 	if(node)
 		icon_state = "intact"
 	else
 		icon_state = "exposed"
 
-	return
-
 /obj/machinery/atmospherics/unary/generator_input/proc/return_exchange_air()
 	return air_contents

code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm

@@ -13,13 +13,13 @@
 	burn_state = LAVA_PROOF
 
 /obj/machinery/atmospherics/unary/heat_exchanger/update_icon()
+	..()
+
 	if(node)
 		icon_state = "intact"
 	else
 		icon_state = "exposed"
 
-	return
-
 /obj/machinery/atmospherics/unary/heat_exchanger/atmos_init()
 	if(!partner)
 		var/partner_connect = turn(dir,180)

code/ATMOSPHERICS/components/unary_devices/heat_source.dm

@@ -13,6 +13,8 @@
 	var/current_heat_capacity = 50000 //totally random
 
 /obj/machinery/atmospherics/unary/heat_reservoir/update_icon()
+	..()
+	
 	if(node)
 		icon_state = "intact_[on?("on"):("off")]"
 	else
@@ -20,8 +22,6 @@
 
 		on = 0
 
-	return
-
 /obj/machinery/atmospherics/unary/heat_reservoir/process_atmos()
 	..()
 	if(!on)

code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm

@@ -2,7 +2,7 @@
 	icon = 'icons/atmos/injector.dmi'
 	icon_state = "map_injector"
 	use_power = IDLE_POWER_USE
-	layer = 3
+	layer = GAS_SCRUBBER_LAYER
 
 	can_unwrench = 1
 
@@ -38,6 +38,8 @@
 	return ..()
 
 /obj/machinery/atmospherics/unary/outlet_injector/update_icon()
+	..()
+	
 	if(!powered())
 		icon_state = "off"
 	else

code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm

@@ -14,6 +14,8 @@
 	var/oxygen_content = 10
 
 /obj/machinery/atmospherics/unary/oxygen_generator/update_icon()
+	..()
+
 	if(node)
 		icon_state = "intact_[on?("on"):("off")]"
 	else
@@ -21,8 +23,6 @@
 
 		on = 0
 
-	return
-
 /obj/machinery/atmospherics/unary/oxygen_generator/New()
 	..()
 

code/ATMOSPHERICS/components/unary_devices/portables_connector.dm

@@ -6,7 +6,7 @@
 	desc = "For connecting portables devices related to atmospherics control."
 
 	can_unwrench = 1
-	layer = 2.4
+	layer = GAS_FILTER_LAYER
 
 	var/obj/machinery/portable_atmospherics/connected_device
 
@@ -18,6 +18,7 @@
 	return ..()
 
 /obj/machinery/atmospherics/unary/portables_connector/update_icon()
+	..()
 	icon_state = "connector"
 
 /obj/machinery/atmospherics/unary/portables_connector/update_underlays()

code/ATMOSPHERICS/components/unary_devices/thermal_plate.dm

@@ -11,10 +11,12 @@
 	desc = "Transfers heat to and from an area"
 
 /obj/machinery/atmospherics/unary/thermal_plate/update_icon()
-	var/prefix=""
+	..()
+
+	var/prefix = ""
 	//var/suffix="_idle" // Also available: _heat, _cool
 	if(level == 1 && istype(loc, /turf/simulated))
-		prefix="h"
+		prefix = "h"
 	icon_state = "[prefix]off"
 
 /obj/machinery/atmospherics/unary/thermal_plate/process_atmos()

code/ATMOSPHERICS/components/unary_devices/vent_pump.dm

@@ -10,6 +10,8 @@
 	desc = "Has a valve and pump attached to it"
 	use_power = IDLE_POWER_USE
 
+	layer = GAS_SCRUBBER_LAYER
+
 	can_unwrench = 1
 	var/open = 0
 
@@ -77,6 +79,10 @@
 	air_contents.volume = 1000
 
 /obj/machinery/atmospherics/unary/vent_pump/update_icon(var/safety = 0)
+	..()
+	
+	plane = FLOOR_PLANE
+
 	if(!check_icon_cache())
 		return
 

code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm

@@ -6,6 +6,7 @@
 
 	name = "air scrubber"
 	desc = "Has a valve and pump attached to it"
+	layer = GAS_SCRUBBER_LAYER
 
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 10
@@ -91,6 +92,10 @@
 	return 1
 
 /obj/machinery/atmospherics/unary/vent_scrubber/update_icon(var/safety = 0)
+	..()
+	
+	plane = FLOOR_PLANE
+
 	if(!check_icon_cache())
 		return
 

code/ATMOSPHERICS/pipes/cap.dm

@@ -4,7 +4,6 @@
 	icon = 'icons/atmos/pipes.dmi'
 	icon_state = "cap"
 	level = 2
-	layer = 2.4 //under wires with their 2.44
 
 	volume = 35
 
@@ -55,6 +54,8 @@
 		node.update_underlays()
 
 /obj/machinery/atmospherics/pipe/cap/update_icon(var/safety = 0)
+	..()
+	
 	if(!check_icon_cache())
 		return
 

code/ATMOSPHERICS/pipes/manifold.dm

@@ -14,7 +14,6 @@
 	var/obj/machinery/atmospherics/node3
 
 	level = 1
-	layer = 2.4 //under wires with their 2.44
 
 /obj/machinery/atmospherics/pipe/manifold/New()
 
@@ -116,6 +115,8 @@
 		node3.update_underlays()
 
 /obj/machinery/atmospherics/pipe/manifold/update_icon(var/safety = 0)
+	..()
+	
 	if(!check_icon_cache())
 		return
 

code/ATMOSPHERICS/pipes/manifold4w.dm

@@ -15,7 +15,6 @@
 	var/obj/machinery/atmospherics/node4
 
 	level = 1
-	layer = 2.4 //under wires with their 2.44
 
 /obj/machinery/atmospherics/pipe/manifold4w/New()
 	..()
@@ -90,6 +89,8 @@
 		node4.update_underlays()
 
 /obj/machinery/atmospherics/pipe/manifold4w/update_icon(var/safety = 0)
+	..()
+	
 	if(!check_icon_cache())
 		return
 

code/ATMOSPHERICS/pipes/pipe.dm

@@ -3,7 +3,6 @@
 	var/datum/pipeline/parent
 	var/volume = 0
 	force = 20
-	layer = 2.4 //under wires with their 2.44
 	use_power = NO_POWER_USE
 	can_unwrench = 1
 	var/alert_pressure = 80*ONE_ATMOSPHERE //minimum pressure before check_pressure(...) should be called

code/ATMOSPHERICS/pipes/simple/pipe_simple.dm

@@ -137,6 +137,8 @@
 		node2.update_underlays()
 
 /obj/machinery/atmospherics/pipe/simple/update_icon(var/safety = 0)
+	..()
+	
 	if(!check_icon_cache())
 		return
 

code/ATMOSPHERICS/pipes/simple/pipe_simple_hidden.dm

@@ -28,6 +28,8 @@
 	icon_state = "map_universal"
 
 /obj/machinery/atmospherics/pipe/simple/hidden/universal/update_icon(var/safety = 0)
+	..()
+	
 	if(!check_icon_cache())
 		return
 

code/ATMOSPHERICS/pipes/simple/pipe_simple_visible.dm

@@ -39,6 +39,8 @@
 	icon_state = "map_universal"
 
 /obj/machinery/atmospherics/pipe/simple/visible/universal/update_icon(var/safety = 0)
+	..()
+	
 	if(!check_icon_cache())
 		return