From 2447af66239736df1e8061fb43eab0ff39ec3b3b Mon Sep 17 00:00:00 2001
From: "baloh.matevz" <baloh.matevz@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Sat, 11 Feb 2012 17:04:54 +0000
Subject: [PATCH] Changes to layering of underfloor stuff: - Disposal pipes are
 on layer 2.3 - Pipes and manifolds are on layer 2.4 - Cables are on layer
 2.44 - Unary atmospherics stuff (vent pumps, scrubbers) are on layer 2.45 -
 Nav beacons, bluespace beacons and such things are on layer 2.5

It means that pipes appear below cables and

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3097 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/ATMOSPHERICS/components/unary/unary_base.dm    | 1 +
 code/ATMOSPHERICS/components/unary/vent_pump.dm     | 1 -
 code/ATMOSPHERICS/components/unary/vent_scrubber.dm | 1 -
 code/ATMOSPHERICS/pipes.dm                          | 3 ++-
 code/defines/obj.dm                                 | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/ATMOSPHERICS/components/unary/unary_base.dm b/code/ATMOSPHERICS/components/unary/unary_base.dm
index 230296a9f48..9c434ea91d5 100644
--- a/code/ATMOSPHERICS/components/unary/unary_base.dm
+++ b/code/ATMOSPHERICS/components/unary/unary_base.dm
@@ -1,6 +1,7 @@
 /obj/machinery/atmospherics/unary
 	dir = SOUTH
 	initialize_directions = SOUTH
+	layer = 2.45
 
 	var/datum/gas_mixture/air_contents
 
diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm
index 03a79934b0c..3388cfd9667 100644
--- a/code/ATMOSPHERICS/components/unary/vent_pump.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm
@@ -6,7 +6,6 @@
 	desc = "Has a valve and pump attached to it"
 
 	level = 1
-	layer = TURF_LAYER
 	var/area_uid
 	var/id_tag = null
 	power_channel = ENVIRON
diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
index a55e38140b1..6c427baab38 100644
--- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
@@ -6,7 +6,6 @@
 	desc = "Has a valve and pump attached to it"
 
 	level = 1
-	layer = TURF_LAYER
 
 	var/id_tag = null
 	var/frequency = 1439
diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm
index 8964822c2fd..46f902fbdd0 100644
--- a/code/ATMOSPHERICS/pipes.dm
+++ b/code/ATMOSPHERICS/pipes.dm
@@ -6,7 +6,7 @@ obj/machinery/atmospherics/pipe
 	var/volume = 0
 	var/force = 20
 
-	layer = 2.4 //under wires with their 2.5
+	layer = 2.4 //under wires with their 2.44
 
 	var/alert_pressure = 80*ONE_ATMOSPHERE
 		//minimum pressure before check_pressure(...) should be called
@@ -597,6 +597,7 @@ obj/machinery/atmospherics/pipe
 		var/obj/machinery/atmospherics/node3
 
 		level = 1
+		layer = 2.4 //under wires with their 2.44
 
 		New()
 			switch(dir)
diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index 9f724531990..ec2357f7475 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -459,7 +459,7 @@
 	icon_state = "0-1"
 	var/d1 = 0
 	var/d2 = 1
-	layer = 2.5
+	layer = 2.44 //Just below unary stuff, which is at 2.45 and above pipes, which are at 2.4
 	var/color="red"
 	var/obj/structure/powerswitch/power_switch