Adjusted atmos device layers + added new pipe subtypes

2017-06-16 15:25:38 -05:00
parent f659a0923e
commit 185d0cd3f4
18 changed files with 238 additions and 63 deletions
@@ -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)
@@ -4,6 +4,7 @@
 	initialize_directions = SOUTH|NORTH|WEST
 	use_power = 1
 	device_type = TRINARY
+	layer = GAS_FILTER_LAYER

 	var/flipped = 0

@@ -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
@@ -4,7 +4,8 @@
 	density = 1

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

 	var/update_cycle

@@ -7,6 +7,8 @@

 	can_unwrench = 1

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

@@ -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)
@@ -7,6 +7,7 @@

 	dir = SOUTH
 	initialize_directions = SOUTH
+	layer = GAS_SCRUBBER_LAYER

 	var/on = 0

@@ -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()
 	..()
@@ -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()
 	..()
@@ -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
@@ -13,6 +13,7 @@
 	can_unwrench = 1
 	welded = 0
 	level = 1
+	layer = GAS_SCRUBBER_LAYER

 	var/id_tag = null
 	var/on = 0
@@ -11,6 +11,7 @@
 	can_unwrench = 1
 	welded = 0
 	level = 1
+	layer = GAS_SCRUBBER_LAYER

 	var/id_tag = null
 	var/on = 0