Merge pull request #1632 from Citadel-Station-13/upstream-merge-28466

[MIRROR] Adjusted atmos device layers + added new pipe subtypes
2017-06-17 10:03:54 -05:00
parent 67db8fc9ad 185d0cd3f4
commit 050a6bfcdb
18 changed files with 238 additions and 63 deletions
--- a/code/__DEFINES/layers.dm
+++ b/code/__DEFINES/layers.dm
@@ -15,9 +15,13 @@
 #define ABOVE_NORMAL_TURF_LAYER 2.08
 #define LATTICE_LAYER 2.2
 #define DISPOSAL_PIPE_LAYER 2.3
-#define GAS_PIPE_LAYER 2.35
+#define GAS_PIPE_HIDDEN_LAYER 2.35
 #define WIRE_LAYER 2.4
 #define WIRE_TERMINAL_LAYER 2.45
+#define GAS_SCRUBBER_LAYER 2.46
+#define GAS_PIPE_VISIBLE_LAYER 2.47
+#define GAS_FILTER_LAYER 2.48
+#define GAS_PUMP_LAYER 2.49
 #define LOW_OBJ_LAYER 2.5
 #define LOW_SIGIL_LAYER 2.52
 #define SIGIL_LAYER 2.54
--- a/code/modules/atmospherics/machinery/atmosmachinery.dm
+++ b/code/modules/atmospherics/machinery/atmosmachinery.dm
@@ -9,13 +9,16 @@ Pipes -> Pipelines
 Pipelines + Other Objects -> Pipe network

 */
+#define PIPE_VISIBLE_LEVEL 2
+#define PIPE_HIDDEN_LEVEL 1
+
 /obj/machinery/atmospherics
 	anchored = 1
 	idle_power_usage = 0
 	active_power_usage = 0
 	power_channel = ENVIRON
 	on_blueprints = TRUE
-	layer = GAS_PIPE_LAYER //under wires
+	layer = GAS_PIPE_HIDDEN_LAYER //under wires
 	resistance_flags = FIRE_PROOF
 	obj_integrity = 200
 	max_integrity = 200
--- a/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm
@@ -4,6 +4,7 @@
 	initialize_directions = SOUTH|NORTH
 	use_power = 1
 	device_type = BINARY
+	layer = GAS_PUMP_LAYER

 /obj/machinery/atmospherics/components/binary/SetInitDirections()
 	switch(dir)
--- a/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm
@@ -4,6 +4,7 @@
 	initialize_directions = SOUTH|NORTH|WEST
 	use_power = 1
 	device_type = TRINARY
+	layer = GAS_FILTER_LAYER

 	var/flipped = 0

--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -7,6 +7,7 @@
 	obj_integrity = 350
 	max_integrity = 350
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 100, bomb = 0, bio = 100, rad = 100, fire = 30, acid = 30)
+	layer = ABOVE_WINDOW_LAYER

 	var/on = FALSE
 	state_open = FALSE
--- a/code/modules/atmospherics/machinery/components/unary_devices/generator_input.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/generator_input.dm
@@ -4,7 +4,8 @@
 	density = 1

 	name = "generator input"
-	desc = "Placeholder"
+	desc = "An input for a generator."
+	layer = LOW_OBJ_LAYER

 	var/update_cycle

--- a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm
@@ -7,6 +7,8 @@

 	can_unwrench = 1

+	layer = LOW_OBJ_LAYER
+
 	var/obj/machinery/atmospherics/components/unary/heat_exchanger/partner = null
 	var/update_cycle

--- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
@@ -16,6 +16,7 @@
 	var/datum/radio_frequency/radio_connection

 	level = 1
+	layer = GAS_SCRUBBER_LAYER

 /obj/machinery/atmospherics/components/unary/outlet_injector/Destroy()
 	if(SSradio)
--- a/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
@@ -7,6 +7,7 @@

 	dir = SOUTH
 	initialize_directions = SOUTH
+	layer = GAS_SCRUBBER_LAYER

 	var/on = 0

--- a/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm
@@ -7,6 +7,7 @@
 	var/obj/machinery/portable_atmospherics/connected_device
 	use_power = 0
 	level = 0
+	layer = GAS_FILTER_LAYER

 /obj/machinery/atmospherics/components/unary/portables_connector/New()
 	..()
