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
@@ -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