--- a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm
@@ -9,6 +9,7 @@
 	var/volume = 10000 //in liters, 1 meters by 1 meters by 2 meters
 	density = 1
 	var/gas_type = 0
+	layer = ABOVE_WINDOW_LAYER

 /obj/machinery/atmospherics/components/unary/tank/New()
 	..()
--- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
@@ -1,7 +1,8 @@
 /obj/machinery/atmospherics/components/unary/thermomachine
 	name = "thermomachine"
 	desc = "Heats or cools gas in connected pipes."
-	icon_state = "cold_map"
+	icon = 'icons/obj/Cryogenic2.dmi'
+	icon_state = "freezer"
 	var/icon_state_on = "cold_on"
 	var/icon_state_open = "cold_off"
 	density = TRUE
@@ -9,7 +10,8 @@
 	obj_integrity = 300
 	max_integrity = 300
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 100, bomb = 0, bio = 100, rad = 100, fire = 80, acid = 30)
-
+	layer = OBJ_LAYER
+	
 	var/on = FALSE
 	var/min_temperature = 0
 	var/max_temperature = 0
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -13,6 +13,7 @@
 	can_unwrench = 1
 	welded = 0
 	level = 1
+	layer = GAS_SCRUBBER_LAYER

 	var/id_tag = null
 	var/on = 0
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
@@ -11,6 +11,7 @@
 	can_unwrench = 1
 	welded = 0
 	level = 1
+	layer = GAS_SCRUBBER_LAYER

 	var/id_tag = null
 	var/on = 0
--- a/code/modules/atmospherics/machinery/pipes/manifold.dm
+++ b/code/modules/atmospherics/machinery/pipes/manifold.dm
@@ -38,13 +38,13 @@

 //Colored pipes, use these for mapping
 /obj/machinery/atmospherics/pipe/manifold/general
-	name="pipe"

 /obj/machinery/atmospherics/pipe/manifold/general/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/manifold/general/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/manifold/scrubbers
 	name="scrubbers pipe"
@@ -52,10 +52,11 @@
 	color=rgb(255,0,0)

 /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/manifold/supply
 	name="air supply pipe"
@@ -63,10 +64,11 @@
 	color=rgb(0,0,255)

 /obj/machinery/atmospherics/pipe/manifold/supply/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/manifold/supply/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/manifold/supplymain
 	name="main air supply pipe"
@@ -74,47 +76,96 @@
 	color=rgb(130,43,272)

 /obj/machinery/atmospherics/pipe/manifold/supplymain/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/manifold/supplymain/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/manifold/yellow
 	pipe_color=rgb(255,198,0)
 	color=rgb(255,198,0)

 /obj/machinery/atmospherics/pipe/manifold/yellow/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/manifold/yellow/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/manifold/cyan
 	pipe_color=rgb(0,256,249)
 	color=rgb(0,256,249)

 /obj/machinery/atmospherics/pipe/manifold/cyan/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/manifold/cyan/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/manifold/green
 	pipe_color=rgb(30,256,0)
 	color=rgb(30,256,0)

 /obj/machinery/atmospherics/pipe/manifold/green/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/manifold/green/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/manifold/orange
-	pipe_color=rgb(255,127,39)
-	color=rgb(255,127,39)
+	pipe_color=rgb(255,129,25)
+	color=rgb(255,129,25)

 /obj/machinery/atmospherics/pipe/manifold/orange/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/manifold/orange/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL
+	
+/obj/machinery/atmospherics/pipe/manifold/purple
+	pipe_color=rgb(128,0,182)
+	color=rgb(128,0,182)
+
+/obj/machinery/atmospherics/pipe/manifold/purple/visible
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER
+
+/obj/machinery/atmospherics/pipe/manifold/purple/hidden
+	level = PIPE_HIDDEN_LEVEL
+
+/obj/machinery/atmospherics/pipe/manifold/dark
+	pipe_color=rgb(69,69,69)
+	color=rgb(69,69,69)
+
+/obj/machinery/atmospherics/pipe/manifold/dark/visible
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER
+
+/obj/machinery/atmospherics/pipe/manifold/dark/hidden
+	level = PIPE_HIDDEN_LEVEL
+
+/obj/machinery/atmospherics/pipe/manifold/violet
+	pipe_color=rgb(64,0,128)
+	color=rgb(64,0,128)
+
+/obj/machinery/atmospherics/pipe/manifold/violet/visible
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER
+
+/obj/machinery/atmospherics/pipe/manifold/violet/hidden
+	level = PIPE_HIDDEN_LEVEL
+
+/obj/machinery/atmospherics/pipe/manifold/brown
+	pipe_color=rgb(178,100,56)
+	color=rgb(178,100,56)
+
+/obj/machinery/atmospherics/pipe/manifold/brown/visible
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER
+
+/obj/machinery/atmospherics/pipe/manifold/brown/hidden
+	level = PIPE_HIDDEN_LEVEL
--- a/code/modules/atmospherics/machinery/pipes/manifold4w.dm
+++ b/code/modules/atmospherics/machinery/pipes/manifold4w.dm
@@ -29,13 +29,13 @@

 //Colored pipes, use these for mapping
 /obj/machinery/atmospherics/pipe/manifold4w/general
-	name="pipe"

 /obj/machinery/atmospherics/pipe/manifold4w/general/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/manifold4w/general/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers
 	name="scrubbers pipe"
@@ -43,10 +43,12 @@
 	color=rgb(255,0,0)

 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER
+

 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/manifold4w/supply
 	name="air supply pipe"
@@ -54,10 +56,11 @@
 	color=rgb(0,0,255)

 /obj/machinery/atmospherics/pipe/manifold4w/supply/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/manifold4w/supplymain
 	name="main air supply pipe"
@@ -65,47 +68,96 @@
 	color=rgb(130,43,272)

 /obj/machinery/atmospherics/pipe/manifold4w/supplymain/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/manifold4w/supplymain/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/manifold4w/yellow
 	pipe_color=rgb(255,198,0)
 	color=rgb(255,198,0)

 /obj/machinery/atmospherics/pipe/manifold4w/yellow/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/manifold4w/yellow/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/manifold4w/cyan
 	pipe_color=rgb(0,256,249)
 	color=rgb(0,256,249)

 /obj/machinery/atmospherics/pipe/manifold4w/cyan/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/manifold4w/cyan/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/manifold4w/green
 	pipe_color=rgb(30,256,0)
 	color=rgb(30,256,0)

 /obj/machinery/atmospherics/pipe/manifold4w/green/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/manifold4w/green/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/manifold4w/orange
-	pipe_color=rgb(255,127,39)
-	color=rgb(255,127,39)
+	pipe_color=rgb(255,129,25)
+	color=rgb(255,129,25)

 /obj/machinery/atmospherics/pipe/manifold4w/orange/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/manifold4w/orange/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL
+
+/obj/machinery/atmospherics/pipe/manifold4w/purple
+	pipe_color=rgb(128,0,182)
+	color=rgb(128,0,182)
+
+/obj/machinery/atmospherics/pipe/manifold4w/purple/visible
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER
+
+/obj/machinery/atmospherics/pipe/manifold4w/purple/hidden
+	level = PIPE_HIDDEN_LEVEL
+
+/obj/machinery/atmospherics/pipe/manifold4w/dark
+	pipe_color=rgb(69,69,69)
+	color=rgb(69,69,69)
+
+/obj/machinery/atmospherics/pipe/manifold4w/dark/visible
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER
+
+/obj/machinery/atmospherics/pipe/manifold4w/dark/hidden
+	level = PIPE_HIDDEN_LEVEL
+
+/obj/machinery/atmospherics/pipe/manifold4w/violet
+	pipe_color=rgb(64,0,128)
+	color=rgb(64,0,128)
+
+/obj/machinery/atmospherics/pipe/manifold4w/violet/visible
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER
+
+/obj/machinery/atmospherics/pipe/manifold4w/violet/hidden
+	level = PIPE_HIDDEN_LEVEL
+
+/obj/machinery/atmospherics/pipe/manifold4w/brown
+	pipe_color=rgb(178,100,56)
+	color=rgb(178,100,56)
+
+/obj/machinery/atmospherics/pipe/manifold4w/brown/visible
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER
+
+/obj/machinery/atmospherics/pipe/manifold4w/brown/hidden
+	level = PIPE_HIDDEN_LEVEL
--- a/code/modules/atmospherics/machinery/pipes/simple.dm
+++ b/code/modules/atmospherics/machinery/pipes/simple.dm
@@ -40,13 +40,13 @@ The regular pipe you see everywhere, including bent ones.

 //Colored pipes, use these for mapping
 /obj/machinery/atmospherics/pipe/simple/general
-	name="pipe"

 /obj/machinery/atmospherics/pipe/simple/general/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/simple/general/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/simple/scrubbers
 	name="scrubbers pipe"
@@ -54,10 +54,11 @@ The regular pipe you see everywhere, including bent ones.
 	color=rgb(255,0,0)

 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/simple/supply
 	name="air supply pipe"
@@ -65,10 +66,11 @@ The regular pipe you see everywhere, including bent ones.
 	color=rgb(0,0,255)

 /obj/machinery/atmospherics/pipe/simple/supply/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/simple/supply/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/simple/supplymain
 	name="main air supply pipe"
@@ -76,47 +78,96 @@ The regular pipe you see everywhere, including bent ones.
 	color=rgb(130,43,272)

 /obj/machinery/atmospherics/pipe/simple/supplymain/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/simple/supplymain/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/simple/yellow
 	pipe_color=rgb(255,198,0)
 	color=rgb(255,198,0)

 /obj/machinery/atmospherics/pipe/simple/yellow/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/simple/yellow/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/simple/cyan
 	pipe_color=rgb(0,256,249)
 	color=rgb(0,256,249)

 /obj/machinery/atmospherics/pipe/simple/cyan/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/simple/cyan/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/simple/green
 	pipe_color=rgb(30,256,0)
 	color=rgb(30,256,0)

 /obj/machinery/atmospherics/pipe/simple/green/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/simple/green/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL

 /obj/machinery/atmospherics/pipe/simple/orange
-	pipe_color=rgb(255,127,39)
-	color=rgb(255,127,39)
+	pipe_color=rgb(255,129,25)
+	color=rgb(255,129,25)

 /obj/machinery/atmospherics/pipe/simple/orange/visible
-	level = 2
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER

 /obj/machinery/atmospherics/pipe/simple/orange/hidden
-	level = 1
+	level = PIPE_HIDDEN_LEVEL
+
+/obj/machinery/atmospherics/pipe/simple/purple
+	pipe_color=rgb(128,0,182)
+	color=rgb(128,0,182)
+
+/obj/machinery/atmospherics/pipe/simple/purple/visible
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER
+
+/obj/machinery/atmospherics/pipe/simple/purple/hidden
+	level = PIPE_HIDDEN_LEVEL
+
+/obj/machinery/atmospherics/pipe/simple/dark
+	pipe_color=rgb(69,69,69)
+	color=rgb(69,69,69)
+
+/obj/machinery/atmospherics/pipe/simple/dark/visible
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER
+
+/obj/machinery/atmospherics/pipe/simple/dark/hidden
+	level = PIPE_HIDDEN_LEVEL
+
+/obj/machinery/atmospherics/pipe/simple/violet
+	pipe_color=rgb(64,0,128)
+	color=rgb(64,0,128)
+
+/obj/machinery/atmospherics/pipe/simple/violet/visible
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER
+
+/obj/machinery/atmospherics/pipe/simple/violet/hidden
+	level = PIPE_HIDDEN_LEVEL
+
+/obj/machinery/atmospherics/pipe/simple/brown
+	pipe_color=rgb(178,100,56)
+	color=rgb(178,100,56)
+
+/obj/machinery/atmospherics/pipe/simple/brown/visible
+	level = PIPE_VISIBLE_LEVEL
+	layer = GAS_PIPE_VISIBLE_LAYER
+
+/obj/machinery/atmospherics/pipe/simple/brown/hidden
+	level = PIPE_HIDDEN_LEVEL
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -33,7 +33,7 @@ By design, d1 is the smallest direction and d2 is the highest
 	icon_state = "0-1"
 	var/d1 = 0   // cable direction 1 (see above)
 	var/d2 = 1   // cable direction 2 (see above)
-	layer = WIRE_LAYER //Above pipes, which are at GAS_PIPE_LAYER
+	layer = WIRE_LAYER //Above hidden pipes, GAS_PIPE_HIDDEN_LAYER
 	var/cable_color = "red"
 	var/obj/item/stack/cable_coil/stored