diff --git a/baystation12.dme b/baystation12.dme
index 47496fac7b..a0495f8487 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -48,6 +48,7 @@
#include "code\_onclick\hud\other_mobs.dm"
#include "code\_onclick\hud\robot.dm"
#include "code\_onclick\hud\screen_objects.dm"
+#include "code\ATMOSPHERICS\_atmos_setup.dm"
#include "code\ATMOSPHERICS\atmospherics.dm"
#include "code\ATMOSPHERICS\datum_pipe_network.dm"
#include "code\ATMOSPHERICS\datum_pipeline.dm"
diff --git a/code/ATMOSPHERICS/_atmos_setup.dm b/code/ATMOSPHERICS/_atmos_setup.dm
new file mode 100644
index 0000000000..a34d372c59
--- /dev/null
+++ b/code/ATMOSPHERICS/_atmos_setup.dm
@@ -0,0 +1,200 @@
+//--------------------------------------------
+// Pipe colors
+//
+// Add them here and to the pipe_colors list
+// to automatically add them to all relevant
+// atmospherics devices.
+//--------------------------------------------
+
+#define PIPE_COLOR_GREY "#ffffff" //yes white is grey
+#define PIPE_COLOR_RED "#ff0000"
+#define PIPE_COLOR_BLUE "#0000ff"
+#define PIPE_COLOR_CYAN "#00ffff"
+#define PIPE_COLOR_GREEN "#00ff00"
+#define PIPE_COLOR_YELLOW "#ffcc00"
+#define PIPE_COLOR_PURPLE "#5c1ec0"
+
+var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "purple" = PIPE_COLOR_PURPLE)
+
+/proc/pipe_color_lookup(var/color)
+ for(var/C in pipe_colors)
+ if(color == pipe_colors[C])
+ return "[C]"
+
+/proc/pipe_color_check(var/color)
+ for(var/C in pipe_colors)
+ if(color == pipe_colors[C])
+ return 1
+ return 0
+
+//--------------------------------------------
+// Icon cache generation
+//--------------------------------------------
+
+/datum/pipe_icon_manager
+ var/list/pipe_icons[]
+ var/list/manifold_icons[]
+ var/list/device_icons[]
+ var/list/underlays_down[]
+ var/list/underlays_exposed[]
+ var/list/underlays_intact[]
+ var/list/pipe_underlays_exposed[]
+ var/list/pipe_underlays_intact[]
+ var/list/omni_icons[]
+
+/datum/pipe_icon_manager/New()
+ check_icons()
+
+/datum/pipe_icon_manager/proc/get_atmos_icon(var/device, var/dir, var/color, var/state)
+ check_icons()
+
+ device = "[device]"
+ state = "[state]"
+ color = "[color]"
+ dir = "[dir]"
+
+ switch(device)
+ if("pipe")
+ return pipe_icons[state + color]
+ if("manifold")
+ return manifold_icons[state + color]
+ if("device")
+ return device_icons[state]
+ if("omni")
+ return omni_icons[state]
+ if("underlay_intact")
+ return underlays_intact[dir + color]
+ if("underlay_exposed")
+ return underlays_exposed[dir + color]
+ if("underlay_down")
+ return underlays_down[dir + color]
+ if("pipe_underlay_exposed")
+ return pipe_underlays_exposed[dir + color]
+ if("pipe_underlay_intact")
+ return pipe_underlays_intact[dir + color]
+
+/datum/pipe_icon_manager/proc/check_icons()
+ if(!pipe_icons)
+ gen_pipe_icons()
+ if(!manifold_icons)
+ gen_manifold_icons()
+ if(!device_icons)
+ gen_device_icons()
+ if(!omni_icons)
+ gen_omni_icons()
+ if(!underlays_intact || !underlays_down || !underlays_exposed || !pipe_underlays_exposed || !pipe_underlays_intact)
+ gen_underlay_icons()
+
+/datum/pipe_icon_manager/proc/gen_pipe_icons()
+ if(!pipe_icons)
+ pipe_icons = new()
+
+ var/icon/pipe = new('icons/atmos/pipes.dmi')
+
+ for(var/state in pipe.IconStates())
+ if(!state || findtext(state, "map"))
+ continue
+
+ var/cache_name = state
+ var/image/I = image('icons/atmos/pipes.dmi', icon_state = state)
+ pipe_icons[cache_name] = I
+
+ for(var/pipe_color in pipe_colors)
+ I = image('icons/atmos/pipes.dmi', icon_state = state)
+ I.color = pipe_colors[pipe_color]
+ pipe_icons[state + "[pipe_colors[pipe_color]]"] = I
+
+/datum/pipe_icon_manager/proc/gen_manifold_icons()
+ if(!manifold_icons)
+ manifold_icons = new()
+
+ var/icon/pipe = new('icons/atmos/manifold.dmi')
+
+ for(var/state in pipe.IconStates())
+ if(findtext(state, "clamps"))
+ var/image/I = image('icons/atmos/manifold.dmi', icon_state = state)
+ manifold_icons[state] = I
+ continue
+
+ if(state == "core" || state == "4way")
+ var/image/I = image('icons/atmos/manifold.dmi', icon_state = state)
+ manifold_icons[state] = I
+ for(var/pipe_color in pipe_colors)
+ I = image('icons/atmos/manifold.dmi', icon_state = state)
+ I.color = pipe_colors[pipe_color]
+ manifold_icons[state + pipe_colors[pipe_color]] = I
+
+/datum/pipe_icon_manager/proc/gen_device_icons()
+ if(!device_icons)
+ device_icons = new()
+
+ var/icon/device
+
+ device = new('icons/atmos/vent_pump.dmi')
+ for(var/state in device.IconStates())
+ if(!state || findtext(state, "map"))
+ continue
+ device_icons["vent" + state] = image('icons/atmos/vent_pump.dmi', icon_state = state)
+
+ device = new('icons/atmos/vent_scrubber.dmi')
+ for(var/state in device.IconStates())
+ if(!state || findtext(state, "map"))
+ continue
+ device_icons["scrubber" + state] = image('icons/atmos/vent_scrubber.dmi', icon_state = state)
+
+/datum/pipe_icon_manager/proc/gen_omni_icons()
+ if(!omni_icons)
+ omni_icons = new()
+
+ var/icon/omni = new('icons/atmos/omni_devices.dmi')
+
+ for(var/state in omni.IconStates())
+ if(!state || findtext(state, "map"))
+ continue
+ omni_icons[state] = image('icons/atmos/omni_devices.dmi', icon_state = state)
+
+/datum/pipe_icon_manager/proc/gen_underlay_icons()
+ if(!underlays_intact)
+ underlays_intact = new()
+ if(!underlays_exposed)
+ underlays_exposed = new()
+ if(!underlays_down)
+ underlays_down = new()
+ if(!pipe_underlays_exposed)
+ pipe_underlays_exposed = new()
+ if(!pipe_underlays_intact)
+ pipe_underlays_intact = new()
+
+ var/icon/pipe = new('icons/atmos/pipe_underlays.dmi')
+
+ for(var/state in pipe.IconStates())
+ if(state == "")
+ continue
+
+ for(var/D in cardinal)
+ var/image/I = image('icons/atmos/pipe_underlays.dmi', icon_state = state, dir = D)
+ switch(state)
+ if("intact")
+ underlays_intact["[D]"] = I
+ if("exposed")
+ underlays_exposed["[D]"] = I
+ if("down")
+ underlays_down["[D]"] = I
+ if("pipe_exposed")
+ pipe_underlays_exposed["[D]"] = I
+ if("pipe_intact")
+ pipe_underlays_intact["[D]"] = I
+ for(var/pipe_color in pipe_colors)
+ I = image('icons/atmos/pipe_underlays.dmi', icon_state = state, dir = D)
+ I.color = pipe_colors[pipe_color]
+ switch(state)
+ if("intact")
+ underlays_intact["[D]" + pipe_colors[pipe_color]] = I
+ if("exposed")
+ underlays_exposed["[D]" + pipe_colors[pipe_color]] = I
+ if("down")
+ underlays_down["[D]" + pipe_colors[pipe_color]] = I
+ if("pipe_exposed")
+ pipe_underlays_exposed["[D]" + pipe_colors[pipe_color]] = I
+ if("pipe_intact")
+ pipe_underlays_intact["[D]" + pipe_colors[pipe_color]] = I
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm
index 1b89db43be..d652aed9d9 100644
--- a/code/ATMOSPHERICS/atmospherics.dm
+++ b/code/ATMOSPHERICS/atmospherics.dm
@@ -10,48 +10,96 @@ Pipelines + Other Objects -> Pipe network
*/
-obj/machinery/atmospherics
+/obj/machinery/atmospherics
anchored = 1
idle_power_usage = 0
active_power_usage = 0
power_channel = ENVIRON
var/nodealert = 0
+ var/initialize_directions = 0
+ var/pipe_color
+
+ var/global/datum/pipe_icon_manager/icon_manager
+/obj/machinery/atmospherics/New()
+ if(!icon_manager)
+ icon_manager = new()
+
+ if(!pipe_color)
+ pipe_color = color
+ color = null
+
+ if(!pipe_color_check(pipe_color))
+ pipe_color = null
+ ..()
-obj/machinery/atmospherics/var/initialize_directions = 0
-obj/machinery/atmospherics/var/pipe_color
+/obj/machinery/atmospherics/attackby(atom/A, mob/user as mob)
+ if(istype(A, /obj/item/device/pipe_painter))
+ return
+ ..()
-obj/machinery/atmospherics/process()
+/obj/machinery/atmospherics/proc/add_underlay(var/turf/T, var/obj/machinery/atmospherics/node, var/direction)
+ if(node)
+ if(T.intact && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
+ underlays += icon_manager.get_atmos_icon("underlay_down", direction, color_cache_name(node))
+ else
+ underlays += icon_manager.get_atmos_icon("underlay_intact", direction, color_cache_name(node))
+ else
+ underlays += icon_manager.get_atmos_icon("underlay_exposed", direction, pipe_color)
+
+/obj/machinery/atmospherics/proc/update_underlays()
+ if(check_icon_cache())
+ return 1
+ else
+ return 0
+
+/obj/machinery/atmospherics/proc/check_icon_cache(var/safety = 0)
+ if(!istype(icon_manager))
+ if(!safety) //to prevent infinite loops
+ icon_manager = new()
+ check_icon_cache(1)
+ return 0
+
+ return 1
+
+/obj/machinery/atmospherics/proc/color_cache_name(var/obj/machinery/atmospherics/node)
+ //Don't use this for standard pipes
+ if(!istype(node))
+ return null
+
+ return node.pipe_color
+
+/obj/machinery/atmospherics/process()
build_network()
-obj/machinery/atmospherics/proc/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+/obj/machinery/atmospherics/proc/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
// Check to see if should be added to network. Add self if so and adjust variables appropriately.
// Note don't forget to have neighbors look as well!
return null
-obj/machinery/atmospherics/proc/build_network()
+/obj/machinery/atmospherics/proc/build_network()
// Called to build a network from this node
return null
-obj/machinery/atmospherics/proc/return_network(obj/machinery/atmospherics/reference)
+/obj/machinery/atmospherics/proc/return_network(obj/machinery/atmospherics/reference)
// Returns pipe_network associated with connection to reference
// Notes: should create network if necessary
// Should never return null
return null
-obj/machinery/atmospherics/proc/reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
+/obj/machinery/atmospherics/proc/reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
// Used when two pipe_networks are combining
-obj/machinery/atmospherics/proc/return_network_air(datum/network/reference)
+/obj/machinery/atmospherics/proc/return_network_air(datum/network/reference)
// Return a list of gas_mixture(s) in the object
// associated with reference pipe_network for use in rebuilding the networks gases list
// Is permitted to return null
-obj/machinery/atmospherics/proc/disconnect(obj/machinery/atmospherics/reference)
+/obj/machinery/atmospherics/proc/disconnect(obj/machinery/atmospherics/reference)
-obj/machinery/atmospherics/update_icon()
+/obj/machinery/atmospherics/update_icon()
return null
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
index 9d2a8e32e8..52f57b2958 100644
--- a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
@@ -76,6 +76,7 @@ obj/machinery/atmospherics/binary
break
update_icon()
+ update_underlays()
build_network()
if(!network1 && node1)
@@ -127,4 +128,7 @@ obj/machinery/atmospherics/binary
del(network2)
node2 = null
+ update_icon()
+ update_underlays()
+
return null
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
index ac451871dc..6a21d08245 100644
--- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
@@ -1,6 +1,6 @@
/obj/machinery/atmospherics/binary/dp_vent_pump
- icon = 'icons/obj/atmospherics/dp_vent_pump.dmi'
- icon_state = "off"
+ icon = 'icons/atmos/vent_pump.dmi'
+ icon_state = "map_dp_vent"
//node2 is output port
//node1 is input port
@@ -10,15 +10,6 @@
level = 1
- high_volume
- name = "Large Dual Port Air Vent"
-
- New()
- ..()
-
- air1.volume = 1000
- air2.volume = 1000
-
var/on = 0
var/pump_direction = 1 //0 = siphoning, 1 = releasing
@@ -26,174 +17,199 @@
var/input_pressure_min = 0
var/output_pressure_max = 0
+ var/frequency = 0
+ var/id = null
+ var/datum/radio_frequency/radio_connection
+
var/pressure_checks = 1
//1: Do not pass external_pressure_bound
//2: Do not pass input_pressure_min
//4: Do not pass output_pressure_max
+/obj/machinery/atmospherics/binary/dp_vent_pump/New()
+ ..()
+ icon = null
+
+/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume
+ name = "Large Dual Port Air Vent"
+
+/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume/New()
+ ..()
+ air1.volume = 1000
+ air2.volume = 1000
+
+/obj/machinery/atmospherics/binary/dp_vent_pump/update_icon(var/safety = 0)
+ if(!check_icon_cache())
+ return
+
+ overlays.Cut()
+
+ var/vent_icon = "vent"
+
+ var/turf/T = get_turf(src)
+ if(!istype(T))
+ return
+
+ if(T.intact && node1 && node2 && node1.level == 1 && node2.level == 1 && istype(node1, /obj/machinery/atmospherics/pipe) && istype(node2, /obj/machinery/atmospherics/pipe))
+ vent_icon += "h"
+
+ if(!powered())
+ vent_icon += "off"
+ else
+ vent_icon += "[on ? "[pump_direction ? "out" : "in"]" : "off"]"
+
+ overlays += icon_manager.get_atmos_icon("device", , , vent_icon)
+
+/obj/machinery/atmospherics/binary/dp_vent_pump/update_underlays()
+ if(..())
+ underlays.Cut()
+ var/turf/T = get_turf(src)
+ if(!istype(T))
+ return
+ if(T.intact && node1 && node2 && node1.level == 1 && node2.level == 1 && istype(node1, /obj/machinery/atmospherics/pipe) && istype(node2, /obj/machinery/atmospherics/pipe))
+ return
+ else
+ add_underlay(T, node1, turn(dir, -180))
+ add_underlay(T, node2, dir)
+
+/obj/machinery/atmospherics/binary/dp_vent_pump/hide(var/i)
update_icon()
- if(on)
- if(pump_direction)
- icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]out"
- else
- icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]in"
- else
- icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off"
- on = 0
+ update_underlays()
- return
+/obj/machinery/atmospherics/binary/dp_vent_pump/process()
+ ..()
- hide(var/i) //to make the little pipe section invisible, the icon changes.
- if(on)
- if(pump_direction)
- icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]out"
- else
- icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]in"
- else
- icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off"
- on = 0
- return
+ if(!on)
+ return 0
- process()
- ..()
+ var/datum/gas_mixture/environment = loc.return_air()
+ var/environment_pressure = environment.return_pressure()
- if(!on)
- return 0
+ if(pump_direction) //input -> external
+ var/pressure_delta = 10000
- var/datum/gas_mixture/environment = loc.return_air()
- var/environment_pressure = environment.return_pressure()
+ if(pressure_checks&1)
+ pressure_delta = min(pressure_delta, (external_pressure_bound - environment_pressure))
+ if(pressure_checks&2)
+ pressure_delta = min(pressure_delta, (air1.return_pressure() - input_pressure_min))
- if(pump_direction) //input -> external
- var/pressure_delta = 10000
+ if(pressure_delta > 0)
+ if(air1.temperature > 0)
+ var/transfer_moles = pressure_delta*environment.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
- if(pressure_checks&1)
- pressure_delta = min(pressure_delta, (external_pressure_bound - environment_pressure))
- if(pressure_checks&2)
- pressure_delta = min(pressure_delta, (air1.return_pressure() - input_pressure_min))
+ var/datum/gas_mixture/removed = air1.remove(transfer_moles)
- if(pressure_delta > 0)
- if(air1.temperature > 0)
- var/transfer_moles = pressure_delta*environment.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
+ loc.assume_air(removed)
- var/datum/gas_mixture/removed = air1.remove(transfer_moles)
+ if(network1)
+ network1.update = 1
- loc.assume_air(removed)
+ else //external -> output
+ var/pressure_delta = 10000
- if(network1)
- network1.update = 1
+ if(pressure_checks&1)
+ pressure_delta = min(pressure_delta, (environment_pressure - external_pressure_bound))
+ if(pressure_checks&4)
+ pressure_delta = min(pressure_delta, (output_pressure_max - air2.return_pressure()))
- else //external -> output
- var/pressure_delta = 10000
+ if(pressure_delta > 0)
+ if(environment.temperature > 0)
+ var/transfer_moles = pressure_delta*air2.volume/(environment.temperature * R_IDEAL_GAS_EQUATION)
- if(pressure_checks&1)
- pressure_delta = min(pressure_delta, (environment_pressure - external_pressure_bound))
- if(pressure_checks&4)
- pressure_delta = min(pressure_delta, (output_pressure_max - air2.return_pressure()))
+ var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
- if(pressure_delta > 0)
- if(environment.temperature > 0)
- var/transfer_moles = pressure_delta*air2.volume/(environment.temperature * R_IDEAL_GAS_EQUATION)
+ air2.merge(removed)
- var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
+ if(network2)
+ network2.update = 1
- air2.merge(removed)
-
- if(network2)
- network2.update = 1
-
- return 1
+ return 1
//Radio remote control
- proc
- set_frequency(new_frequency)
- radio_controller.remove_object(src, frequency)
- frequency = new_frequency
- if(frequency)
- radio_connection = radio_controller.add_object(src, frequency, filter = RADIO_ATMOSIA)
+/obj/machinery/atmospherics/binary/dp_vent_pump/proc/set_frequency(new_frequency)
+ radio_controller.remove_object(src, frequency)
+ frequency = new_frequency
+ if(frequency)
+ radio_connection = radio_controller.add_object(src, frequency, filter = RADIO_ATMOSIA)
- broadcast_status()
- if(!radio_connection)
- return 0
+/obj/machinery/atmospherics/binary/dp_vent_pump/proc/broadcast_status()
+ if(!radio_connection)
+ return 0
- var/datum/signal/signal = new
- signal.transmission_method = 1 //radio signal
- signal.source = src
+ var/datum/signal/signal = new
+ signal.transmission_method = 1 //radio signal
+ signal.source = src
- signal.data = list(
- "tag" = id,
- "device" = "ADVP",
- "power" = on,
- "direction" = pump_direction?("release"):("siphon"),
- "checks" = pressure_checks,
- "input" = input_pressure_min,
- "output" = output_pressure_max,
- "external" = external_pressure_bound,
- "sigtype" = "status"
- )
- radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
+ signal.data = list(
+ "tag" = id,
+ "device" = "ADVP",
+ "power" = on,
+ "direction" = pump_direction?("release"):("siphon"),
+ "checks" = pressure_checks,
+ "input" = input_pressure_min,
+ "output" = output_pressure_max,
+ "external" = external_pressure_bound,
+ "sigtype" = "status"
+ )
+ radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
- return 1
+ return 1
- var/frequency = 0
- var/id = null
- var/datum/radio_frequency/radio_connection
+/obj/machinery/atmospherics/binary/dp_vent_pump/initialize()
+ ..()
+ if(frequency)
+ set_frequency(frequency)
- initialize()
- ..()
- if(frequency)
- set_frequency(frequency)
+/obj/machinery/atmospherics/binary/dp_vent_pump/receive_signal(datum/signal/signal)
+ if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
+ return 0
+ if(signal.data["power"])
+ on = text2num(signal.data["power"])
- receive_signal(datum/signal/signal)
+ if(signal.data["power_toggle"])
+ on = !on
- if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
- return 0
- if("power" in signal.data)
- on = text2num(signal.data["power"])
+ if(signal.data["direction"])
+ pump_direction = text2num(signal.data["direction"])
- if("power_toggle" in signal.data)
- on = !on
+ if(signal.data["checks"])
+ pressure_checks = text2num(signal.data["checks"])
- if("direction" in signal.data)
- pump_direction = text2num(signal.data["direction"])
+ if(signal.data["purge"])
+ pressure_checks &= ~1
+ pump_direction = 0
- if("checks" in signal.data)
- pressure_checks = text2num(signal.data["checks"])
+ if(signal.data["stabalize"])
+ pressure_checks |= 1
+ pump_direction = 1
- if("purge" in signal.data)
- pressure_checks &= ~1
- pump_direction = 0
+ if(signal.data["set_input_pressure"])
+ input_pressure_min = between(
+ 0,
+ text2num(signal.data["set_input_pressure"]),
+ ONE_ATMOSPHERE*50
+ )
- if("stabalize" in signal.data)
- pressure_checks |= 1
- pump_direction = 1
+ if(signal.data["set_output_pressure"])
+ output_pressure_max = between(
+ 0,
+ text2num(signal.data["set_output_pressure"]),
+ ONE_ATMOSPHERE*50
+ )
- if("set_input_pressure" in signal.data)
- input_pressure_min = between(
- 0,
- text2num(signal.data["set_input_pressure"]),
- ONE_ATMOSPHERE*50
- )
+ if(signal.data["set_external_pressure"])
+ external_pressure_bound = between(
+ 0,
+ text2num(signal.data["set_external_pressure"]),
+ ONE_ATMOSPHERE*50
+ )
- if("set_output_pressure" in signal.data)
- output_pressure_max = between(
- 0,
- text2num(signal.data["set_output_pressure"]),
- ONE_ATMOSPHERE*50
- )
-
- if("set_external_pressure" in signal.data)
- external_pressure_bound = between(
- 0,
- text2num(signal.data["set_external_pressure"]),
- ONE_ATMOSPHERE*50
- )
-
- if("status" in signal.data)
- spawn(2)
- broadcast_status()
- return //do not update_icon
- //if(signal.data["tag"])
+ if(signal.data["status"])
spawn(2)
broadcast_status()
- update_icon()
\ No newline at end of file
+ return //do not update_icon
+
+ spawn(2)
+ broadcast_status()
+ update_icon()
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
index a126928e2d..4766883a64 100644
--- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
@@ -1,8 +1,9 @@
-obj/machinery/atmospherics/binary/passive_gate
+/obj/machinery/atmospherics/binary/passive_gate
//Tries to achieve target pressure at output (like a normal pump) except
// Uses no power but can not transfer gases from a low pressure area to a high pressure area
- icon = 'icons/obj/atmospherics/passive_gate.dmi'
- icon_state = "intact_off"
+ icon = 'icons/atmos/passive_gate.dmi'
+ icon_state = "map"
+ level = 1
name = "Passive gate"
desc = "A one-way air valve that does not require power"
@@ -14,175 +15,161 @@ obj/machinery/atmospherics/binary/passive_gate
var/id = null
var/datum/radio_frequency/radio_connection
- update_icon()
- if(stat & NOPOWER)
- icon_state = "intact_off"
- else if(node1 && node2)
- icon_state = "intact_[on?("on"):("off")]"
- else
- if(node1)
- icon_state = "exposed_1_off"
- else if(node2)
- icon_state = "exposed_2_off"
- else
- icon_state = "exposed_3_off"
- return
+/obj/machinery/atmospherics/binary/passive_gate/update_icon()
+ icon_state = "[on ? "on" : "off"]"
- process()
- ..()
- if(!on)
- return 0
+/obj/machinery/atmospherics/binary/passive_gate/update_underlays()
+ if(..())
+ underlays.Cut()
+ var/turf/T = get_turf(src)
+ if(!istype(T))
+ return
+ add_underlay(T, node1, turn(dir, 180))
+ add_underlay(T, node2, dir)
- var/output_starting_pressure = air2.return_pressure()
- var/input_starting_pressure = air1.return_pressure()
+/obj/machinery/atmospherics/binary/passive_gate/hide(var/i)
+ update_underlays()
- if(output_starting_pressure >= min(target_pressure,input_starting_pressure-10))
- //No need to pump gas if target is already reached or input pressure is too low
- //Need at least 10 KPa difference to overcome friction in the mechanism
- return 1
+/obj/machinery/atmospherics/binary/passive_gate/process()
+ ..()
+ if(!on)
+ return 0
- //Calculate necessary moles to transfer using PV = nRT
- if((air1.total_moles() > 0) && (air1.temperature>0))
- var/pressure_delta = min(target_pressure - output_starting_pressure, (input_starting_pressure - output_starting_pressure)/2)
- //Can not have a pressure delta that would cause output_pressure > input_pressure
+ var/output_starting_pressure = air2.return_pressure()
+ var/input_starting_pressure = air1.return_pressure()
- var/transfer_moles = pressure_delta*air2.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
+ if(output_starting_pressure >= min(target_pressure,input_starting_pressure-10))
+ //No need to pump gas if target is already reached or input pressure is too low
+ //Need at least 10 KPa difference to overcome friction in the mechanism
+ return 1
- //Actually transfer the gas
- var/datum/gas_mixture/removed = air1.remove(transfer_moles)
- air2.merge(removed)
+ //Calculate necessary moles to transfer using PV = nRT
+ if((air1.total_moles() > 0) && (air1.temperature>0))
+ var/pressure_delta = min(target_pressure - output_starting_pressure, (input_starting_pressure - output_starting_pressure)/2)
+ //Can not have a pressure delta that would cause output_pressure > input_pressure
- if(network1)
- network1.update = 1
+ var/transfer_moles = pressure_delta*air2.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
- if(network2)
- network2.update = 1
+ //Actually transfer the gas
+ var/datum/gas_mixture/removed = air1.remove(transfer_moles)
+ air2.merge(removed)
+ if(network1)
+ network1.update = 1
- //Radio remote control
+ if(network2)
+ network2.update = 1
- proc
- set_frequency(new_frequency)
- radio_controller.remove_object(src, frequency)
- frequency = new_frequency
- if(frequency)
- radio_connection = radio_controller.add_object(src, frequency, filter = RADIO_ATMOSIA)
+//Radio remote control
- broadcast_status()
- if(!radio_connection)
- return 0
+/obj/machinery/atmospherics/binary/passive_gate/proc/set_frequency(new_frequency)
+ radio_controller.remove_object(src, frequency)
+ frequency = new_frequency
+ if(frequency)
+ radio_connection = radio_controller.add_object(src, frequency, filter = RADIO_ATMOSIA)
- var/datum/signal/signal = new
- signal.transmission_method = 1 //radio signal
- signal.source = src
+/obj/machinery/atmospherics/binary/passive_gate/proc/broadcast_status()
+ if(!radio_connection)
+ return 0
- signal.data = list(
- "tag" = id,
- "device" = "AGP",
- "power" = on,
- "target_output" = target_pressure,
- "sigtype" = "status"
- )
+ var/datum/signal/signal = new
+ signal.transmission_method = 1 //radio signal
+ signal.source = src
- radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
+ signal.data = list(
+ "tag" = id,
+ "device" = "AGP",
+ "power" = on,
+ "target_output" = target_pressure,
+ "sigtype" = "status"
+ )
- return 1
+ radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
- interact(mob/user as mob)
- var/dat = {"Power: [on?"On":"Off"]
- Desirable output pressure:
- [round(target_pressure,0.1)]kPa | Change
- "}
+ return 1
- user << browse("[src.name] control[dat]", "window=atmo_pump")
- onclose(user, "atmo_pump")
+/obj/machinery/atmospherics/binary/passive_gate/interact(mob/user as mob)
+ var/dat = {"Power: [on?"On":"Off"]
+ Desirable output pressure:
+ [round(target_pressure,0.1)]kPa | Change
+ "}
- initialize()
- ..()
- if(frequency)
- set_frequency(frequency)
+ user << browse("[src.name] control[dat]", "window=atmo_pump")
+ onclose(user, "atmo_pump")
- receive_signal(datum/signal/signal)
- if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
- return 0
+/obj/machinery/atmospherics/binary/passive_gate/initialize()
+ ..()
+ if(frequency)
+ set_frequency(frequency)
- if("power" in signal.data)
- on = text2num(signal.data["power"])
+/obj/machinery/atmospherics/binary/passive_gate/receive_signal(datum/signal/signal)
+ if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
+ return 0
- if("power_toggle" in signal.data)
- on = !on
+ if("power" in signal.data)
+ on = text2num(signal.data["power"])
- if("set_output_pressure" in signal.data)
- target_pressure = between(
- 0,
- text2num(signal.data["set_output_pressure"]),
- ONE_ATMOSPHERE*50
- )
+ if("power_toggle" in signal.data)
+ on = !on
- if("status" in signal.data)
- spawn(2)
- broadcast_status()
- return //do not update_icon
+ if("set_output_pressure" in signal.data)
+ target_pressure = between(
+ 0,
+ text2num(signal.data["set_output_pressure"]),
+ ONE_ATMOSPHERE*50
+ )
+ if("status" in signal.data)
spawn(2)
broadcast_status()
- update_icon()
+ return //do not update_icon
+
+ spawn(2)
+ broadcast_status()
+ update_icon()
+ return
+
+/obj/machinery/atmospherics/binary/passive_gate/attack_hand(user as mob)
+ if(..())
return
-
-
-
- attack_hand(user as mob)
- if(..())
- return
- src.add_fingerprint(usr)
- if(!src.allowed(user))
- user << "\red Access denied."
- return
- usr.set_machine(src)
- interact(user)
+ src.add_fingerprint(usr)
+ if(!src.allowed(user))
+ user << "\red Access denied."
return
+ usr.set_machine(src)
+ interact(user)
+ return
- Topic(href,href_list)
- if(..()) return
- if(href_list["power"])
- on = !on
- if(href_list["set_press"])
- var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",src.target_pressure) as num
- src.target_pressure = max(0, min(4500, new_pressure))
- usr.set_machine(src)
- src.update_icon()
- src.updateUsrDialog()
- return
-
- power_change()
- ..()
- update_icon()
-
-
-
- attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
- if (!istype(W, /obj/item/weapon/wrench))
- return ..()
- if (on)
- user << "\red You cannot unwrench this [src], turn it off first."
- return 1
- var/turf/T = src.loc
- if (level==1 && isturf(T) && T.intact)
- user << "\red You must remove the plating first."
- return 1
- var/datum/gas_mixture/int_air = return_air()
- var/datum/gas_mixture/env_air = loc.return_air()
- if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
- user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
- add_fingerprint(user)
- return 1
- playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "\blue You begin to unfasten \the [src]..."
- if (do_after(user, 40))
- user.visible_message( \
- "[user] unfastens \the [src].", \
- "\blue You have unfastened \the [src].", \
- "You hear ratchet.")
- new /obj/item/pipe(loc, make_from=src)
- del(src)
+/obj/machinery/atmospherics/binary/passive_gate/Topic(href,href_list)
+ if(..()) return
+ if(href_list["power"])
+ on = !on
+ if(href_list["set_press"])
+ var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",src.target_pressure) as num
+ src.target_pressure = max(0, min(4500, new_pressure))
+ usr.set_machine(src)
+ src.update_icon()
+ src.updateUsrDialog()
+ return
+/obj/machinery/atmospherics/binary/passive_gate/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+ if (!istype(W, /obj/item/weapon/wrench))
+ return ..()
+ if (on)
+ user << "\red You cannot unwrench this [src], turn it off first."
+ return 1
+ var/datum/gas_mixture/int_air = return_air()
+ var/datum/gas_mixture/env_air = loc.return_air()
+ if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
+ user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+ add_fingerprint(user)
+ return 1
+ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+ user << "\blue You begin to unfasten \the [src]..."
+ if (do_after(user, 40))
+ user.visible_message( \
+ "[user] unfastens \the [src].", \
+ "\blue You have unfastened \the [src].", \
+ "You hear ratchet.")
+ new /obj/item/pipe(loc, make_from=src)
+ del(src)
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm
index 0a0a56fb74..b8e54e5bc8 100644
--- a/code/ATMOSPHERICS/components/binary_devices/pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm
@@ -12,9 +12,10 @@ Thus, the two variables affect pump operation are set in New():
but overall network volume is also increased as this increases...
*/
-obj/machinery/atmospherics/binary/pump
- icon = 'icons/obj/atmospherics/pump.dmi'
- icon_state = "intact_off"
+/obj/machinery/atmospherics/binary/pump
+ icon = 'icons/atmos/pump.dmi'
+ icon_state = "map"
+ level = 1
name = "Gas pump"
desc = "A pump"
@@ -26,180 +27,180 @@ obj/machinery/atmospherics/binary/pump
var/id = null
var/datum/radio_frequency/radio_connection
- highcap
- name = "High capacity gas pump"
- desc = "A high capacity pump"
+/obj/machinery/atmospherics/binary/pump/highcap
+ name = "High capacity gas pump"
+ desc = "A high capacity pump"
- target_pressure = 15000000
+ target_pressure = 15000000
- on
- on = 1
- icon_state = "intact_on"
+/obj/machinery/atmospherics/binary/pump/on
+ on = 1
- update_icon()
- if(stat & NOPOWER)
- icon_state = "intact_off"
- else if(node1 && node2)
- icon_state = "intact_[on?("on"):("off")]"
- else
- if(node1)
- icon_state = "exposed_1_off"
- else if(node2)
- icon_state = "exposed_2_off"
- else
- icon_state = "exposed_3_off"
- return
+/obj/machinery/atmospherics/binary/pump/update_icon()
+ if(!powered())
+ icon_state = "off"
+ else
+ icon_state = "[on ? "on" : "off"]"
- process()
-// ..()
- if(stat & (NOPOWER|BROKEN))
+/obj/machinery/atmospherics/binary/pump/update_underlays()
+ if(..())
+ underlays.Cut()
+ var/turf/T = get_turf(src)
+ if(!istype(T))
return
- if(!on)
- return 0
+ add_underlay(T, node1, turn(dir, -180))
+ add_underlay(T, node2, dir)
- var/output_starting_pressure = air2.return_pressure()
+/obj/machinery/atmospherics/binary/pump/hide(var/i)
+ update_underlays()
- if( (target_pressure - output_starting_pressure) < 0.01)
- //No need to pump gas if target is already reached!
- return 1
+/obj/machinery/atmospherics/binary/pump/process()
+// ..()
+ if(stat & (NOPOWER|BROKEN))
+ return
+ if(!on)
+ return 0
- //Calculate necessary moles to transfer using PV=nRT
- if((air1.total_moles() > 0) && (air1.temperature>0))
- var/pressure_delta = target_pressure - output_starting_pressure
- var/transfer_moles = pressure_delta*air2.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
-
- //Actually transfer the gas
- var/datum/gas_mixture/removed = air1.remove(transfer_moles)
- air2.merge(removed)
-
- if(network1)
- network1.update = 1
-
- if(network2)
- network2.update = 1
+ var/output_starting_pressure = air2.return_pressure()
+ if( (target_pressure - output_starting_pressure) < 0.01)
+ //No need to pump gas if target is already reached!
return 1
- //Radio remote control
+ //Calculate necessary moles to transfer using PV=nRT
+ if((air1.total_moles() > 0) && (air1.temperature>0))
+ var/pressure_delta = target_pressure - output_starting_pressure
+ var/transfer_moles = pressure_delta*air2.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
- proc
- set_frequency(new_frequency)
- radio_controller.remove_object(src, frequency)
- frequency = new_frequency
- if(frequency)
- radio_connection = radio_controller.add_object(src, frequency, filter = RADIO_ATMOSIA)
+ //Actually transfer the gas
+ var/datum/gas_mixture/removed = air1.remove(transfer_moles)
+ air2.merge(removed)
- broadcast_status()
- if(!radio_connection)
- return 0
+ if(network1)
+ network1.update = 1
- var/datum/signal/signal = new
- signal.transmission_method = 1 //radio signal
- signal.source = src
+ if(network2)
+ network2.update = 1
- signal.data = list(
- "tag" = id,
- "device" = "AGP",
- "power" = on,
- "target_output" = target_pressure,
- "sigtype" = "status"
- )
+ return 1
- radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
+//Radio remote control
- return 1
+/obj/machinery/atmospherics/binary/pump/proc/set_frequency(new_frequency)
+ radio_controller.remove_object(src, frequency)
+ frequency = new_frequency
+ if(frequency)
+ radio_connection = radio_controller.add_object(src, frequency, filter = RADIO_ATMOSIA)
- interact(mob/user as mob)
- var/dat = {"Power: [on?"On":"Off"]
- Desirable output pressure:
- [round(target_pressure,0.1)]kPa | Change
- "}
+/obj/machinery/atmospherics/binary/pump/proc/broadcast_status()
+ if(!radio_connection)
+ return 0
- user << browse("[src.name] control[dat]", "window=atmo_pump")
- onclose(user, "atmo_pump")
+ var/datum/signal/signal = new
+ signal.transmission_method = 1 //radio signal
+ signal.source = src
- initialize()
- ..()
- if(frequency)
- set_frequency(frequency)
+ signal.data = list(
+ "tag" = id,
+ "device" = "AGP",
+ "power" = on,
+ "target_output" = target_pressure,
+ "sigtype" = "status"
+ )
- receive_signal(datum/signal/signal)
- if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
- return 0
+ radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
- if("power" in signal.data)
- on = text2num(signal.data["power"])
+ return 1
- if("power_toggle" in signal.data)
- on = !on
+/obj/machinery/atmospherics/binary/pump/interact(mob/user as mob)
+ var/dat = {"Power: [on?"On":"Off"]
+ Desirable output pressure:
+ [round(target_pressure,0.1)]kPa | Change
+ "}
- if("set_output_pressure" in signal.data)
- target_pressure = between(
- 0,
- text2num(signal.data["set_output_pressure"]),
- ONE_ATMOSPHERE*50
- )
+ user << browse("[src.name] control[dat]", "window=atmo_pump")
+ onclose(user, "atmo_pump")
- if("status" in signal.data)
- spawn(2)
- broadcast_status()
- return //do not update_icon
+/obj/machinery/atmospherics/binary/pump/initialize()
+ ..()
+ if(frequency)
+ set_frequency(frequency)
+/obj/machinery/atmospherics/binary/pump/receive_signal(datum/signal/signal)
+ if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
+ return 0
+
+ if(signal.data["power"])
+ on = text2num(signal.data["power"])
+
+ if(signal.data["power_toggle"])
+ on = !on
+
+ if(signal.data["set_output_pressure"])
+ target_pressure = between(
+ 0,
+ text2num(signal.data["set_output_pressure"]),
+ ONE_ATMOSPHERE*50
+ )
+
+ if(signal.data["status"])
spawn(2)
broadcast_status()
- update_icon()
+ return //do not update_icon
+
+ spawn(2)
+ broadcast_status()
+ update_icon()
+ return
+
+
+/obj/machinery/atmospherics/binary/pump/attack_hand(user as mob)
+ if(..())
return
-
-
- attack_hand(user as mob)
- if(..())
- return
- src.add_fingerprint(usr)
- if(!src.allowed(user))
- user << "\red Access denied."
- return
- usr.set_machine(src)
- interact(user)
+ src.add_fingerprint(usr)
+ if(!src.allowed(user))
+ user << "\red Access denied."
return
+ usr.set_machine(src)
+ interact(user)
+ return
- Topic(href,href_list)
- if(..()) return
- if(href_list["power"])
- on = !on
- if(href_list["set_press"])
- var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",src.target_pressure) as num
- src.target_pressure = max(0, min(4500, new_pressure))
- usr.set_machine(src)
- src.update_icon()
- src.updateUsrDialog()
- return
+/obj/machinery/atmospherics/binary/pump/Topic(href,href_list)
+ if(..()) return
+ if(href_list["power"])
+ on = !on
+ if(href_list["set_press"])
+ var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",src.target_pressure) as num
+ src.target_pressure = max(0, min(4500, new_pressure))
+ usr.set_machine(src)
+ src.update_icon()
+ src.updateUsrDialog()
+ return
- power_change()
- ..()
+/obj/machinery/atmospherics/binary/pump/power_change()
+ var/old_stat = stat
+ ..()
+ if(old_stat != stat)
update_icon()
- attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
- if (!istype(W, /obj/item/weapon/wrench))
- return ..()
- if (!(stat & NOPOWER) && on)
- user << "\red You cannot unwrench this [src], turn it off first."
- return 1
- var/turf/T = src.loc
- if (level==1 && isturf(T) && T.intact)
- user << "\red You must remove the plating first."
- return 1
- var/datum/gas_mixture/int_air = return_air()
- var/datum/gas_mixture/env_air = loc.return_air()
- if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
- user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
- add_fingerprint(user)
- return 1
- playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "\blue You begin to unfasten \the [src]..."
- if (do_after(user, 40))
- user.visible_message( \
- "[user] unfastens \the [src].", \
- "\blue You have unfastened \the [src].", \
- "You hear ratchet.")
- new /obj/item/pipe(loc, make_from=src)
- del(src)
+/obj/machinery/atmospherics/binary/pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+ if (!istype(W, /obj/item/weapon/wrench))
+ return ..()
+ if (!(stat & NOPOWER) && on)
+ user << "\red You cannot unwrench this [src], turn it off first."
+ return 1
+ var/datum/gas_mixture/int_air = return_air()
+ var/datum/gas_mixture/env_air = loc.return_air()
+ if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
+ user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+ add_fingerprint(user)
+ return 1
+ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+ user << "\blue You begin to unfasten \the [src]..."
+ if (do_after(user, 40))
+ user.visible_message( \
+ "[user] unfastens \the [src].", \
+ "\blue You have unfastened \the [src].", \
+ "You hear ratchet.")
+ new /obj/item/pipe(loc, make_from=src)
+ del(src)
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
index e2dddfa97c..2f9d775bd5 100644
--- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
@@ -12,9 +12,10 @@ Thus, the two variables affect pump operation are set in New():
but overall network volume is also increased as this increases...
*/
-obj/machinery/atmospherics/binary/volume_pump
- icon = 'icons/obj/atmospherics/volume_pump.dmi'
- icon_state = "intact_off"
+/obj/machinery/atmospherics/binary/volume_pump
+ icon = 'icons/atmos/volume_pump.dmi'
+ icon_state = "map"
+ level = 1
name = "Volumetric gas pump"
desc = "A volumetric pump"
@@ -26,174 +27,167 @@ obj/machinery/atmospherics/binary/volume_pump
var/id = null
var/datum/radio_frequency/radio_connection
- on
- on = 1
- icon_state = "intact_on"
+/obj/machinery/atmospherics/binary/volume_pump/on
+ on = 1
- update_icon()
- if(stat & NOPOWER)
- icon_state = "intact_off"
- else if(node1 && node2)
- icon_state = "intact_[on?("on"):("off")]"
- else
- if(node1)
- icon_state = "exposed_1_off"
- else if(node2)
- icon_state = "exposed_2_off"
- else
- icon_state = "exposed_3_off"
- return
+/obj/machinery/atmospherics/binary/volume_pump/update_icon()
+ if(!powered())
+ icon_state = "off"
+ else
+ icon_state = "[on ? "on" : "off"]"
- process()
-// ..()
- if(stat & (NOPOWER|BROKEN))
+/obj/machinery/atmospherics/binary/volume_pump/update_underlays()
+ if(..())
+ underlays.Cut()
+ var/turf/T = get_turf(src)
+ if(!istype(T))
return
- if(!on)
- return 0
+ add_underlay(T, node1, turn(dir, -180))
+ add_underlay(T, node2, dir)
+
+/obj/machinery/atmospherics/binary/volume_pump/hide(var/i)
+ update_underlays()
+
+/obj/machinery/atmospherics/binary/volume_pump/process()
+// ..()
+ if(stat & (NOPOWER|BROKEN))
+ return
+ if(!on)
+ return 0
// Pump mechanism just won't do anything if the pressure is too high/too low
- var/input_starting_pressure = air1.return_pressure()
- var/output_starting_pressure = air2.return_pressure()
-
- if((input_starting_pressure < 0.01) || (output_starting_pressure > 9000))
- return 1
-
- var/transfer_ratio = max(1, transfer_rate/air1.volume)
-
- var/datum/gas_mixture/removed = air1.remove_ratio(transfer_ratio)
-
- air2.merge(removed)
-
- if(network1)
- network1.update = 1
-
- if(network2)
- network2.update = 1
+ var/input_starting_pressure = air1.return_pressure()
+ var/output_starting_pressure = air2.return_pressure()
+ if((input_starting_pressure < 0.01) || (output_starting_pressure > 9000))
return 1
- proc
- set_frequency(new_frequency)
- radio_controller.remove_object(src, frequency)
- frequency = new_frequency
- if(frequency)
- radio_connection = radio_controller.add_object(src, frequency)
+ var/transfer_ratio = max(1, transfer_rate/air1.volume)
- broadcast_status()
- if(!radio_connection)
- return 0
+ var/datum/gas_mixture/removed = air1.remove_ratio(transfer_ratio)
- var/datum/signal/signal = new
- signal.transmission_method = 1 //radio signal
- signal.source = src
+ air2.merge(removed)
- signal.data = list(
- "tag" = id,
- "device" = "APV",
- "power" = on,
- "transfer_rate" = transfer_rate,
- "sigtype" = "status"
- )
- radio_connection.post_signal(src, signal)
+ if(network1)
+ network1.update = 1
- return 1
+ if(network2)
+ network2.update = 1
- interact(mob/user as mob)
- var/dat = {"Power: [on?"On":"Off"]
- Desirable output flow:
- [round(transfer_rate,1)]l/s | Change
- "}
+ return 1
- user << browse("[src.name] control[dat]", "window=atmo_pump")
- onclose(user, "atmo_pump")
+/obj/machinery/atmospherics/binary/volume_pump/proc/set_frequency(new_frequency)
+ radio_controller.remove_object(src, frequency)
+ frequency = new_frequency
+ if(frequency)
+ radio_connection = radio_controller.add_object(src, frequency)
+/obj/machinery/atmospherics/binary/volume_pump/proc/broadcast_status()
+ if(!radio_connection)
+ return 0
+ var/datum/signal/signal = new
+ signal.transmission_method = 1 //radio signal
+ signal.source = src
- initialize()
- ..()
+ signal.data = list(
+ "tag" = id,
+ "device" = "APV",
+ "power" = on,
+ "transfer_rate" = transfer_rate,
+ "sigtype" = "status"
+ )
+ radio_connection.post_signal(src, signal)
- set_frequency(frequency)
+ return 1
- receive_signal(datum/signal/signal)
- if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
- return 0
+/obj/machinery/atmospherics/binary/volume_pump/interact(mob/user as mob)
+ var/dat = {"Power: [on?"On":"Off"]
+ Desirable output flow:
+ [round(transfer_rate,1)]l/s | Change
+ "}
- if("power" in signal.data)
- on = text2num(signal.data["power"])
+ user << browse("[src.name] control[dat]", "window=atmo_pump")
+ onclose(user, "atmo_pump")
- if("power_toggle" in signal.data)
- on = !on
+/obj/machinery/atmospherics/binary/volume_pump/initialize()
+ ..()
+ set_frequency(frequency)
- if("set_transfer_rate" in signal.data)
- transfer_rate = between(
- 0,
- text2num(signal.data["set_transfer_rate"]),
- air1.volume
- )
+/obj/machinery/atmospherics/binary/volume_pump/receive_signal(datum/signal/signal)
+ if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
+ return 0
- if("status" in signal.data)
- spawn(2)
- broadcast_status()
- return //do not update_icon
+ if(signal.data["power"])
+ on = text2num(signal.data["power"])
+ if(signal.data["power_toggle"])
+ on = !on
+
+ if(signal.data["set_transfer_rate"])
+ transfer_rate = between(
+ 0,
+ text2num(signal.data["set_transfer_rate"]),
+ air1.volume
+ )
+
+ if(signal.data["status"])
spawn(2)
broadcast_status()
+ return //do not update_icon
+
+ spawn(2)
+ broadcast_status()
+ update_icon()
+
+/obj/machinery/atmospherics/binary/volume_pump/attack_hand(user as mob)
+ if(..())
+ return
+ src.add_fingerprint(usr)
+ if(!src.allowed(user))
+ user << "\red Access denied."
+ return
+ usr.set_machine(src)
+ interact(user)
+ return
+
+/obj/machinery/atmospherics/binary/volume_pump/Topic(href,href_list)
+ if(..()) return
+ if(href_list["power"])
+ on = !on
+ if(href_list["set_transfer_rate"])
+ var/new_transfer_rate = input(usr,"Enter new output volume (0-200l/s)","Flow control",src.transfer_rate) as num
+ src.transfer_rate = max(0, min(200, new_transfer_rate))
+ usr.set_machine(src)
+ src.update_icon()
+ src.updateUsrDialog()
+ return
+
+/obj/machinery/atmospherics/binary/volume_pump/power_change()
+ var/old_stat = stat
+ ..()
+ if(old_stat != stat)
update_icon()
-
- attack_hand(user as mob)
- if(..())
- return
- src.add_fingerprint(usr)
- if(!src.allowed(user))
- user << "\red Access denied."
- return
- usr.set_machine(src)
- interact(user)
- return
-
- Topic(href,href_list)
- if(..()) return
- if(href_list["power"])
- on = !on
- if(href_list["set_transfer_rate"])
- var/new_transfer_rate = input(usr,"Enter new output volume (0-200l/s)","Flow control",src.transfer_rate) as num
- src.transfer_rate = max(0, min(200, new_transfer_rate))
- usr.set_machine(src)
- src.update_icon()
- src.updateUsrDialog()
- return
-
- power_change()
- ..()
- update_icon()
-
-
-
- attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
- if (!istype(W, /obj/item/weapon/wrench))
- return ..()
- if (!(stat & NOPOWER) && on)
- user << "\red You cannot unwrench this [src], turn it off first."
- return 1
- var/turf/T = src.loc
- if (level==1 && isturf(T) && T.intact)
- user << "\red You must remove the plating first."
- return 1
- var/datum/gas_mixture/int_air = return_air()
- var/datum/gas_mixture/env_air = loc.return_air()
- if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
- user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
- add_fingerprint(user)
- return 1
- playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "\blue You begin to unfasten \the [src]..."
- if (do_after(user, 40))
- user.visible_message( \
- "[user] unfastens \the [src].", \
- "\blue You have unfastened \the [src].", \
- "You hear ratchet.")
- new /obj/item/pipe(loc, make_from=src)
- del(src)
-
+/obj/machinery/atmospherics/binary/volume_pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+ if (!istype(W, /obj/item/weapon/wrench))
+ return ..()
+ if (!(stat & NOPOWER) && on)
+ user << "\red You cannot unwrench this [src], turn it off first."
+ return 1
+ var/datum/gas_mixture/int_air = return_air()
+ var/datum/gas_mixture/env_air = loc.return_air()
+ if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
+ user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+ add_fingerprint(user)
+ return 1
+ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+ user << "\blue You begin to unfasten \the [src]..."
+ if (do_after(user, 40))
+ user.visible_message( \
+ "[user] unfastens \the [src].", \
+ "\blue You have unfastened \the [src].", \
+ "You hear ratchet.")
+ new /obj/item/pipe(loc, make_from=src)
+ del(src)
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm b/code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm
index ae827881ad..b48c2f4033 100644
--- a/code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm
+++ b/code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm
@@ -11,33 +11,6 @@
#define ATM_P 6 //Phoron
#define ATM_N2O 7
-//--------------------------------------------
-// Omni device cached icon list
-//--------------------------------------------
-var/global/list/omni_icons[]
-
-/proc/gen_omni_icons()
- omni_icons = new()
- var/icon/omni = new('icons/obj/atmospherics/omni_devices.dmi')
-
- for(var/state in omni.IconStates())
- if(!state || findtext(state, "map"))
- continue
-
- var/image/I = image('icons/obj/atmospherics/omni_devices.dmi', icon_state = state)
-
- if(findtext(state, "pipe"))
- for(var/pipe_color in pipe_colors)
- I = image('icons/obj/atmospherics/omni_devices.dmi', icon_state = state)
- I.color = pipe_colors[pipe_color]
- var/cache_name = state
- if(I.color)
- cache_name += "_[pipe_colors[pipe_color]]"
- omni_icons[cache_name] = I
- else
- omni_icons[state] = I
-
-
//--------------------------------------------
// Omni port datum
//
@@ -83,16 +56,6 @@ var/global/list/omni_icons[]
// Need to find somewhere else for these
//--------------------------------------------
-#define PIPE_COLOR_RED "#ff0000"
-#define PIPE_COLOR_BLUE "#0000ff"
-#define PIPE_COLOR_CYAN "#00ffff"
-#define PIPE_COLOR_GREEN "#00ff00"
-#define PIPE_COLOR_YELLOW "#ffcc00"
-#define PIPE_COLOR_PURPLE "#5c1ec0"
-
-var/global/list/pipe_colors = list("grey" = null, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "purple" = PIPE_COLOR_PURPLE)
-
-
//returns a text string based on the direction flag input
// if capitalize is true, it will return the string capitalized
// otherwise it will return the direction string in lower case
diff --git a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm
index 0e46546a20..24c771f94d 100644
--- a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm
+++ b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm
@@ -3,10 +3,11 @@
//--------------------------------------------
/obj/machinery/atmospherics/omni
name = "omni device"
- icon = 'icons/obj/atmospherics/omni_devices.dmi'
+ icon = 'icons/atmos/omni_devices.dmi'
icon_state = "base"
use_power = 1
initialize_directions = 0
+ level = 1
var/on = 0
var/configuring = 0
@@ -70,12 +71,6 @@
update_icon()
/obj/machinery/atmospherics/omni/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
- if(istype(W, /obj/item/device/pipe_painter)) //for updating the color of connected pipe ends
- for(var/datum/omni_port/P in ports)
- P.update = 1
- update_ports()
- return
-
if(!istype(W, /obj/item/weapon/wrench))
return ..()
@@ -106,8 +101,8 @@
return
/obj/machinery/atmospherics/omni/proc/build_icons()
- if(!omni_icons)
- gen_omni_icons()
+ if(!check_icon_cache())
+ return
var/core_icon = null
if(istype(src, /obj/machinery/atmospherics/omni/mixer))
@@ -119,13 +114,16 @@
//directional icons are layers 1-4, with the core icon on layer 5
if(core_icon)
- overlays_off[5] = omni_icons[core_icon]
- overlays_on[5] = omni_icons[core_icon + "_glow"]
+ overlays_off[5] = icon_manager.get_atmos_icon("omni", , , core_icon)
+ overlays_on[5] = icon_manager.get_atmos_icon("omni", , , core_icon + "_glow")
- overlays_error[1] = omni_icons[core_icon]
- overlays_error[2] = omni_icons["error"]
+ overlays_error[1] = icon_manager.get_atmos_icon("omni", , , core_icon)
+ overlays_error[2] = icon_manager.get_atmos_icon("omni", , , "error")
/obj/machinery/atmospherics/omni/proc/update_port_icons()
+ if(!check_icon_cache())
+ return
+
for(var/datum/omni_port/P in ports)
if(P.update)
var/ref_layer = 0
@@ -145,11 +143,11 @@
var/list/port_icons = select_port_icons(P)
if(port_icons)
if(P.node)
- underlays_current[ref_layer] = omni_icons[port_icons["pipe_icon"]]
+ underlays_current[ref_layer] = port_icons["pipe_icon"]
else
underlays_current[ref_layer] = null
- overlays_off[ref_layer] = omni_icons[port_icons["off_icon"]]
- overlays_on[ref_layer] = omni_icons[port_icons["on_icon"]]
+ overlays_off[ref_layer] = port_icons["off_icon"]
+ overlays_on[ref_layer] = port_icons["on_icon"]
else
underlays_current[ref_layer] = null
overlays_off[ref_layer] = null
@@ -175,14 +173,29 @@
if(ATM_O2 to ATM_N2O)
ic_on += "_filter"
ic_off += "_out"
-
- var/pipe_state = ic_dir + "_pipe"
- if(P.node)
- if(P.node.color)
- pipe_state += "_[P.node.color]"
+ ic_on = icon_manager.get_atmos_icon("omni", , , ic_on)
+ ic_off = icon_manager.get_atmos_icon("omni", , , ic_off)
+
+ var/pipe_state
+ var/turf/T = get_turf(src)
+ if(!istype(T))
+ return
+ if(T.intact && istype(P.node, /obj/machinery/atmospherics/pipe) && P.node.level == 1 )
+ pipe_state = icon_manager.get_atmos_icon("underlay_down", P.dir, color_cache_name(P.node))
+ else
+ pipe_state = icon_manager.get_atmos_icon("underlay_intact", P.dir, color_cache_name(P.node))
+
return list("on_icon" = ic_on, "off_icon" = ic_off, "pipe_icon" = pipe_state)
+/obj/machinery/atmospherics/omni/update_underlays()
+ for(var/datum/omni_port/P in ports)
+ P.update = 1
+ update_ports()
+
+/obj/machinery/atmospherics/omni/hide(var/i)
+ update_underlays()
+
/obj/machinery/atmospherics/omni/proc/update_ports()
sort_ports()
update_port_icons()
diff --git a/code/ATMOSPHERICS/components/portables_connector.dm b/code/ATMOSPHERICS/components/portables_connector.dm
index 9ecc82b324..75d32718fa 100644
--- a/code/ATMOSPHERICS/components/portables_connector.dm
+++ b/code/ATMOSPHERICS/components/portables_connector.dm
@@ -1,6 +1,6 @@
/obj/machinery/atmospherics/portables_connector
- icon = 'icons/obj/atmospherics/portables_connector.dmi'
- icon_state = "intact"
+ icon = 'icons/atmos/connector.dmi'
+ icon_state = "map_connector"
name = "Connector Port"
desc = "For connecting portables devices related to atmospherics control."
@@ -16,142 +16,139 @@
var/on = 0
use_power = 0
- level = 0
+ level = 1
- New()
- initialize_directions = dir
- ..()
+/obj/machinery/atmospherics/portables_connector/New()
+ initialize_directions = dir
+ ..()
- update_icon()
- if(node)
- icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]intact"
- dir = get_dir(src, node)
- else
- icon_state = "exposed"
+/obj/machinery/atmospherics/portables_connector/update_icon()
+ icon_state = "connector"
+/obj/machinery/atmospherics/portables_connector/update_underlays()
+ if(..())
+ underlays.Cut()
+ var/turf/T = get_turf(src)
+ if(!istype(T))
+ return
+ add_underlay(T, node, dir)
+
+/obj/machinery/atmospherics/portables_connector/hide(var/i)
+ update_underlays()
+
+/obj/machinery/atmospherics/portables_connector/process()
+ ..()
+ if(!on)
return
-
- hide(var/i) //to make the little pipe section invisible, the icon changes.
- if(node)
- icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]intact"
- dir = get_dir(src, node)
- else
- icon_state = "exposed"
-
- process()
- ..()
- if(!on)
- return
- if(!connected_device)
- on = 0
- return
- if(network)
- network.update = 1
- return 1
+ if(!connected_device)
+ on = 0
+ return
+ if(network)
+ network.update = 1
+ return 1
// Housekeeping and pipe network stuff below
- network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
- if(reference == node)
- network = new_network
+/obj/machinery/atmospherics/portables_connector/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+ if(reference == node)
+ network = new_network
- if(new_network.normal_members.Find(src))
- return 0
+ if(new_network.normal_members.Find(src))
+ return 0
- new_network.normal_members += src
+ new_network.normal_members += src
- return null
+ return null
- Del()
- loc = null
+/obj/machinery/atmospherics/portables_connector/Del()
+ loc = null
- if(connected_device)
- connected_device.disconnect()
+ if(connected_device)
+ connected_device.disconnect()
- if(node)
- node.disconnect(src)
- del(network)
+ if(node)
+ node.disconnect(src)
+ del(network)
- node = null
+ node = null
- ..()
+ ..()
- initialize()
- if(node) return
+/obj/machinery/atmospherics/portables_connector/initialize()
+ if(node) return
- var/node_connect = dir
+ var/node_connect = dir
- for(var/obj/machinery/atmospherics/target in get_step(src,node_connect))
- if(target.initialize_directions & get_dir(target,src))
- node = target
- break
+ for(var/obj/machinery/atmospherics/target in get_step(src,node_connect))
+ if(target.initialize_directions & get_dir(target,src))
+ node = target
+ break
- update_icon()
+ update_icon()
+ update_underlays()
+/obj/machinery/atmospherics/portables_connector/build_network()
+ if(!network && node)
+ network = new /datum/pipe_network()
+ network.normal_members += src
+ network.build_network(node, src)
+
+
+/obj/machinery/atmospherics/portables_connector/return_network(obj/machinery/atmospherics/reference)
build_network()
- if(!network && node)
- network = new /datum/pipe_network()
- network.normal_members += src
- network.build_network(node, src)
+
+ if(reference==node)
+ return network
+
+ if(reference==connected_device)
+ return network
+
+ return null
+
+/obj/machinery/atmospherics/portables_connector/reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
+ if(network == old_network)
+ network = new_network
+
+ return 1
+
+/obj/machinery/atmospherics/portables_connector/return_network_air(datum/pipe_network/reference)
+ var/list/results = list()
+
+ if(connected_device)
+ results += connected_device.air_contents
+
+ return results
+
+/obj/machinery/atmospherics/portables_connector/disconnect(obj/machinery/atmospherics/reference)
+ if(reference==node)
+ del(network)
+ node = null
+
+ update_underlays()
+
+ return null
- return_network(obj/machinery/atmospherics/reference)
- build_network()
-
- if(reference==node)
- return network
-
- if(reference==connected_device)
- return network
-
- return null
-
- reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
- if(network == old_network)
- network = new_network
-
+/obj/machinery/atmospherics/portables_connector/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+ if (!istype(W, /obj/item/weapon/wrench))
+ return ..()
+ if (connected_device)
+ user << "\red You cannot unwrench this [src], dettach [connected_device] first."
return 1
-
- return_network_air(datum/pipe_network/reference)
- var/list/results = list()
-
- if(connected_device)
- results += connected_device.air_contents
-
- return results
-
- disconnect(obj/machinery/atmospherics/reference)
- if(reference==node)
- del(network)
- node = null
-
- return null
-
-
- attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
- if (!istype(W, /obj/item/weapon/wrench))
- return ..()
- if (connected_device)
- user << "\red You cannot unwrench this [src], dettach [connected_device] first."
- return 1
- if (locate(/obj/machinery/portable_atmospherics, src.loc))
- return 1
- var/turf/T = src.loc
- if (level==1 && isturf(T) && T.intact)
- user << "\red You must remove the plating first."
- return 1
- var/datum/gas_mixture/int_air = return_air()
- var/datum/gas_mixture/env_air = loc.return_air()
- if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
- user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
- add_fingerprint(user)
- return 1
- playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "\blue You begin to unfasten \the [src]..."
- if (do_after(user, 40))
- user.visible_message( \
- "[user] unfastens \the [src].", \
- "\blue You have unfastened \the [src].", \
- "You hear ratchet.")
- new /obj/item/pipe(loc, make_from=src)
- del(src)
+ if (locate(/obj/machinery/portable_atmospherics, src.loc))
+ return 1
+ var/datum/gas_mixture/int_air = return_air()
+ var/datum/gas_mixture/env_air = loc.return_air()
+ if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
+ user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+ add_fingerprint(user)
+ return 1
+ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+ user << "\blue You begin to unfasten \the [src]..."
+ if (do_after(user, 40))
+ user.visible_message( \
+ "[user] unfastens \the [src].", \
+ "\blue You have unfastened \the [src].", \
+ "You hear ratchet.")
+ new /obj/item/pipe(loc, make_from=src)
+ del(src)
diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
index 16a863a2e1..594190bdb8 100755
--- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
@@ -1,11 +1,11 @@
-obj/machinery/atmospherics/trinary/filter
- icon = 'icons/obj/atmospherics/filter.dmi'
- icon_state = "intact_off"
+/obj/machinery/atmospherics/trinary/filter
+ icon = 'icons/atmos/filter.dmi'
+ icon_state = "map"
density = 0
+ level = 1
name = "Gas filter"
- var/on = 0
var/temp = null // -- TLE
var/target_pressure = ONE_ATMOSPHERE
@@ -24,141 +24,159 @@ Filter types:
var/frequency = 0
var/datum/radio_frequency/radio_connection
- proc
- set_frequency(new_frequency)
- radio_controller.remove_object(src, frequency)
- frequency = new_frequency
- if(frequency)
- radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
+/obj/machinery/atmospherics/trinary/filter/proc/set_frequency(new_frequency)
+ radio_controller.remove_object(src, frequency)
+ frequency = new_frequency
+ if(frequency)
+ radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
- New()
- if(radio_controller)
- initialize()
- ..()
+/* I don't know why this is here, but it's ugly, so I'm disabling it
+/obj/machinery/atmospherics/trinary/filter/New()
+ ..()
+ if(radio_controller)
+ initialize()
+*/
+/obj/machinery/atmospherics/trinary/filter/update_icon()
+ if(istype(src, /obj/machinery/atmospherics/trinary/filter/m_filter))
+ icon_state = "m"
+ else
+ icon_state = ""
+
+ if(!powered())
+ icon_state += "off"
+ else if(node2 && node3 && node1)
+ icon_state += on ? "on" : "off"
+ else
+ icon_state += "off"
+ on = 0
- update_icon()
- if(stat & NOPOWER)
- icon_state = "intact_off"
- else if(node2 && node3 && node1)
- icon_state = "intact_[on?("on"):("off")]"
+/obj/machinery/atmospherics/trinary/filter/update_underlays()
+ if(..())
+ underlays.Cut()
+ var/turf/T = get_turf(src)
+ if(!istype(T))
+ return
+
+ add_underlay(T, node1, turn(dir, -180))
+
+ if(istype(src, /obj/machinery/atmospherics/trinary/filter/m_filter))
+ add_underlay(T, node2, turn(dir, 90))
else
- icon_state = "intact_off"
- on = 0
+ add_underlay(T, node2, turn(dir, -90))
- return
+ add_underlay(T, node3, dir)
- power_change()
- var/old_stat = stat
- ..()
- if(old_stat != stat)
- update_icon()
+/obj/machinery/atmospherics/trinary/filter/hide(var/i)
+ update_underlays()
- process()
- ..()
- if(!on)
- return 0
+/obj/machinery/atmospherics/trinary/filter/power_change()
+ var/old_stat = stat
+ ..()
+ if(old_stat != stat)
+ update_icon()
- var/output_starting_pressure = air3.return_pressure()
+/obj/machinery/atmospherics/trinary/filter/process()
+ ..()
+ if(!on)
+ return 0
- if(output_starting_pressure >= target_pressure || air2.return_pressure() >= target_pressure )
- //No need to mix if target is already full!
- return 1
-
- //Calculate necessary moles to transfer using PV=nRT
-
- var/pressure_delta = target_pressure - output_starting_pressure
- var/transfer_moles
-
- if(air1.temperature > 0)
- transfer_moles = pressure_delta*air3.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
-
- //Actually transfer the gas
-
- if(transfer_moles > 0)
- var/datum/gas_mixture/removed = air1.remove(transfer_moles)
-
- if(!removed)
- return
- var/datum/gas_mixture/filtered_out = new
- filtered_out.temperature = removed.temperature
-
- switch(filter_type)
- if(0) //removing hydrocarbons
- filtered_out.phoron = removed.phoron
- removed.phoron = 0
-
- if(removed.trace_gases.len>0)
- for(var/datum/gas/trace_gas in removed.trace_gases)
- if(istype(trace_gas, /datum/gas/oxygen_agent_b))
- removed.trace_gases -= trace_gas
- filtered_out.trace_gases += trace_gas
-
- if(1) //removing O2
- filtered_out.oxygen = removed.oxygen
- removed.oxygen = 0
-
- if(2) //removing N2
- filtered_out.nitrogen = removed.nitrogen
- removed.nitrogen = 0
-
- if(3) //removing CO2
- filtered_out.carbon_dioxide = removed.carbon_dioxide
- removed.carbon_dioxide = 0
-
- if(4)//removing N2O
- if(removed.trace_gases.len>0)
- for(var/datum/gas/trace_gas in removed.trace_gases)
- if(istype(trace_gas, /datum/gas/sleeping_agent))
- removed.trace_gases -= trace_gas
- filtered_out.trace_gases += trace_gas
-
- else
- filtered_out = null
-
-
- air2.merge(filtered_out)
- air3.merge(removed)
-
- if(network2)
- network2.update = 1
-
- if(network3)
- network3.update = 1
-
- if(network1)
- network1.update = 1
+ var/output_starting_pressure = air3.return_pressure()
+ if(output_starting_pressure >= target_pressure || air2.return_pressure() >= target_pressure )
+ //No need to mix if target is already full!
return 1
- initialize()
- set_frequency(frequency)
- ..()
+ //Calculate necessary moles to transfer using PV=nRT
- attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
- if (!istype(W, /obj/item/weapon/wrench))
- return ..()
- var/turf/T = src.loc
- if (level==1 && isturf(T) && T.intact)
- user << "\red You must remove the plating first."
- return 1
- var/datum/gas_mixture/int_air = return_air()
- var/datum/gas_mixture/env_air = loc.return_air()
- if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
- user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
- add_fingerprint(user)
- return 1
- playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "\blue You begin to unfasten \the [src]..."
- if (do_after(user, 40))
- user.visible_message( \
- "[user] unfastens \the [src].", \
- "\blue You have unfastened \the [src].", \
- "You hear ratchet.")
- new /obj/item/pipe(loc, make_from=src)
- del(src)
+ var/pressure_delta = target_pressure - output_starting_pressure
+ var/transfer_moles
+
+ if(air1.temperature > 0)
+ transfer_moles = pressure_delta*air3.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
+
+ //Actually transfer the gas
+
+ if(transfer_moles > 0)
+ var/datum/gas_mixture/removed = air1.remove(transfer_moles)
+
+ if(!removed)
+ return
+ var/datum/gas_mixture/filtered_out = new
+ filtered_out.temperature = removed.temperature
+
+ switch(filter_type)
+ if(0) //removing hydrocarbons
+ filtered_out.phoron = removed.phoron
+ removed.phoron = 0
+
+ if(removed.trace_gases.len>0)
+ for(var/datum/gas/trace_gas in removed.trace_gases)
+ if(istype(trace_gas, /datum/gas/oxygen_agent_b))
+ removed.trace_gases -= trace_gas
+ filtered_out.trace_gases += trace_gas
+
+ if(1) //removing O2
+ filtered_out.oxygen = removed.oxygen
+ removed.oxygen = 0
+
+ if(2) //removing N2
+ filtered_out.nitrogen = removed.nitrogen
+ removed.nitrogen = 0
+
+ if(3) //removing CO2
+ filtered_out.carbon_dioxide = removed.carbon_dioxide
+ removed.carbon_dioxide = 0
+
+ if(4)//removing N2O
+ if(removed.trace_gases.len>0)
+ for(var/datum/gas/trace_gas in removed.trace_gases)
+ if(istype(trace_gas, /datum/gas/sleeping_agent))
+ removed.trace_gases -= trace_gas
+ filtered_out.trace_gases += trace_gas
+
+ else
+ filtered_out = null
-obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE
+ air2.merge(filtered_out)
+ air3.merge(removed)
+
+ if(network2)
+ network2.update = 1
+
+ if(network3)
+ network3.update = 1
+
+ if(network1)
+ network1.update = 1
+
+ return 1
+
+/obj/machinery/atmospherics/trinary/filter/initialize()
+ set_frequency(frequency)
+ ..()
+
+/obj/machinery/atmospherics/trinary/filter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+ if (!istype(W, /obj/item/weapon/wrench))
+ return ..()
+ var/datum/gas_mixture/int_air = return_air()
+ var/datum/gas_mixture/env_air = loc.return_air()
+ if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
+ user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+ add_fingerprint(user)
+ return 1
+ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+ user << "\blue You begin to unfasten \the [src]..."
+ if (do_after(user, 40))
+ user.visible_message( \
+ "[user] unfastens \the [src].", \
+ "\blue You have unfastened \the [src].", \
+ "You hear ratchet.")
+ new /obj/item/pipe(loc, make_from=src)
+ del(src)
+
+
+/obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE
if(..())
return
@@ -211,7 +229,7 @@ obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE
onclose(user, "atmo_filter")
return
-obj/machinery/atmospherics/trinary/filter/Topic(href, href_list) // -- TLE
+/obj/machinery/atmospherics/trinary/filter/Topic(href, href_list) // -- TLE
if(..())
return
usr.set_machine(src)
@@ -234,9 +252,8 @@ obj/machinery/atmospherics/trinary/filter/Topic(href, href_list) // -- TLE
*/
return
-obj/machinery/atmospherics/trinary/filter/m_filter
- icon = 'icons/obj/atmospherics/m_filter.dmi'
- icon_state = "intact_off"
+/obj/machinery/atmospherics/trinary/filter/m_filter
+ icon_state = "mmap"
dir = SOUTH
initialize_directions = SOUTH|NORTH|EAST
@@ -253,7 +270,9 @@ obj/machinery/atmospherics/trinary/filter/m_filter/New()
if(WEST)
initialize_directions = WEST|SOUTH|EAST
-obj/machinery/atmospherics/trinary/filter/m_filter/initialize()
+/obj/machinery/atmospherics/trinary/filter/m_filter/initialize()
+ set_frequency(frequency)
+
if(node1 && node2 && node3) return
var/node1_connect = turn(dir, -180)
@@ -276,3 +295,4 @@ obj/machinery/atmospherics/trinary/filter/m_filter/initialize()
break
update_icon()
+ update_underlays()
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
index 4d94acbfba..228be72020 100644
--- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
@@ -1,169 +1,190 @@
-obj/machinery/atmospherics/trinary/mixer
- icon = 'icons/obj/atmospherics/mixer.dmi'
- icon_state = "intact_off"
+/obj/machinery/atmospherics/trinary/mixer
+ icon = 'icons/atmos/mixer.dmi'
+ icon_state = "map"
density = 0
+ level = 1
name = "Gas mixer"
- var/on = 0
-
var/target_pressure = ONE_ATMOSPHERE
var/node1_concentration = 0.5
var/node2_concentration = 0.5
//node 3 is the outlet, nodes 1 & 2 are intakes
- update_icon()
- if(stat & NOPOWER)
- icon_state = "intact_off"
- else if(node2 && node3 && node1)
- icon_state = "intact_[on?("on"):("off")]"
+/obj/machinery/atmospherics/trinary/mixer/update_icon(var/safety = 0)
+ if(istype(src, /obj/machinery/atmospherics/trinary/mixer/m_mixer))
+ icon_state = "m"
+ else if(istype(src, /obj/machinery/atmospherics/trinary/mixer/t_mixer))
+ icon_state = "t"
+ else
+ icon_state = ""
+
+ if(!powered())
+ icon_state += "off"
+ else if(node2 && node3 && node1)
+ icon_state += on ? "on" : "off"
+ else
+ icon_state += "off"
+ on = 0
+
+/obj/machinery/atmospherics/trinary/mixer/update_underlays()
+ if(..())
+ underlays.Cut()
+ var/turf/T = get_turf(src)
+ if(!istype(T))
+ return
+
+ if(istype(src, /obj/machinery/atmospherics/trinary/mixer/t_mixer))
+ add_underlay(T, node1, turn(dir, -90))
else
- icon_state = "intact_off"
- on = 0
+ add_underlay(T, node1, turn(dir, -180))
- return
+ if(istype(src, /obj/machinery/atmospherics/trinary/mixer/m_mixer) || istype(src, /obj/machinery/atmospherics/trinary/mixer/t_mixer))
+ add_underlay(T, node2, turn(dir, 90))
+ else
+ add_underlay(T, node2, turn(dir, -90))
- power_change()
- var/old_stat = stat
- ..()
- if(old_stat != stat)
- update_icon()
+ add_underlay(T, node3, dir)
- New()
- ..()
- air3.volume = 300
+/obj/machinery/atmospherics/trinary/mixer/hide(var/i)
+ update_underlays()
- process()
- ..()
- if(!on)
- return 0
+/obj/machinery/atmospherics/trinary/mixer/power_change()
+ var/old_stat = stat
+ ..()
+ if(old_stat != stat)
+ update_icon()
- var/output_starting_pressure = air3.return_pressure()
+/obj/machinery/atmospherics/trinary/mixer/New()
+ ..()
+ air3.volume = 300
- if(output_starting_pressure >= target_pressure)
- //No need to mix if target is already full!
- return 1
+/obj/machinery/atmospherics/trinary/mixer/process()
+ ..()
+ if(!on)
+ return 0
- //Calculate necessary moles to transfer using PV=nRT
-
- var/pressure_delta = target_pressure - output_starting_pressure
- var/transfer_moles1 = 0
- var/transfer_moles2 = 0
-
- if(air1.temperature > 0)
- transfer_moles1 = (node1_concentration*pressure_delta)*air3.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
-
- if(air2.temperature > 0)
- transfer_moles2 = (node2_concentration*pressure_delta)*air3.volume/(air2.temperature * R_IDEAL_GAS_EQUATION)
-
- var/air1_moles = air1.total_moles()
- var/air2_moles = air2.total_moles()
-
- if((air1_moles < transfer_moles1) || (air2_moles < transfer_moles2))
- if(!transfer_moles1 || !transfer_moles2) return
- var/ratio = min(air1_moles/transfer_moles1, air2_moles/transfer_moles2)
-
- transfer_moles1 *= ratio
- transfer_moles2 *= ratio
-
- //Actually transfer the gas
-
- if(transfer_moles1 > 0)
- var/datum/gas_mixture/removed1 = air1.remove(transfer_moles1)
- air3.merge(removed1)
-
- if(transfer_moles2 > 0)
- var/datum/gas_mixture/removed2 = air2.remove(transfer_moles2)
- air3.merge(removed2)
-
- if(network1 && transfer_moles1)
- network1.update = 1
-
- if(network2 && transfer_moles2)
- network2.update = 1
-
- if(network3)
- network3.update = 1
+ var/output_starting_pressure = air3.return_pressure()
+ if(output_starting_pressure >= target_pressure)
+ //No need to mix if target is already full!
return 1
- attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
- if (!istype(W, /obj/item/weapon/wrench))
- return ..()
- var/turf/T = src.loc
- if (level==1 && isturf(T) && T.intact)
- user << "\red You must remove the plating first."
- return 1
- var/datum/gas_mixture/int_air = return_air()
- var/datum/gas_mixture/env_air = loc.return_air()
- if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
- user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
- add_fingerprint(user)
- return 1
- playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "\blue You begin to unfasten \the [src]..."
- if (do_after(user, 40))
- user.visible_message( \
- "[user] unfastens \the [src].", \
- "\blue You have unfastened \the [src].", \
- "You hear ratchet.")
- new /obj/item/pipe(loc, make_from=src)
- del(src)
+ //Calculate necessary moles to transfer using PV=nRT
- attack_hand(user as mob)
- if(..())
- return
- src.add_fingerprint(usr)
- if(!src.allowed(user))
- user << "\red Access denied."
- return
- usr.set_machine(src)
- var/dat = {"Power: [on?"On":"Off"]
- Desirable output pressure:
- [target_pressure]kPa | Change
-
- Node 1 Concentration:
- -
- -
- [node1_concentration]([node1_concentration*100]%)
- +
- +
-
- Node 2 Concentration:
- -
- -
- [node2_concentration]([node2_concentration*100]%)
- +
- +
- "}
+ var/pressure_delta = target_pressure - output_starting_pressure
+ var/transfer_moles1 = 0
+ var/transfer_moles2 = 0
- user << browse("[src.name] control[dat]", "window=atmo_mixer")
- onclose(user, "atmo_mixer")
+ if(air1.temperature > 0)
+ transfer_moles1 = (node1_concentration*pressure_delta)*air3.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
+
+ if(air2.temperature > 0)
+ transfer_moles2 = (node2_concentration*pressure_delta)*air3.volume/(air2.temperature * R_IDEAL_GAS_EQUATION)
+
+ var/air1_moles = air1.total_moles()
+ var/air2_moles = air2.total_moles()
+
+ if((air1_moles < transfer_moles1) || (air2_moles < transfer_moles2))
+ if(!transfer_moles1 || !transfer_moles2) return
+ var/ratio = min(air1_moles/transfer_moles1, air2_moles/transfer_moles2)
+
+ transfer_moles1 *= ratio
+ transfer_moles2 *= ratio
+
+ //Actually transfer the gas
+
+ if(transfer_moles1 > 0)
+ var/datum/gas_mixture/removed1 = air1.remove(transfer_moles1)
+ air3.merge(removed1)
+
+ if(transfer_moles2 > 0)
+ var/datum/gas_mixture/removed2 = air2.remove(transfer_moles2)
+ air3.merge(removed2)
+
+ if(network1 && transfer_moles1)
+ network1.update = 1
+
+ if(network2 && transfer_moles2)
+ network2.update = 1
+
+ if(network3)
+ network3.update = 1
+
+ return 1
+
+/obj/machinery/atmospherics/trinary/mixer/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+ if (!istype(W, /obj/item/weapon/wrench))
+ return ..()
+ var/datum/gas_mixture/int_air = return_air()
+ var/datum/gas_mixture/env_air = loc.return_air()
+ if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
+ user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+ add_fingerprint(user)
+ return 1
+ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+ user << "\blue You begin to unfasten \the [src]..."
+ if (do_after(user, 40))
+ user.visible_message( \
+ "[user] unfastens \the [src].", \
+ "\blue You have unfastened \the [src].", \
+ "You hear ratchet.")
+ new /obj/item/pipe(loc, make_from=src)
+ del(src)
+
+/obj/machinery/atmospherics/trinary/mixer/attack_hand(user as mob)
+ if(..())
return
-
- Topic(href,href_list)
- if(..()) return
- if(href_list["power"])
- on = !on
- if(href_list["set_press"])
- var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",src.target_pressure) as num
- src.target_pressure = max(0, min(4500, new_pressure))
- if(href_list["node1_c"])
- var/value = text2num(href_list["node1_c"])
- src.node1_concentration = max(0, min(1, src.node1_concentration + value))
- src.node2_concentration = max(0, min(1, src.node2_concentration - value))
- if(href_list["node2_c"])
- var/value = text2num(href_list["node2_c"])
- src.node2_concentration = max(0, min(1, src.node2_concentration + value))
- src.node1_concentration = max(0, min(1, src.node1_concentration - value))
- src.update_icon()
- src.updateUsrDialog()
+ src.add_fingerprint(usr)
+ if(!src.allowed(user))
+ user << "\red Access denied."
return
+ usr.set_machine(src)
+ var/dat = {"Power: [on?"On":"Off"]
+ Desirable output pressure:
+ [target_pressure]kPa | Change
+
+ Node 1 Concentration:
+ -
+ -
+ [node1_concentration]([node1_concentration*100]%)
+ +
+ +
+
+ Node 2 Concentration:
+ -
+ -
+ [node2_concentration]([node2_concentration*100]%)
+ +
+ +
+ "}
+
+ user << browse("[src.name] control[dat]", "window=atmo_mixer")
+ onclose(user, "atmo_mixer")
+ return
+
+/obj/machinery/atmospherics/trinary/mixer/Topic(href,href_list)
+ if(..()) return
+ if(href_list["power"])
+ on = !on
+ if(href_list["set_press"])
+ var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",src.target_pressure) as num
+ src.target_pressure = max(0, min(4500, new_pressure))
+ if(href_list["node1_c"])
+ var/value = text2num(href_list["node1_c"])
+ src.node1_concentration = max(0, min(1, src.node1_concentration + value))
+ src.node2_concentration = max(0, min(1, src.node2_concentration - value))
+ if(href_list["node2_c"])
+ var/value = text2num(href_list["node2_c"])
+ src.node2_concentration = max(0, min(1, src.node2_concentration + value))
+ src.node1_concentration = max(0, min(1, src.node1_concentration - value))
+ src.update_icon()
+ src.updateUsrDialog()
+ return
obj/machinery/atmospherics/trinary/mixer/t_mixer
- icon = 'icons/obj/atmospherics/t_mixer.dmi'
- icon_state = "intact_off"
+ icon_state = "tmap"
dir = SOUTH
initialize_directions = SOUTH|EAST|WEST
@@ -205,10 +226,10 @@ obj/machinery/atmospherics/trinary/mixer/t_mixer/initialize()
break
update_icon()
+ update_underlays()
obj/machinery/atmospherics/trinary/mixer/m_mixer
- icon = 'icons/obj/atmospherics/m_mixer.dmi'
- icon_state = "intact_off"
+ icon_state = "mmap"
dir = SOUTH
initialize_directions = SOUTH|NORTH|EAST
@@ -249,4 +270,5 @@ obj/machinery/atmospherics/trinary/mixer/m_mixer/initialize()
node3 = target
break
- update_icon()
\ No newline at end of file
+ update_icon()
+ update_underlays()
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
index d3f1116a43..655e58ea38 100644
--- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
@@ -2,6 +2,8 @@ obj/machinery/atmospherics/trinary
dir = SOUTH
initialize_directions = SOUTH|NORTH|WEST
use_power = 1
+
+ var/on = 0
var/datum/gas_mixture/air1
var/datum/gas_mixture/air2
@@ -94,6 +96,7 @@ obj/machinery/atmospherics/trinary
break
update_icon()
+ update_underlays()
build_network()
if(!network1 && node1)
@@ -160,5 +163,7 @@ obj/machinery/atmospherics/trinary
else if(reference==node3)
del(network3)
node3 = null
+
+ update_underlays()
return null
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/tvalve.dm b/code/ATMOSPHERICS/components/tvalve.dm
index 83f592c315..603feb0294 100644
--- a/code/ATMOSPHERICS/components/tvalve.dm
+++ b/code/ATMOSPHERICS/components/tvalve.dm
@@ -1,10 +1,11 @@
-obj/machinery/atmospherics/tvalve
- icon = 'icons/obj/atmospherics/valve.dmi'
- icon_state = "tvalve0"
+/obj/machinery/atmospherics/tvalve
+ icon = 'icons/atmos/tvalve.dmi'
+ icon_state = "map_tvalve0"
name = "manual switching valve"
desc = "A pipe valve"
+ level = 1
dir = SOUTH
initialize_directions = SOUTH|NORTH|WEST
@@ -19,415 +20,466 @@ obj/machinery/atmospherics/tvalve
var/datum/pipe_network/network_node2
var/datum/pipe_network/network_node3
- update_icon(animation)
- if(animation)
- flick("tvalve[src.state][!src.state]",src)
+/obj/machinery/atmospherics/tvalve/bypass
+ icon_state = "map_tvalve1"
+ state = 1
+
+/obj/machinery/atmospherics/tvalve/update_icon(animation)
+ if(animation)
+ flick("tvalve[src.state][!src.state]",src)
+ else
+ icon_state = "tvalve[state]"
+
+/obj/machinery/atmospherics/tvalve/update_underlays()
+ if(..())
+ underlays.Cut()
+ var/turf/T = get_turf(src)
+ if(!istype(T))
+ return
+ add_underlay(T, node1, turn(dir, -180))
+
+ if(istype(src, /obj/machinery/atmospherics/tvalve/mirrored))
+ add_underlay(T, node2, turn(dir, 90))
else
- icon_state = "tvalve[state]"
+ add_underlay(T, node2, turn(dir, -90))
+
+ add_underlay(T, node3, dir)
- New()
- initialize_directions()
- ..()
-
- proc/initialize_directions()
- switch(dir)
- if(NORTH)
- initialize_directions = SOUTH|NORTH|EAST
- if(SOUTH)
- initialize_directions = NORTH|SOUTH|WEST
- if(EAST)
- initialize_directions = WEST|EAST|SOUTH
- if(WEST)
- initialize_directions = EAST|WEST|NORTH
-
- network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
- if(reference == node1)
- network_node1 = new_network
- if(state)
- network_node2 = new_network
- else
- network_node3 = new_network
- else if(reference == node2)
- network_node2 = new_network
- if(state)
- network_node1 = new_network
- else if(reference == node3)
- network_node3 = new_network
- if(!state)
- network_node1 = new_network
-
- if(new_network.normal_members.Find(src))
- return 0
-
- new_network.normal_members += src
-
- if(state)
- if(reference == node1)
- if(node2)
- return node2.network_expand(new_network, src)
- else if(reference == node2)
- if(node1)
- return node1.network_expand(new_network, src)
- else
- if(reference == node1)
- if(node3)
- return node3.network_expand(new_network, src)
- else if(reference == node3)
- if(node1)
- return node1.network_expand(new_network, src)
-
- return null
-
- Del()
- loc = null
-
- if(node1)
- node1.disconnect(src)
- del(network_node1)
- if(node2)
- node2.disconnect(src)
- del(network_node2)
- if(node3)
- node3.disconnect(src)
- del(network_node3)
-
- node1 = null
- node2 = null
- node3 = null
-
- ..()
-
- proc/go_to_side()
-
- if(state) return 0
-
- state = 1
- update_icon()
-
- if(network_node1)
- del(network_node1)
- if(network_node3)
- del(network_node3)
- build_network()
-
- if(network_node1&&network_node2)
- network_node1.merge(network_node2)
- network_node2 = network_node1
-
- if(network_node1)
- network_node1.update = 1
- else if(network_node2)
- network_node2.update = 1
-
- return 1
-
- proc/go_straight()
-
- if(!state)
- return 0
-
- state = 0
- update_icon()
-
- if(network_node1)
- del(network_node1)
- if(network_node2)
- del(network_node2)
- build_network()
-
- if(network_node1&&network_node3)
- network_node1.merge(network_node3)
- network_node3 = network_node1
-
- if(network_node1)
- network_node1.update = 1
- else if(network_node3)
- network_node3.update = 1
-
- return 1
-
- attack_ai(mob/user as mob)
- return
-
- attack_paw(mob/user as mob)
- return attack_hand(user)
-
- attack_hand(mob/user as mob)
- src.add_fingerprint(usr)
- update_icon(1)
- sleep(10)
- if (src.state)
- src.go_straight()
- else
- src.go_to_side()
-
- process()
- ..()
- machines.Remove(src)
-
-/* if(open && (!node1 || !node2))
- close()
- if(!node1)
- if(!nodealert)
- //world << "Missing node from [src] at [src.x],[src.y],[src.z]"
- nodealert = 1
- else if (!node2)
- if(!nodealert)
- //world << "Missing node from [src] at [src.x],[src.y],[src.z]"
- nodealert = 1
- else if (nodealert)
- nodealert = 0
-*/
-
- return
-
- initialize()
- var/node1_dir
- var/node2_dir
- var/node3_dir
-
- node1_dir = turn(dir, 180)
- node2_dir = turn(dir, -90)
- node3_dir = dir
-
- for(var/obj/machinery/atmospherics/target in get_step(src,node1_dir))
- if(target.initialize_directions & get_dir(target,src))
- node1 = target
- break
- for(var/obj/machinery/atmospherics/target in get_step(src,node2_dir))
- if(target.initialize_directions & get_dir(target,src))
- node2 = target
- break
- for(var/obj/machinery/atmospherics/target in get_step(src,node3_dir))
- if(target.initialize_directions & get_dir(target,src))
- node3 = target
- break
-
- build_network()
- if(!network_node1 && node1)
- network_node1 = new /datum/pipe_network()
- network_node1.normal_members += src
- network_node1.build_network(node1, src)
-
- if(!network_node2 && node2)
- network_node2 = new /datum/pipe_network()
- network_node2.normal_members += src
- network_node2.build_network(node2, src)
-
- if(!network_node3 && node3)
- network_node3 = new /datum/pipe_network()
- network_node3.normal_members += src
- network_node3.build_network(node3, src)
-
-
- return_network(obj/machinery/atmospherics/reference)
- build_network()
-
- if(reference==node1)
- return network_node1
-
- if(reference==node2)
- return network_node2
-
- if(reference==node3)
- return network_node3
-
- return null
-
- reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
- if(network_node1 == old_network)
- network_node1 = new_network
- if(network_node2 == old_network)
- network_node2 = new_network
- if(network_node3 == old_network)
- network_node3 = new_network
-
- return 1
-
- return_network_air(datum/network/reference)
- return null
-
- disconnect(obj/machinery/atmospherics/reference)
- if(reference==node1)
- del(network_node1)
- node1 = null
-
- else if(reference==node2)
- del(network_node2)
- node2 = null
-
- else if(reference==node3)
- del(network_node3)
- node2 = null
-
- return null
-
- digital // can be controlled by AI
- name = "digital switching valve"
- desc = "A digitally controlled valve."
- icon = 'icons/obj/atmospherics/digital_valve.dmi'
-
- attack_ai(mob/user as mob)
- return src.attack_hand(user)
-
- attack_hand(mob/user as mob)
- if(!src.allowed(user))
- user << "\red Access denied."
- return
- ..()
-
- //Radio remote control
-
- proc
- set_frequency(new_frequency)
- radio_controller.remove_object(src, frequency)
- frequency = new_frequency
- if(frequency)
- radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
-
- var/frequency = 0
- var/id = null
- var/datum/radio_frequency/radio_connection
-
- initialize()
- ..()
- if(frequency)
- set_frequency(frequency)
-
- receive_signal(datum/signal/signal)
- if(!signal.data["tag"] || (signal.data["tag"] != id))
- return 0
-
- switch(signal.data["command"])
- if("valve_open")
- if(!state)
- go_to_side()
-
- if("valve_close")
- if(state)
- go_straight()
-
- if("valve_toggle")
- if(state)
- go_straight()
- else
- go_to_side()
-
- attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
- if (!istype(W, /obj/item/weapon/wrench))
- return ..()
- if (istype(src, /obj/machinery/atmospherics/tvalve/digital))
- user << "\red You cannot unwrench this [src], it's too complicated."
- return 1
- var/turf/T = src.loc
- if (level==1 && isturf(T) && T.intact)
- user << "\red You must remove the plating first."
- return 1
- var/datum/gas_mixture/int_air = return_air()
- var/datum/gas_mixture/env_air = loc.return_air()
- if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
- user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
- add_fingerprint(user)
- return 1
- playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "\blue You begin to unfasten \the [src]..."
- if (do_after(user, 40))
- user.visible_message( \
- "[user] unfastens \the [src].", \
- "\blue You have unfastened \the [src].", \
- "You hear ratchet.")
- new /obj/item/pipe(loc, make_from=src)
- del(src)
-
-obj/machinery/atmospherics/tvalve/mirrored
- icon_state = "tvalvem0"
+/obj/machinery/atmospherics/tvalve/hide(var/i)
+ update_underlays()
+/obj/machinery/atmospherics/tvalve/New()
initialize_directions()
- switch(dir)
- if(NORTH)
- initialize_directions = SOUTH|NORTH|WEST
- if(SOUTH)
- initialize_directions = NORTH|SOUTH|EAST
- if(EAST)
- initialize_directions = WEST|EAST|NORTH
- if(WEST)
- initialize_directions = EAST|WEST|SOUTH
+ ..()
- initialize()
- var/node1_dir
- var/node2_dir
- var/node3_dir
+/obj/machinery/atmospherics/tvalve/proc/initialize_directions()
+ switch(dir)
+ if(NORTH)
+ initialize_directions = SOUTH|NORTH|EAST
+ if(SOUTH)
+ initialize_directions = NORTH|SOUTH|WEST
+ if(EAST)
+ initialize_directions = WEST|EAST|SOUTH
+ if(WEST)
+ initialize_directions = EAST|WEST|NORTH
- node1_dir = turn(dir, 180)
- node2_dir = turn(dir, 90)
- node3_dir = dir
-
- for(var/obj/machinery/atmospherics/target in get_step(src,node1_dir))
- if(target.initialize_directions & get_dir(target,src))
- node1 = target
- break
- for(var/obj/machinery/atmospherics/target in get_step(src,node2_dir))
- if(target.initialize_directions & get_dir(target,src))
- node2 = target
- break
- for(var/obj/machinery/atmospherics/target in get_step(src,node3_dir))
- if(target.initialize_directions & get_dir(target,src))
- node3 = target
- break
-
- update_icon(animation)
- if(animation)
- flick("tvalvem[src.state][!src.state]",src)
+/obj/machinery/atmospherics/tvalve/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+ if(reference == node1)
+ network_node1 = new_network
+ if(state)
+ network_node2 = new_network
else
- icon_state = "tvalvem[state]"
+ network_node3 = new_network
+ else if(reference == node2)
+ network_node2 = new_network
+ if(state)
+ network_node1 = new_network
+ else if(reference == node3)
+ network_node3 = new_network
+ if(!state)
+ network_node1 = new_network
- digital // can be controlled by AI
- name = "digital switching valve"
- desc = "A digitally controlled valve."
- icon = 'icons/obj/atmospherics/digital_valve.dmi'
+ if(new_network.normal_members.Find(src))
+ return 0
- attack_ai(mob/user as mob)
- return src.attack_hand(user)
+ new_network.normal_members += src
- attack_hand(mob/user as mob)
- if(!src.allowed(user))
- user << "\red Access denied."
- return
- ..()
+ if(state)
+ if(reference == node1)
+ if(node2)
+ return node2.network_expand(new_network, src)
+ else if(reference == node2)
+ if(node1)
+ return node1.network_expand(new_network, src)
+ else
+ if(reference == node1)
+ if(node3)
+ return node3.network_expand(new_network, src)
+ else if(reference == node3)
+ if(node1)
+ return node1.network_expand(new_network, src)
- //Radio remote control -eh?
+ return null
- proc
- set_frequency(new_frequency)
- radio_controller.remove_object(src, frequency)
- frequency = new_frequency
- if(frequency)
- radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
+/obj/machinery/atmospherics/tvalve/Del()
+ loc = null
- var/frequency = 0
- var/id = null
- var/datum/radio_frequency/radio_connection
+ if(node1)
+ node1.disconnect(src)
+ del(network_node1)
+ if(node2)
+ node2.disconnect(src)
+ del(network_node2)
+ if(node3)
+ node3.disconnect(src)
+ del(network_node3)
- initialize()
- ..()
- if(frequency)
- set_frequency(frequency)
+ node1 = null
+ node2 = null
+ node3 = null
- receive_signal(datum/signal/signal)
- if(!signal.data["tag"] || (signal.data["tag"] != id))
- return 0
+ ..()
- switch(signal.data["command"])
- if("valve_open")
- if(!state)
- go_to_side()
+/obj/machinery/atmospherics/tvalve/proc/go_to_side()
- if("valve_close")
- if(state)
- go_straight()
+ if(state) return 0
- if("valve_toggle")
- if(state)
- go_straight()
- else
- go_to_side()
\ No newline at end of file
+ state = 1
+ update_icon()
+
+ if(network_node1)
+ del(network_node1)
+ if(network_node3)
+ del(network_node3)
+ build_network()
+
+ if(network_node1&&network_node2)
+ network_node1.merge(network_node2)
+ network_node2 = network_node1
+
+ if(network_node1)
+ network_node1.update = 1
+ else if(network_node2)
+ network_node2.update = 1
+
+ return 1
+
+/obj/machinery/atmospherics/tvalve/proc/go_straight()
+
+ if(!state)
+ return 0
+
+ state = 0
+ update_icon()
+
+ if(network_node1)
+ del(network_node1)
+ if(network_node2)
+ del(network_node2)
+ build_network()
+
+ if(network_node1&&network_node3)
+ network_node1.merge(network_node3)
+ network_node3 = network_node1
+
+ if(network_node1)
+ network_node1.update = 1
+ else if(network_node3)
+ network_node3.update = 1
+
+ return 1
+
+/obj/machinery/atmospherics/tvalve/attack_ai(mob/user as mob)
+ return
+
+/obj/machinery/atmospherics/tvalve/attack_paw(mob/user as mob)
+ return attack_hand(user)
+
+/obj/machinery/atmospherics/tvalve/attack_hand(mob/user as mob)
+ src.add_fingerprint(usr)
+ update_icon(1)
+ sleep(10)
+ if (src.state)
+ src.go_straight()
+ else
+ src.go_to_side()
+
+/obj/machinery/atmospherics/tvalve/process()
+ ..()
+ . = PROCESS_KILL
+ //machines.Remove(src)
+
+ return
+
+/obj/machinery/atmospherics/tvalve/initialize()
+ var/node1_dir
+ var/node2_dir
+ var/node3_dir
+
+ node1_dir = turn(dir, 180)
+ node2_dir = turn(dir, -90)
+ node3_dir = dir
+
+ for(var/obj/machinery/atmospherics/target in get_step(src,node1_dir))
+ if(target.initialize_directions & get_dir(target,src))
+ node1 = target
+ break
+ for(var/obj/machinery/atmospherics/target in get_step(src,node2_dir))
+ if(target.initialize_directions & get_dir(target,src))
+ node2 = target
+ break
+ for(var/obj/machinery/atmospherics/target in get_step(src,node3_dir))
+ if(target.initialize_directions & get_dir(target,src))
+ node3 = target
+ break
+
+ update_icon()
+ update_underlays()
+
+/obj/machinery/atmospherics/tvalve/build_network()
+ if(!network_node1 && node1)
+ network_node1 = new /datum/pipe_network()
+ network_node1.normal_members += src
+ network_node1.build_network(node1, src)
+
+ if(!network_node2 && node2)
+ network_node2 = new /datum/pipe_network()
+ network_node2.normal_members += src
+ network_node2.build_network(node2, src)
+
+ if(!network_node3 && node3)
+ network_node3 = new /datum/pipe_network()
+ network_node3.normal_members += src
+ network_node3.build_network(node3, src)
+
+
+/obj/machinery/atmospherics/tvalve/return_network(obj/machinery/atmospherics/reference)
+ build_network()
+
+ if(reference==node1)
+ return network_node1
+
+ if(reference==node2)
+ return network_node2
+
+ if(reference==node3)
+ return network_node3
+
+ return null
+
+/obj/machinery/atmospherics/tvalve/reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
+ if(network_node1 == old_network)
+ network_node1 = new_network
+ if(network_node2 == old_network)
+ network_node2 = new_network
+ if(network_node3 == old_network)
+ network_node3 = new_network
+
+ return 1
+
+/obj/machinery/atmospherics/tvalve/return_network_air(datum/network/reference)
+ return null
+
+/obj/machinery/atmospherics/tvalve/disconnect(obj/machinery/atmospherics/reference)
+ if(reference==node1)
+ del(network_node1)
+ node1 = null
+
+ else if(reference==node2)
+ del(network_node2)
+ node2 = null
+
+ else if(reference==node3)
+ del(network_node3)
+ node2 = null
+
+ update_underlays()
+
+ return null
+
+/obj/machinery/atmospherics/tvalve/digital // can be controlled by AI
+ name = "digital switching valve"
+ desc = "A digitally controlled valve."
+ icon = 'icons/atmos/digital_tvalve.dmi'
+
+ var/frequency = 0
+ var/id = null
+ var/datum/radio_frequency/radio_connection
+
+/obj/machinery/atmospherics/tvalve/digital/bypass
+ icon_state = "map_tvalve1"
+ state = 1
+
+/obj/machinery/atmospherics/tvalve/digital/power_change()
+ var/old_stat = stat
+ ..()
+ if(old_stat != stat)
+ update_icon()
+
+/obj/machinery/atmospherics/tvalve/digital/update_icon()
+ ..()
+ if(!powered())
+ icon_state = "tvalvenopower"
+
+/obj/machinery/atmospherics/tvalve/digital/attack_ai(mob/user as mob)
+ return src.attack_hand(user)
+
+/obj/machinery/atmospherics/tvalve/digital/attack_hand(mob/user as mob)
+ if(!powered())
+ return
+ if(!src.allowed(user))
+ user << "\red Access denied."
+ return
+ ..()
+
+//Radio remote control
+
+/obj/machinery/atmospherics/tvalve/digital/proc/set_frequency(new_frequency)
+ radio_controller.remove_object(src, frequency)
+ frequency = new_frequency
+ if(frequency)
+ radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
+
+
+
+/obj/machinery/atmospherics/tvalve/digital/initialize()
+ ..()
+ if(frequency)
+ set_frequency(frequency)
+
+/obj/machinery/atmospherics/tvalve/digital/receive_signal(datum/signal/signal)
+ if(!signal.data["tag"] || (signal.data["tag"] != id))
+ return 0
+
+ switch(signal.data["command"])
+ if("valve_open")
+ if(!state)
+ go_to_side()
+
+ if("valve_close")
+ if(state)
+ go_straight()
+
+ if("valve_toggle")
+ if(state)
+ go_straight()
+ else
+ go_to_side()
+
+/obj/machinery/atmospherics/tvalve/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+ if (!istype(W, /obj/item/weapon/wrench))
+ return ..()
+ if (istype(src, /obj/machinery/atmospherics/tvalve/digital))
+ user << "\red You cannot unwrench this [src], it's too complicated."
+ return 1
+ var/datum/gas_mixture/int_air = return_air()
+ var/datum/gas_mixture/env_air = loc.return_air()
+ if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
+ user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+ add_fingerprint(user)
+ return 1
+ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+ user << "\blue You begin to unfasten \the [src]..."
+ if (do_after(user, 40))
+ user.visible_message( \
+ "[user] unfastens \the [src].", \
+ "\blue You have unfastened \the [src].", \
+ "You hear ratchet.")
+ new /obj/item/pipe(loc, make_from=src)
+ del(src)
+
+/obj/machinery/atmospherics/tvalve/mirrored
+ icon_state = "map_tvalvem0"
+
+/obj/machinery/atmospherics/tvalve/mirrored/bypass
+ icon_state = "map_tvalvem1"
+ state = 1
+
+/obj/machinery/atmospherics/tvalve/mirrored/initialize_directions()
+ switch(dir)
+ if(NORTH)
+ initialize_directions = SOUTH|NORTH|WEST
+ if(SOUTH)
+ initialize_directions = NORTH|SOUTH|EAST
+ if(EAST)
+ initialize_directions = WEST|EAST|NORTH
+ if(WEST)
+ initialize_directions = EAST|WEST|SOUTH
+
+/obj/machinery/atmospherics/tvalve/mirrored/initialize()
+ var/node1_dir
+ var/node2_dir
+ var/node3_dir
+
+ node1_dir = turn(dir, 180)
+ node2_dir = turn(dir, 90)
+ node3_dir = dir
+
+ for(var/obj/machinery/atmospherics/target in get_step(src,node1_dir))
+ if(target.initialize_directions & get_dir(target,src))
+ node1 = target
+ break
+ for(var/obj/machinery/atmospherics/target in get_step(src,node2_dir))
+ if(target.initialize_directions & get_dir(target,src))
+ node2 = target
+ break
+ for(var/obj/machinery/atmospherics/target in get_step(src,node3_dir))
+ if(target.initialize_directions & get_dir(target,src))
+ node3 = target
+ break
+
+ update_icon()
+ update_underlays()
+
+/obj/machinery/atmospherics/tvalve/mirrored/update_icon(animation)
+ if(animation)
+ flick("tvalvem[src.state][!src.state]",src)
+ else
+ icon_state = "tvalvem[state]"
+
+/obj/machinery/atmospherics/tvalve/mirrored/digital // can be controlled by AI
+ name = "digital switching valve"
+ desc = "A digitally controlled valve."
+ icon = 'icons/atmos/digital_tvalve.dmi'
+
+ var/frequency = 0
+ var/id = null
+ var/datum/radio_frequency/radio_connection
+
+/obj/machinery/atmospherics/tvalve/mirrored/digital/bypass
+ icon_state = "map_tvalvem1"
+ state = 1
+
+/obj/machinery/atmospherics/tvalve/mirrored/digital/power_change()
+ var/old_stat = stat
+ ..()
+ if(old_stat != stat)
+ update_icon()
+
+/obj/machinery/atmospherics/tvalve/mirrored/digital/update_icon()
+ ..()
+ if(!powered())
+ icon_state = "tvalvemnopower"
+
+/obj/machinery/atmospherics/tvalve/mirrored/digital/attack_ai(mob/user as mob)
+ return src.attack_hand(user)
+
+/obj/machinery/atmospherics/tvalve/mirrored/digital/attack_hand(mob/user as mob)
+ if(!powered())
+ return
+ if(!src.allowed(user))
+ user << "\red Access denied."
+ return
+ ..()
+
+//Radio remote control -eh?
+
+/obj/machinery/atmospherics/tvalve/mirrored/digital/proc/set_frequency(new_frequency)
+ radio_controller.remove_object(src, frequency)
+ frequency = new_frequency
+ if(frequency)
+ radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
+
+/obj/machinery/atmospherics/tvalve/mirrored/digital/initialize()
+ ..()
+ if(frequency)
+ set_frequency(frequency)
+
+/obj/machinery/atmospherics/tvalve/mirrored/digital/receive_signal(datum/signal/signal)
+ if(!signal.data["tag"] || (signal.data["tag"] != id))
+ return 0
+
+ switch(signal.data["command"])
+ if("valve_open")
+ if(!state)
+ go_to_side()
+
+ if("valve_close")
+ if(state)
+ go_straight()
+
+ if("valve_toggle")
+ if(state)
+ go_straight()
+ else
+ go_to_side()
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/unary/outlet_injector.dm b/code/ATMOSPHERICS/components/unary/outlet_injector.dm
index f070882ba8..c821b629e0 100644
--- a/code/ATMOSPHERICS/components/unary/outlet_injector.dm
+++ b/code/ATMOSPHERICS/components/unary/outlet_injector.dm
@@ -1,7 +1,8 @@
/obj/machinery/atmospherics/unary/outlet_injector
- icon = 'icons/obj/atmospherics/outlet_injector.dmi'
- icon_state = "off"
+ icon = 'icons/atmos/injector.dmi'
+ icon_state = "map_injector"
use_power = 1
+ layer = 3
name = "Air Injector"
desc = "Has a valve and pump attached to it"
@@ -17,131 +18,122 @@
level = 1
- update_icon()
- if(node)
- if(on && !(stat & NOPOWER))
- icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]on"
- else
- icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off"
- else
- icon_state = "exposed"
- on = 0
+/obj/machinery/atmospherics/unary/outlet_injector/update_icon()
+ if(!powered())
+ icon_state = "off"
+ else
+ icon_state = "[on ? "on" : "off"]"
- return
-
- power_change()
- var/old_stat = stat
- ..()
- if(old_stat != stat)
- update_icon()
-
-
- process()
- ..()
- injecting = 0
-
- if(!on || stat & NOPOWER)
- return 0
-
- if(air_contents.temperature > 0)
- var/transfer_moles = (air_contents.return_pressure())*volume_rate/(air_contents.temperature * R_IDEAL_GAS_EQUATION)
-
- var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
-
- loc.assume_air(removed)
-
- if(network)
- network.update = 1
-
- return 1
-
- proc/inject()
- if(on || injecting)
- return 0
-
- injecting = 1
-
- if(air_contents.temperature > 0)
- var/transfer_moles = (air_contents.return_pressure())*volume_rate/(air_contents.temperature * R_IDEAL_GAS_EQUATION)
-
- var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
-
- loc.assume_air(removed)
-
- if(network)
- network.update = 1
-
- flick("inject", src)
-
- proc
- set_frequency(new_frequency)
- radio_controller.remove_object(src, frequency)
- frequency = new_frequency
- if(frequency)
- radio_connection = radio_controller.add_object(src, frequency)
-
- broadcast_status()
- if(!radio_connection)
- return 0
-
- var/datum/signal/signal = new
- signal.transmission_method = 1 //radio signal
- signal.source = src
-
- signal.data = list(
- "tag" = id,
- "device" = "AO",
- "power" = on,
- "volume_rate" = volume_rate,
- //"timestamp" = world.time,
- "sigtype" = "status"
- )
-
- radio_connection.post_signal(src, signal)
-
- return 1
-
- initialize()
- ..()
-
- set_frequency(frequency)
-
- receive_signal(datum/signal/signal)
- if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
- return 0
-
- if("power" in signal.data)
- on = text2num(signal.data["power"])
-
- if("power_toggle" in signal.data)
- on = !on
-
- if("inject" in signal.data)
- spawn inject()
+/obj/machinery/atmospherics/unary/outlet_injector/update_underlays()
+ if(..())
+ underlays.Cut()
+ var/turf/T = get_turf(src)
+ if(!istype(T))
return
+ add_underlay(T, node, dir)
- if("set_volume_rate" in signal.data)
- var/number = text2num(signal.data["set_volume_rate"])
- volume_rate = between(0, number, air_contents.volume)
-
- if("status" in signal.data)
- spawn(2)
- broadcast_status()
- return //do not update_icon
-
- //log_admin("DEBUG \[[world.timeofday]\]: outlet_injector/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
- //return
- spawn(2)
- broadcast_status()
+/obj/machinery/atmospherics/unary/outlet_injector/power_change()
+ var/old_stat = stat
+ ..()
+ if(old_stat != stat)
update_icon()
- hide(var/i) //to make the little pipe section invisible, the icon changes.
- if(node)
- if(on)
- icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]on"
- else
- icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off"
- else
- icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]exposed"
- on = 0
- return
\ No newline at end of file
+/obj/machinery/atmospherics/unary/outlet_injector/process()
+ ..()
+ injecting = 0
+
+ if(!on || stat & NOPOWER)
+ return 0
+
+ if(air_contents.temperature > 0)
+ var/transfer_moles = (air_contents.return_pressure())*volume_rate/(air_contents.temperature * R_IDEAL_GAS_EQUATION)
+
+ var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
+
+ loc.assume_air(removed)
+
+ if(network)
+ network.update = 1
+
+ return 1
+
+/obj/machinery/atmospherics/unary/outlet_injector/proc/inject()
+ if(on || injecting)
+ return 0
+
+ injecting = 1
+
+ if(air_contents.temperature > 0)
+ var/transfer_moles = (air_contents.return_pressure())*volume_rate/(air_contents.temperature * R_IDEAL_GAS_EQUATION)
+
+ var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
+
+ loc.assume_air(removed)
+
+ if(network)
+ network.update = 1
+
+ flick("inject", src)
+
+/obj/machinery/atmospherics/unary/outlet_injector/proc/set_frequency(new_frequency)
+ radio_controller.remove_object(src, frequency)
+ frequency = new_frequency
+ if(frequency)
+ radio_connection = radio_controller.add_object(src, frequency)
+
+/obj/machinery/atmospherics/unary/outlet_injector/proc/broadcast_status()
+ if(!radio_connection)
+ return 0
+
+ var/datum/signal/signal = new
+ signal.transmission_method = 1 //radio signal
+ signal.source = src
+
+ signal.data = list(
+ "tag" = id,
+ "device" = "AO",
+ "power" = on,
+ "volume_rate" = volume_rate,
+ "sigtype" = "status"
+ )
+
+ radio_connection.post_signal(src, signal)
+
+ return 1
+
+/obj/machinery/atmospherics/unary/outlet_injector/initialize()
+ ..()
+
+ set_frequency(frequency)
+
+/obj/machinery/atmospherics/unary/outlet_injector/receive_signal(datum/signal/signal)
+ if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
+ return 0
+
+ if(signal.data["power"])
+ on = text2num(signal.data["power"])
+
+ if(signal.data["power_toggle"])
+ on = !on
+
+ if(signal.data["inject"])
+ spawn inject()
+ return
+
+ if(signal.data["set_volume_rate"])
+ var/number = text2num(signal.data["set_volume_rate"])
+ volume_rate = between(0, number, air_contents.volume)
+
+ if(signal.data["status"])
+ spawn(2)
+ broadcast_status()
+ return //do not update_icon
+
+ //log_admin("DEBUG \[[world.timeofday]\]: outlet_injector/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
+ //return
+ spawn(2)
+ broadcast_status()
+ update_icon()
+
+/obj/machinery/atmospherics/unary/outlet_injector/hide(var/i)
+ update_underlays()
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/unary/unary_base.dm b/code/ATMOSPHERICS/components/unary/unary_base.dm
index b755071487..2c5f63f607 100644
--- a/code/ATMOSPHERICS/components/unary/unary_base.dm
+++ b/code/ATMOSPHERICS/components/unary/unary_base.dm
@@ -50,6 +50,7 @@
break
update_icon()
+ update_underlays()
build_network()
if(!network && node)
@@ -85,4 +86,7 @@
del(network)
node = null
+ update_icon()
+ update_underlays()
+
return null
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm
index f4e9cb9750..e2cd25cfba 100644
--- a/code/ATMOSPHERICS/components/unary/vent_pump.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm
@@ -4,8 +4,8 @@
#undefine
/obj/machinery/atmospherics/unary/vent_pump
- icon = 'icons/obj/atmospherics/vent_pump.dmi'
- icon_state = "off"
+ icon = 'icons/atmos/vent_pump.dmi'
+ icon_state = "map_vent"
name = "Air Vent"
desc = "Has a valve and pump attached to it"
@@ -40,316 +40,329 @@
var/radio_filter_out
var/radio_filter_in
- on
- on = 1
- icon_state = "out"
+/obj/machinery/atmospherics/unary/vent_pump/on
+ on = 1
+ icon_state = "map_vent_out"
- siphon
- pump_direction = 0
- icon_state = "off"
+/obj/machinery/atmospherics/unary/vent_pump/siphon
+ pump_direction = 0
- on
- on = 1
- icon_state = "in"
+/obj/machinery/atmospherics/unary/vent_pump/siphon/on
+ on = 1
+ icon_state = "map_vent_in"
- New()
- initial_loc = get_area(loc)
- if (initial_loc.master)
- initial_loc = initial_loc.master
- area_uid = initial_loc.uid
- if (!id_tag)
- assign_uid()
- id_tag = num2text(uid)
- if(ticker && ticker.current_state == 3)//if the game is running
- src.initialize()
- src.broadcast_status()
- ..()
+/obj/machinery/atmospherics/unary/vent_pump/New()
+ icon = null
+ initial_loc = get_area(loc)
+ if (initial_loc.master)
+ initial_loc = initial_loc.master
+ area_uid = initial_loc.uid
+ if (!id_tag)
+ assign_uid()
+ id_tag = num2text(uid)
+ if(ticker && ticker.current_state == 3)//if the game is running
+ src.initialize()
+ src.broadcast_status()
+ ..()
- high_volume
- name = "Large Air Vent"
- power_channel = EQUIP
- New()
- ..()
- air_contents.volume = 1000
+/obj/machinery/atmospherics/unary/vent_pump/high_volume
+ name = "Large Air Vent"
+ power_channel = EQUIP
- update_icon()
- if(welded)
- icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]weld"
- return
- if(on && !(stat & (NOPOWER|BROKEN)))
- if(pump_direction)
- icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]out"
- else
- icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]in"
- else
- icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off"
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/New()
+ ..()
+ air_contents.volume = 1000
+/obj/machinery/atmospherics/unary/vent_pump/update_icon(var/safety = 0)
+ if(!check_icon_cache())
return
- process()
- ..()
- if(stat & (NOPOWER|BROKEN))
+ overlays.Cut()
+
+ var/vent_icon = "vent"
+
+ var/turf/T = get_turf(src)
+ if(!istype(T))
+ return
+
+ if(T.intact && node && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
+ vent_icon += "h"
+
+ if(welded)
+ vent_icon += "weld"
+ else if(!powered())
+ vent_icon += "off"
+ else
+ vent_icon += "[on ? "[pump_direction ? "out" : "in"]" : "off"]"
+
+ overlays += icon_manager.get_atmos_icon("device", , , vent_icon)
+
+/obj/machinery/atmospherics/unary/vent_pump/update_underlays()
+ if(..())
+ underlays.Cut()
+ var/turf/T = get_turf(src)
+ if(!istype(T))
return
- if (!node)
- on = 0
- //broadcast_status() // from now air alarm/control computer should request update purposely --rastaf0
- if(!on)
- return 0
-
- if(welded)
- return 0
-
- var/datum/gas_mixture/environment = loc.return_air()
- var/environment_pressure = environment.return_pressure()
-
- if(pump_direction) //internal -> external
- var/pressure_delta = 10000
-
- if(pressure_checks&1)
- pressure_delta = min(pressure_delta, (external_pressure_bound - environment_pressure))
- if(pressure_checks&2)
- pressure_delta = min(pressure_delta, (air_contents.return_pressure() - internal_pressure_bound))
-
- if(pressure_delta > 0.5)
- if(air_contents.temperature > 0)
- var/transfer_moles = pressure_delta*environment.volume/(air_contents.temperature * R_IDEAL_GAS_EQUATION)
-
- var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
-
- loc.assume_air(removed)
-
- if(network)
- network.update = 1
-
- else //external -> internal
- var/pressure_delta = 10000
- if(pressure_checks&1)
- pressure_delta = min(pressure_delta, (environment_pressure - external_pressure_bound))
- if(pressure_checks&2)
- pressure_delta = min(pressure_delta, (internal_pressure_bound - air_contents.return_pressure()))
-
- if(pressure_delta > 0.5)
- if(environment.temperature > 0)
- var/transfer_moles = pressure_delta*air_contents.volume/(environment.temperature * R_IDEAL_GAS_EQUATION)
-
- var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
- if (isnull(removed)) //in space
- return
-
- air_contents.merge(removed)
-
- if(network)
- network.update = 1
-
- return 1
-
- //Radio remote control
-
- proc
- set_frequency(new_frequency)
- radio_controller.remove_object(src, frequency)
- frequency = new_frequency
- if(frequency)
- radio_connection = radio_controller.add_object(src, frequency,radio_filter_in)
-
- broadcast_status()
- if(!radio_connection)
- return 0
-
- var/datum/signal/signal = new
- signal.transmission_method = 1 //radio signal
- signal.source = src
-
- signal.data = list(
- "area" = src.area_uid,
- "tag" = src.id_tag,
- "device" = "AVP",
- "power" = on,
- "direction" = pump_direction?("release"):("siphon"),
- "checks" = pressure_checks,
- "internal" = internal_pressure_bound,
- "external" = external_pressure_bound,
- "timestamp" = world.time,
- "sigtype" = "status"
- )
-
- if(!initial_loc.air_vent_names[id_tag])
- var/new_name = "[initial_loc.name] Vent Pump #[initial_loc.air_vent_names.len+1]"
- initial_loc.air_vent_names[id_tag] = new_name
- src.name = new_name
- initial_loc.air_vent_info[id_tag] = signal.data
-
- radio_connection.post_signal(src, signal, radio_filter_out)
-
- return 1
-
-
- initialize()
- ..()
-
- //some vents work his own spesial way
- radio_filter_in = frequency==1439?(RADIO_FROM_AIRALARM):null
- radio_filter_out = frequency==1439?(RADIO_TO_AIRALARM):null
- if(frequency)
- set_frequency(frequency)
-
- receive_signal(datum/signal/signal)
- if(stat & (NOPOWER|BROKEN))
+ if(T.intact && node && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
return
- //log_admin("DEBUG \[[world.timeofday]\]: /obj/machinery/atmospherics/unary/vent_pump/receive_signal([signal.debug_print()])")
- if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
- return 0
+ else
+ add_underlay(T, node, dir)
- if(signal.data["purge"] != null)
- pressure_checks &= ~1
- pump_direction = 0
+/obj/machinery/atmospherics/unary/vent_pump/hide()
+ update_icon()
+ update_underlays()
- if(signal.data["stabalize"] != null)
- pressure_checks |= 1
- pump_direction = 1
+/obj/machinery/atmospherics/unary/vent_pump/process()
+ ..()
+ if(stat & (NOPOWER|BROKEN))
+ return
+ if (!node)
+ on = 0
+ //broadcast_status() // from now air alarm/control computer should request update purposely --rastaf0
+ if(!on)
+ return 0
- if(signal.data["power"] != null)
- on = text2num(signal.data["power"])
+ if(welded)
+ return 0
- if(signal.data["power_toggle"] != null)
- on = !on
+ var/datum/gas_mixture/environment = loc.return_air()
+ var/environment_pressure = environment.return_pressure()
- if(signal.data["checks"] != null)
- if (signal.data["checks"] == "default")
- pressure_checks = pressure_checks_default
- else
- pressure_checks = text2num(signal.data["checks"])
+ if(pump_direction) //internal -> external
+ var/pressure_delta = 10000
- if(signal.data["checks_toggle"] != null)
- pressure_checks = (pressure_checks?0:3)
+ if(pressure_checks&1)
+ pressure_delta = min(pressure_delta, (external_pressure_bound - environment_pressure))
+ if(pressure_checks&2)
+ pressure_delta = min(pressure_delta, (air_contents.return_pressure() - internal_pressure_bound))
- if(signal.data["direction"] != null)
- pump_direction = text2num(signal.data["direction"])
+ if(pressure_delta > 0.5)
+ if(air_contents.temperature > 0)
+ var/transfer_moles = pressure_delta*environment.volume/(air_contents.temperature * R_IDEAL_GAS_EQUATION)
- if(signal.data["set_internal_pressure"] != null)
- if (signal.data["set_internal_pressure"] == "default")
- internal_pressure_bound = internal_pressure_bound_default
- else
- internal_pressure_bound = between(
- 0,
- text2num(signal.data["set_internal_pressure"]),
- ONE_ATMOSPHERE*50
- )
+ var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
- if(signal.data["set_external_pressure"] != null)
- if (signal.data["set_external_pressure"] == "default")
- external_pressure_bound = external_pressure_bound_default
- else
- external_pressure_bound = between(
- 0,
- text2num(signal.data["set_external_pressure"]),
- ONE_ATMOSPHERE*50
- )
+ loc.assume_air(removed)
- if(signal.data["adjust_internal_pressure"] != null)
+ if(network)
+ network.update = 1
+
+ else //external -> internal
+ var/pressure_delta = 10000
+ if(pressure_checks&1)
+ pressure_delta = min(pressure_delta, (environment_pressure - external_pressure_bound))
+ if(pressure_checks&2)
+ pressure_delta = min(pressure_delta, (internal_pressure_bound - air_contents.return_pressure()))
+
+ if(pressure_delta > 0.5)
+ if(environment.temperature > 0)
+ var/transfer_moles = pressure_delta*air_contents.volume/(environment.temperature * R_IDEAL_GAS_EQUATION)
+
+ var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
+ if (isnull(removed)) //in space
+ return
+
+ air_contents.merge(removed)
+
+ if(network)
+ network.update = 1
+
+ return 1
+
+//Radio remote control
+
+/obj/machinery/atmospherics/unary/vent_pump/proc/set_frequency(new_frequency)
+ radio_controller.remove_object(src, frequency)
+ frequency = new_frequency
+ if(frequency)
+ radio_connection = radio_controller.add_object(src, frequency,radio_filter_in)
+
+/obj/machinery/atmospherics/unary/vent_pump/proc/broadcast_status()
+ if(!radio_connection)
+ return 0
+
+ var/datum/signal/signal = new
+ signal.transmission_method = 1 //radio signal
+ signal.source = src
+
+ signal.data = list(
+ "area" = src.area_uid,
+ "tag" = src.id_tag,
+ "device" = "AVP",
+ "power" = on,
+ "direction" = pump_direction?("release"):("siphon"),
+ "checks" = pressure_checks,
+ "internal" = internal_pressure_bound,
+ "external" = external_pressure_bound,
+ "timestamp" = world.time,
+ "sigtype" = "status"
+ )
+
+ if(!initial_loc.air_vent_names[id_tag])
+ var/new_name = "[initial_loc.name] Vent Pump #[initial_loc.air_vent_names.len+1]"
+ initial_loc.air_vent_names[id_tag] = new_name
+ src.name = new_name
+ initial_loc.air_vent_info[id_tag] = signal.data
+
+ radio_connection.post_signal(src, signal, radio_filter_out)
+
+ return 1
+
+
+/obj/machinery/atmospherics/unary/vent_pump/initialize()
+ ..()
+
+ //some vents work his own spesial way
+ radio_filter_in = frequency==1439?(RADIO_FROM_AIRALARM):null
+ radio_filter_out = frequency==1439?(RADIO_TO_AIRALARM):null
+ if(frequency)
+ set_frequency(frequency)
+
+/obj/machinery/atmospherics/unary/vent_pump/receive_signal(datum/signal/signal)
+ if(stat & (NOPOWER|BROKEN))
+ return
+ //log_admin("DEBUG \[[world.timeofday]\]: /obj/machinery/atmospherics/unary/vent_pump/receive_signal([signal.debug_print()])")
+ if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
+ return 0
+
+ if(signal.data["purge"] != null)
+ pressure_checks &= ~1
+ pump_direction = 0
+
+ if(signal.data["stabalize"] != null)
+ pressure_checks |= 1
+ pump_direction = 1
+
+ if(signal.data["power"] != null)
+ on = text2num(signal.data["power"])
+
+ if(signal.data["power_toggle"] != null)
+ on = !on
+
+ if(signal.data["checks"] != null)
+ if (signal.data["checks"] == "default")
+ pressure_checks = pressure_checks_default
+ else
+ pressure_checks = text2num(signal.data["checks"])
+
+ if(signal.data["checks_toggle"] != null)
+ pressure_checks = (pressure_checks?0:3)
+
+ if(signal.data["direction"] != null)
+ pump_direction = text2num(signal.data["direction"])
+
+ if(signal.data["set_internal_pressure"] != null)
+ if (signal.data["set_internal_pressure"] == "default")
+ internal_pressure_bound = internal_pressure_bound_default
+ else
internal_pressure_bound = between(
0,
- internal_pressure_bound + text2num(signal.data["adjust_internal_pressure"]),
+ text2num(signal.data["set_internal_pressure"]),
ONE_ATMOSPHERE*50
)
- if(signal.data["adjust_external_pressure"] != null)
-
-
+ if(signal.data["set_external_pressure"] != null)
+ if (signal.data["set_external_pressure"] == "default")
+ external_pressure_bound = external_pressure_bound_default
+ else
external_pressure_bound = between(
0,
- external_pressure_bound + text2num(signal.data["adjust_external_pressure"]),
+ text2num(signal.data["set_external_pressure"]),
ONE_ATMOSPHERE*50
)
- if(signal.data["init"] != null)
- name = signal.data["init"]
- return
+ if(signal.data["adjust_internal_pressure"] != null)
+ internal_pressure_bound = between(
+ 0,
+ internal_pressure_bound + text2num(signal.data["adjust_internal_pressure"]),
+ ONE_ATMOSPHERE*50
+ )
- if(signal.data["status"] != null)
- spawn(2)
- broadcast_status()
- return //do not update_icon
+ if(signal.data["adjust_external_pressure"] != null)
- //log_admin("DEBUG \[[world.timeofday]\]: vent_pump/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
+
+ external_pressure_bound = between(
+ 0,
+ external_pressure_bound + text2num(signal.data["adjust_external_pressure"]),
+ ONE_ATMOSPHERE*50
+ )
+
+ if(signal.data["init"] != null)
+ name = signal.data["init"]
+ return
+
+ if(signal.data["status"] != null)
spawn(2)
broadcast_status()
- update_icon()
- return
+ return //do not update_icon
- hide(var/i) //to make the little pipe section invisible, the icon changes.
- if(welded)
- icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]weld"
- return
- if(on&&node)
- if(pump_direction)
- icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]out"
- else
- icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]in"
- else
- icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off"
- on = 0
- return
+ //log_admin("DEBUG \[[world.timeofday]\]: vent_pump/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
+ spawn(2)
+ broadcast_status()
+ update_icon()
+ return
- attackby(obj/item/W, mob/user)
- if(istype(W, /obj/item/weapon/weldingtool))
- var/obj/item/weapon/weldingtool/WT = W
- if (WT.remove_fuel(0,user))
- user << "\blue Now welding the vent."
- if(do_after(user, 20))
- if(!src || !WT.isOn()) return
- playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
- if(!welded)
- user.visible_message("[user] welds the vent shut.", "You weld the vent shut.", "You hear welding.")
- welded = 1
- update_icon()
- else
- user.visible_message("[user] unwelds the vent.", "You unweld the vent.", "You hear welding.")
- welded = 0
- update_icon()
+/obj/machinery/atmospherics/unary/vent_pump/attackby(obj/item/W, mob/user)
+ if(istype(W, /obj/item/weapon/weldingtool))
+ var/obj/item/weapon/weldingtool/WT = W
+ if (WT.remove_fuel(0,user))
+ user << "\blue Now welding the vent."
+ if(do_after(user, 20))
+ if(!src || !WT.isOn()) return
+ playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
+ if(!welded)
+ user.visible_message("[user] welds the vent shut.", "You weld the vent shut.", "You hear welding.")
+ welded = 1
+ update_icon()
else
- user << "\blue The welding tool needs to be on to start this task."
+ user.visible_message("[user] unwelds the vent.", "You unweld the vent.", "You hear welding.")
+ welded = 0
+ update_icon()
else
- user << "\blue You need more welding fuel to complete this task."
- return 1
- examine()
- set src in oview(1)
- ..()
- if(welded)
- usr << "It seems welded shut."
-
- power_change()
- if(powered(power_channel))
- stat &= ~NOPOWER
+ user << "\blue The welding tool needs to be on to start this task."
else
- stat |= NOPOWER
+ user << "\blue You need more welding fuel to complete this task."
+ return 1
+ else
+ ..()
+
+/obj/machinery/atmospherics/unary/vent_pump/examine()
+ set src in oview(1)
+ ..()
+ if(welded)
+ usr << "It seems welded shut."
+
+/obj/machinery/atmospherics/unary/vent_pump/power_change()
+ var/old_stat = stat
+ ..()
+ if(old_stat != stat)
update_icon()
- attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
- if (!istype(W, /obj/item/weapon/wrench))
- return ..()
- if (!(stat & NOPOWER) && on)
- user << "\red You cannot unwrench this [src], turn it off first."
- return 1
- var/turf/T = src.loc
- if (level==1 && isturf(T) && T.intact)
- user << "\red You must remove the plating first."
- return 1
- var/datum/gas_mixture/int_air = return_air()
- var/datum/gas_mixture/env_air = loc.return_air()
- if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
- user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
- add_fingerprint(user)
- return 1
- playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "\blue You begin to unfasten \the [src]..."
- if (do_after(user, 40))
- user.visible_message( \
- "[user] unfastens \the [src].", \
- "\blue You have unfastened \the [src].", \
- "You hear ratchet.")
- new /obj/item/pipe(loc, make_from=src)
- del(src)
+/obj/machinery/atmospherics/unary/vent_pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+ if (!istype(W, /obj/item/weapon/wrench))
+ return ..()
+ if (!(stat & NOPOWER) && on)
+ user << "\red You cannot unwrench this [src], turn it off first."
+ return 1
+ var/turf/T = src.loc
+ if (node && node.level==1 && isturf(T) && T.intact)
+ user << "\red You must remove the plating first."
+ return 1
+ var/datum/gas_mixture/int_air = return_air()
+ var/datum/gas_mixture/env_air = loc.return_air()
+ if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
+ user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+ add_fingerprint(user)
+ return 1
+ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+ user << "\blue You begin to unfasten \the [src]..."
+ if (do_after(user, 40))
+ user.visible_message( \
+ "[user] unfastens \the [src].", \
+ "\blue You have unfastened \the [src].", \
+ "You hear ratchet.")
+ new /obj/item/pipe(loc, make_from=src)
+ del(src)
/obj/machinery/atmospherics/unary/vent_pump/Del()
if(initial_loc)
diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
index 3845b9ad61..05acdd1603 100644
--- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
@@ -1,6 +1,6 @@
/obj/machinery/atmospherics/unary/vent_scrubber
- icon = 'icons/obj/atmospherics/vent_scrubber.dmi'
- icon_state = "off"
+ icon = 'icons/atmos/vent_scrubber.dmi'
+ icon_state = "map_scrubber"
name = "Air Scrubber"
desc = "Has a valve and pump attached to it"
@@ -25,245 +25,259 @@
var/area_uid
var/radio_filter_out
var/radio_filter_in
- New()
- initial_loc = get_area(loc)
- if (initial_loc.master)
- initial_loc = initial_loc.master
- area_uid = initial_loc.uid
- if (!id_tag)
- assign_uid()
- id_tag = num2text(uid)
- if(ticker && ticker.current_state == 3)//if the game is running
- src.initialize()
- src.broadcast_status()
- ..()
- update_icon()
- if(node && on && !(stat & (NOPOWER|BROKEN)))
- if(scrubbing)
- icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]on"
- else
- icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]in"
- else
- icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off"
+/obj/machinery/atmospherics/unary/vent_scrubber/New()
+ icon = null
+ initial_loc = get_area(loc)
+ if (initial_loc.master)
+ initial_loc = initial_loc.master
+ area_uid = initial_loc.uid
+ if (!id_tag)
+ assign_uid()
+ id_tag = num2text(uid)
+ if(ticker && ticker.current_state == 3)//if the game is running
+ src.initialize()
+ src.broadcast_status()
+ ..()
+
+/obj/machinery/atmospherics/unary/vent_scrubber/update_icon(var/safety = 0)
+ if(!check_icon_cache())
return
- proc
- set_frequency(new_frequency)
- radio_controller.remove_object(src, frequency)
- frequency = new_frequency
- radio_connection = radio_controller.add_object(src, frequency, radio_filter_in)
+ overlays.Cut()
+
+ var/scrubber_icon = "scrubber"
- broadcast_status()
- if(!radio_connection)
- return 0
+ var/turf/T = get_turf(src)
+ if(!istype(T))
+ return
- var/datum/signal/signal = new
- signal.transmission_method = 1 //radio signal
- signal.source = src
- signal.data = list(
- "area" = area_uid,
- "tag" = id_tag,
- "device" = "AScr",
- "timestamp" = world.time,
- "power" = on,
- "scrubbing" = scrubbing,
- "panic" = panic,
- "filter_co2" = scrub_CO2,
- "filter_phoron" = scrub_Toxins,
- "filter_n2o" = scrub_N2O,
- "sigtype" = "status"
- )
- if(!initial_loc.air_scrub_names[id_tag])
- var/new_name = "[initial_loc.name] Air Scrubber #[initial_loc.air_scrub_names.len+1]"
- initial_loc.air_scrub_names[id_tag] = new_name
- src.name = new_name
- initial_loc.air_scrub_info[id_tag] = signal.data
- radio_connection.post_signal(src, signal, radio_filter_out)
+ if(T.intact && node && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
+ scrubber_icon += "h"
+
+ if(!powered())
+ scrubber_icon += "off"
+ else
+ scrubber_icon += "[on ? "[scrubbing ? "on" : "in"]" : "off"]"
- return 1
+ overlays += icon_manager.get_atmos_icon("device", , , scrubber_icon)
- initialize()
- ..()
- radio_filter_in = frequency==initial(frequency)?(RADIO_FROM_AIRALARM):null
- radio_filter_out = frequency==initial(frequency)?(RADIO_TO_AIRALARM):null
- if (frequency)
- set_frequency(frequency)
-
- process()
- ..()
- if(stat & (NOPOWER|BROKEN))
+/obj/machinery/atmospherics/unary/vent_scrubber/update_underlays()
+ if(..())
+ underlays.Cut()
+ var/turf/T = get_turf(src)
+ if(!istype(T))
return
- if (!node)
- on = 0
- //broadcast_status()
- if(!on)
- return 0
+ if(T.intact && node && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
+ return
+ else
+ add_underlay(T, node, dir)
+
+/obj/machinery/atmospherics/unary/vent_scrubber/proc/set_frequency(new_frequency)
+ radio_controller.remove_object(src, frequency)
+ frequency = new_frequency
+ radio_connection = radio_controller.add_object(src, frequency, radio_filter_in)
+
+/obj/machinery/atmospherics/unary/vent_scrubber/proc/broadcast_status()
+ if(!radio_connection)
+ return 0
+
+ var/datum/signal/signal = new
+ signal.transmission_method = 1 //radio signal
+ signal.source = src
+ signal.data = list(
+ "area" = area_uid,
+ "tag" = id_tag,
+ "device" = "AScr",
+ "timestamp" = world.time,
+ "power" = on,
+ "scrubbing" = scrubbing,
+ "panic" = panic,
+ "filter_co2" = scrub_CO2,
+ "filter_phoron" = scrub_Toxins,
+ "filter_n2o" = scrub_N2O,
+ "sigtype" = "status"
+ )
+ if(!initial_loc.air_scrub_names[id_tag])
+ var/new_name = "[initial_loc.name] Air Scrubber #[initial_loc.air_scrub_names.len+1]"
+ initial_loc.air_scrub_names[id_tag] = new_name
+ src.name = new_name
+ initial_loc.air_scrub_info[id_tag] = signal.data
+ radio_connection.post_signal(src, signal, radio_filter_out)
+
+ return 1
+
+/obj/machinery/atmospherics/unary/vent_scrubber/initialize()
+ ..()
+ radio_filter_in = frequency==initial(frequency)?(RADIO_FROM_AIRALARM):null
+ radio_filter_out = frequency==initial(frequency)?(RADIO_TO_AIRALARM):null
+ if (frequency)
+ set_frequency(frequency)
+
+/obj/machinery/atmospherics/unary/vent_scrubber/process()
+ ..()
+ if(stat & (NOPOWER|BROKEN))
+ return
+ if (!node)
+ on = 0
+ //broadcast_status()
+ if(!on)
+ return 0
- var/datum/gas_mixture/environment = loc.return_air()
+ var/datum/gas_mixture/environment = loc.return_air()
- if(scrubbing)
- if((environment.phoron>0.001) || (environment.carbon_dioxide>0.001) || (environment.trace_gases.len>0))
- var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles()
+ if(scrubbing)
+ if((environment.phoron>0.001) || (environment.carbon_dioxide>0.001) || (environment.trace_gases.len>0))
+ var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles()
- //Take a gas sample
- var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
- if (isnull(removed)) //in space
- return
-
- //Filter it
- var/datum/gas_mixture/filtered_out = new
- filtered_out.temperature = removed.temperature
- if(scrub_Toxins)
- filtered_out.phoron = removed.phoron
- removed.phoron = 0
- if(scrub_CO2)
- filtered_out.carbon_dioxide = removed.carbon_dioxide
- removed.carbon_dioxide = 0
-
- if(removed.trace_gases.len>0)
- for(var/datum/gas/trace_gas in removed.trace_gases)
- if(istype(trace_gas, /datum/gas/oxygen_agent_b))
- removed.trace_gases -= trace_gas
- filtered_out.trace_gases += trace_gas
- else if(istype(trace_gas, /datum/gas/sleeping_agent) && scrub_N2O)
- removed.trace_gases -= trace_gas
- filtered_out.trace_gases += trace_gas
-
-
- //Remix the resulting gases
- air_contents.merge(filtered_out)
-
- loc.assume_air(removed)
-
- if(network)
- network.update = 1
-
- else //Just siphoning all air
- if (air_contents.return_pressure()>=50*ONE_ATMOSPHERE)
+ //Take a gas sample
+ var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
+ if (isnull(removed)) //in space
return
- var/transfer_moles = environment.total_moles()*(volume_rate/environment.volume)
+ //Filter it
+ var/datum/gas_mixture/filtered_out = new
+ filtered_out.temperature = removed.temperature
+ if(scrub_Toxins)
+ filtered_out.phoron = removed.phoron
+ removed.phoron = 0
+ if(scrub_CO2)
+ filtered_out.carbon_dioxide = removed.carbon_dioxide
+ removed.carbon_dioxide = 0
- var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
+ if(removed.trace_gases.len>0)
+ for(var/datum/gas/trace_gas in removed.trace_gases)
+ if(istype(trace_gas, /datum/gas/oxygen_agent_b))
+ removed.trace_gases -= trace_gas
+ filtered_out.trace_gases += trace_gas
+ else if(istype(trace_gas, /datum/gas/sleeping_agent) && scrub_N2O)
+ removed.trace_gases -= trace_gas
+ filtered_out.trace_gases += trace_gas
- air_contents.merge(removed)
+
+ //Remix the resulting gases
+ air_contents.merge(filtered_out)
+
+ loc.assume_air(removed)
if(network)
network.update = 1
- return 1
-/* //unused piece of code
- hide(var/i) //to make the little pipe section invisible, the icon changes.
- if(on&&node)
- if(scrubbing)
- icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]on"
- else
- icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]in"
- else
- icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off"
- on = 0
+ else //Just siphoning all air
+ if (air_contents.return_pressure()>=50*ONE_ATMOSPHERE)
+ return
+
+ var/transfer_moles = environment.total_moles()*(volume_rate/environment.volume)
+
+ var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
+
+ air_contents.merge(removed)
+
+ if(network)
+ network.update = 1
+
+ return 1
+
+/obj/machinery/atmospherics/unary/vent_scrubber/hide(var/i) //to make the little pipe section invisible, the icon changes.
+ update_icon()
+
+/obj/machinery/atmospherics/unary/vent_scrubber/receive_signal(datum/signal/signal)
+ if(stat & (NOPOWER|BROKEN))
return
-*/
+ if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
+ return 0
- receive_signal(datum/signal/signal)
- if(stat & (NOPOWER|BROKEN))
- return
- if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
- return 0
+ if(signal.data["power"] != null)
+ on = text2num(signal.data["power"])
+ if(signal.data["power_toggle"] != null)
+ on = !on
- if(signal.data["power"] != null)
- on = text2num(signal.data["power"])
- if(signal.data["power_toggle"] != null)
- on = !on
+ if(signal.data["panic_siphon"]) //must be before if("scrubbing" thing
+ panic = text2num(signal.data["panic_siphon"] != null)
+ if(panic)
+ on = 1
+ scrubbing = 0
+ volume_rate = 2000
+ else
+ scrubbing = 1
+ volume_rate = initial(volume_rate)
+ if(signal.data["toggle_panic_siphon"] != null)
+ panic = !panic
+ if(panic)
+ on = 1
+ scrubbing = 0
+ volume_rate = 2000
+ else
+ scrubbing = 1
+ volume_rate = initial(volume_rate)
- if(signal.data["panic_siphon"]) //must be before if("scrubbing" thing
- panic = text2num(signal.data["panic_siphon"] != null)
- if(panic)
- on = 1
- scrubbing = 0
- volume_rate = 2000
- else
- scrubbing = 1
- volume_rate = initial(volume_rate)
- if(signal.data["toggle_panic_siphon"] != null)
- panic = !panic
- if(panic)
- on = 1
- scrubbing = 0
- volume_rate = 2000
- else
- scrubbing = 1
- volume_rate = initial(volume_rate)
+ if(signal.data["scrubbing"] != null)
+ scrubbing = text2num(signal.data["scrubbing"])
+ if(signal.data["toggle_scrubbing"])
+ scrubbing = !scrubbing
- if(signal.data["scrubbing"] != null)
- scrubbing = text2num(signal.data["scrubbing"])
- if(signal.data["toggle_scrubbing"])
- scrubbing = !scrubbing
+ if(signal.data["co2_scrub"] != null)
+ scrub_CO2 = text2num(signal.data["co2_scrub"])
+ if(signal.data["toggle_co2_scrub"])
+ scrub_CO2 = !scrub_CO2
- if(signal.data["co2_scrub"] != null)
- scrub_CO2 = text2num(signal.data["co2_scrub"])
- if(signal.data["toggle_co2_scrub"])
- scrub_CO2 = !scrub_CO2
+ if(signal.data["tox_scrub"] != null)
+ scrub_Toxins = text2num(signal.data["tox_scrub"])
+ if(signal.data["toggle_tox_scrub"])
+ scrub_Toxins = !scrub_Toxins
- if(signal.data["tox_scrub"] != null)
- scrub_Toxins = text2num(signal.data["tox_scrub"])
- if(signal.data["toggle_tox_scrub"])
- scrub_Toxins = !scrub_Toxins
+ if(signal.data["n2o_scrub"] != null)
+ scrub_N2O = text2num(signal.data["n2o_scrub"])
+ if(signal.data["toggle_n2o_scrub"])
+ scrub_N2O = !scrub_N2O
- if(signal.data["n2o_scrub"] != null)
- scrub_N2O = text2num(signal.data["n2o_scrub"])
- if(signal.data["toggle_n2o_scrub"])
- scrub_N2O = !scrub_N2O
+ if(signal.data["init"] != null)
+ name = signal.data["init"]
+ return
- if(signal.data["init"] != null)
- name = signal.data["init"]
- return
-
- if(signal.data["status"] != null)
- spawn(2)
- broadcast_status()
- return //do not update_icon
-
-// log_admin("DEBUG \[[world.timeofday]\]: vent_scrubber/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
+ if(signal.data["status"] != null)
spawn(2)
broadcast_status()
- update_icon()
- return
+ return //do not update_icon
- power_change()
- if(powered(power_channel))
- stat &= ~NOPOWER
- else
- stat |= NOPOWER
+// log_admin("DEBUG \[[world.timeofday]\]: vent_scrubber/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
+ spawn(2)
+ broadcast_status()
+ update_icon()
+ return
+
+/obj/machinery/atmospherics/unary/vent_scrubber/power_change()
+ var/old_stat = stat
+ ..()
+ if(old_stat != stat)
update_icon()
- attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
- if (!istype(W, /obj/item/weapon/wrench))
- return ..()
- if (!(stat & NOPOWER) && on)
- user << "\red You cannot unwrench this [src], turn it off first."
- return 1
- var/turf/T = src.loc
- if (level==1 && isturf(T) && T.intact)
- user << "\red You must remove the plating first."
- return 1
- var/datum/gas_mixture/int_air = return_air()
- var/datum/gas_mixture/env_air = loc.return_air()
- if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
- user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
- add_fingerprint(user)
- return 1
- playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "\blue You begin to unfasten \the [src]..."
- if (do_after(user, 40))
- user.visible_message( \
- "[user] unfastens \the [src].", \
- "\blue You have unfastened \the [src].", \
- "You hear ratchet.")
- new /obj/item/pipe(loc, make_from=src)
- del(src)
+/obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+ if (!istype(W, /obj/item/weapon/wrench))
+ return ..()
+ if (!(stat & NOPOWER) && on)
+ user << "\red You cannot unwrench this [src], turn it off first."
+ return 1
+ var/turf/T = src.loc
+ if (node && node.level==1 && isturf(T) && T.intact)
+ user << "\red You must remove the plating first."
+ return 1
+ var/datum/gas_mixture/int_air = return_air()
+ var/datum/gas_mixture/env_air = loc.return_air()
+ if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
+ user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+ add_fingerprint(user)
+ return 1
+ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+ user << "\blue You begin to unfasten \the [src]..."
+ if (do_after(user, 40))
+ user.visible_message( \
+ "[user] unfastens \the [src].", \
+ "\blue You have unfastened \the [src].", \
+ "You hear ratchet.")
+ new /obj/item/pipe(loc, make_from=src)
+ del(src)
/obj/machinery/atmospherics/unary/vent_scrubber/Del()
if(initial_loc)
diff --git a/code/ATMOSPHERICS/components/valve.dm b/code/ATMOSPHERICS/components/valve.dm
index 09d0b64f86..75282275eb 100644
--- a/code/ATMOSPHERICS/components/valve.dm
+++ b/code/ATMOSPHERICS/components/valve.dm
@@ -1,10 +1,11 @@
-obj/machinery/atmospherics/valve
- icon = 'icons/obj/atmospherics/valve.dmi'
- icon_state = "valve0"
+/obj/machinery/atmospherics/valve
+ icon = 'icons/atmos/valve.dmi'
+ icon_state = "map_valve0"
name = "manual valve"
desc = "A pipe valve"
+ level = 1
dir = SOUTH
initialize_directions = SOUTH|NORTH
@@ -17,322 +18,297 @@ obj/machinery/atmospherics/valve
var/datum/pipe_network/network_node1
var/datum/pipe_network/network_node2
- open
- open = 1
- icon_state = "valve1"
+/obj/machinery/atmospherics/valve/open
+ open = 1
+ icon_state = "map_valve1"
- update_icon(animation)
- if(animation)
- flick("valve[src.open][!src.open]",src)
- else
- icon_state = "valve[open]"
+/obj/machinery/atmospherics/valve/update_icon(animation)
+ if(animation)
+ flick("valve[src.open][!src.open]",src)
+ else
+ icon_state = "valve[open]"
- New()
- switch(dir)
- if(NORTH || SOUTH)
- initialize_directions = NORTH|SOUTH
- if(EAST || WEST)
- initialize_directions = EAST|WEST
- ..()
+/obj/machinery/atmospherics/valve/update_underlays()
+ if(..())
+ underlays.Cut()
+ var/turf/T = get_turf(src)
+ if(!istype(T))
+ return
+ add_underlay(T, node1, get_dir(src, node1))
+ add_underlay(T, node2, get_dir(src, node2))
- network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+/obj/machinery/atmospherics/valve/hide(var/i)
+ update_underlays()
+/obj/machinery/atmospherics/valve/New()
+ switch(dir)
+ if(NORTH || SOUTH)
+ initialize_directions = NORTH|SOUTH
+ if(EAST || WEST)
+ initialize_directions = EAST|WEST
+ ..()
- if(reference == node1)
- network_node1 = new_network
- if(open)
- network_node2 = new_network
- else if(reference == node2)
- network_node2 = new_network
- if(open)
- network_node1 = new_network
-
- if(new_network.normal_members.Find(src))
- return 0
-
- new_network.normal_members += src
-
+/obj/machinery/atmospherics/valve/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+ if(reference == node1)
+ network_node1 = new_network
if(open)
- if(reference == node1)
- if(node2)
- return node2.network_expand(new_network, src)
- else if(reference == node2)
- if(node1)
- return node1.network_expand(new_network, src)
+ network_node2 = new_network
+ else if(reference == node2)
+ network_node2 = new_network
+ if(open)
+ network_node1 = new_network
- return null
+ if(new_network.normal_members.Find(src))
+ return 0
- Del()
- loc = null
+ new_network.normal_members += src
- if(node1)
- node1.disconnect(src)
- del(network_node1)
- if(node2)
- node2.disconnect(src)
- del(network_node2)
+ if(open)
+ if(reference == node1)
+ if(node2)
+ return node2.network_expand(new_network, src)
+ else if(reference == node2)
+ if(node1)
+ return node1.network_expand(new_network, src)
+ return null
+
+/obj/machinery/atmospherics/valve/Del()
+ loc = null
+
+ if(node1)
+ node1.disconnect(src)
+ del(network_node1)
+ if(node2)
+ node2.disconnect(src)
+ del(network_node2)
+
+ node1 = null
+ node2 = null
+
+ ..()
+
+/obj/machinery/atmospherics/valve/proc/open()
+ if(open) return 0
+
+ open = 1
+ update_icon()
+
+ if(network_node1&&network_node2)
+ network_node1.merge(network_node2)
+ network_node2 = network_node1
+
+ if(network_node1)
+ network_node1.update = 1
+ else if(network_node2)
+ network_node2.update = 1
+
+ return 1
+
+/obj/machinery/atmospherics/valve/proc/close()
+ if(!open)
+ return 0
+
+ open = 0
+ update_icon()
+
+ if(network_node1)
+ del(network_node1)
+ if(network_node2)
+ del(network_node2)
+
+ build_network()
+
+ return 1
+
+/obj/machinery/atmospherics/valve/proc/normalize_dir()
+ if(dir==3)
+ dir = 1
+ else if(dir==12)
+ dir = 4
+
+/obj/machinery/atmospherics/valve/attack_ai(mob/user as mob)
+ return
+
+/obj/machinery/atmospherics/valve/attack_paw(mob/user as mob)
+ return attack_hand(user)
+
+/obj/machinery/atmospherics/valve/attack_hand(mob/user as mob)
+ src.add_fingerprint(usr)
+ update_icon(1)
+ sleep(10)
+ if (src.open)
+ src.close()
+ else
+ src.open()
+
+/obj/machinery/atmospherics/valve/process()
+ ..()
+ . = PROCESS_KILL
+
+ return
+
+/obj/machinery/atmospherics/valve/initialize()
+ normalize_dir()
+
+ var/node1_dir
+ var/node2_dir
+
+ for(var/direction in cardinal)
+ if(direction&initialize_directions)
+ if (!node1_dir)
+ node1_dir = direction
+ else if (!node2_dir)
+ node2_dir = direction
+
+ for(var/obj/machinery/atmospherics/target in get_step(src,node1_dir))
+ if(target.initialize_directions & get_dir(target,src))
+ node1 = target
+ break
+ for(var/obj/machinery/atmospherics/target in get_step(src,node2_dir))
+ if(target.initialize_directions & get_dir(target,src))
+ node2 = target
+ break
+
+ build_network()
+
+ update_icon()
+ update_underlays()
+
+ if(openDuringInit)
+ close()
+ open()
+ openDuringInit = 0
+
+/obj/machinery/atmospherics/valve/build_network()
+ if(!network_node1 && node1)
+ network_node1 = new /datum/pipe_network()
+ network_node1.normal_members += src
+ network_node1.build_network(node1, src)
+
+ if(!network_node2 && node2)
+ network_node2 = new /datum/pipe_network()
+ network_node2.normal_members += src
+ network_node2.build_network(node2, src)
+
+/obj/machinery/atmospherics/valve/return_network(obj/machinery/atmospherics/reference)
+ build_network()
+
+ if(reference==node1)
+ return network_node1
+
+ if(reference==node2)
+ return network_node2
+
+ return null
+
+/obj/machinery/atmospherics/valve/reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
+ if(network_node1 == old_network)
+ network_node1 = new_network
+ if(network_node2 == old_network)
+ network_node2 = new_network
+
+ return 1
+
+/obj/machinery/atmospherics/valve/return_network_air(datum/network/reference)
+ return null
+
+/obj/machinery/atmospherics/valve/disconnect(obj/machinery/atmospherics/reference)
+ if(reference==node1)
+ del(network_node1)
node1 = null
+
+ else if(reference==node2)
+ del(network_node2)
node2 = null
- ..()
+ update_underlays()
- proc/open()
+ return null
- if(open) return 0
+/obj/machinery/atmospherics/valve/digital // can be controlled by AI
+ name = "digital valve"
+ desc = "A digitally controlled valve."
+ icon = 'icons/atmos/digital_valve.dmi'
+
+ var/frequency = 0
+ var/id = null
+ var/datum/radio_frequency/radio_connection
- open = 1
+/obj/machinery/atmospherics/valve/digital/attack_ai(mob/user as mob)
+ return src.attack_hand(user)
+
+/obj/machinery/atmospherics/valve/digital/attack_hand(mob/user as mob)
+ if(!powered())
+ return
+ if(!src.allowed(user))
+ user << "\red Access denied."
+ return
+ ..()
+
+/obj/machinery/atmospherics/valve/digital/open
+ open = 1
+ icon_state = "map_valve1"
+
+/obj/machinery/atmospherics/valve/digital/power_change()
+ var/old_stat = stat
+ ..()
+ if(old_stat != stat)
update_icon()
- if(network_node1&&network_node2)
- network_node1.merge(network_node2)
- network_node2 = network_node1
+/obj/machinery/atmospherics/valve/digital/update_icon()
+ ..()
+ if(!powered())
+ icon_state = "valve[open]nopower"
- if(network_node1)
- network_node1.update = 1
- else if(network_node2)
- network_node2.update = 1
+/obj/machinery/atmospherics/valve/digital/proc/set_frequency(new_frequency)
+ radio_controller.remove_object(src, frequency)
+ frequency = new_frequency
+ if(frequency)
+ radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
- return 1
+/obj/machinery/atmospherics/valve/digital/initialize()
+ ..()
+ if(frequency)
+ set_frequency(frequency)
- proc/close()
+/obj/machinery/atmospherics/valve/digital/receive_signal(datum/signal/signal)
+ if(!signal.data["tag"] || (signal.data["tag"] != id))
+ return 0
- if(!open)
- return 0
+ switch(signal.data["command"])
+ if("valve_open")
+ if(!open)
+ open()
- open = 0
- update_icon()
+ if("valve_close")
+ if(open)
+ close()
- if(network_node1)
- del(network_node1)
- if(network_node2)
- del(network_node2)
-
- build_network()
-
- return 1
-
- proc/normalize_dir()
- if(dir==3)
- dir = 1
- else if(dir==12)
- dir = 4
-
- attack_ai(mob/user as mob)
- return
-
- attack_paw(mob/user as mob)
- return attack_hand(user)
-
- attack_hand(mob/user as mob)
- src.add_fingerprint(usr)
- update_icon(1)
- sleep(10)
- if (src.open)
- src.close()
- else
- src.open()
-
- process()
- ..()
- . = PROCESS_KILL
-
-/* if(open && (!node1 || !node2))
- close()
- if(!node1)
- if(!nodealert)
- //world << "Missing node from [src] at [src.x],[src.y],[src.z]"
- nodealert = 1
- else if (!node2)
- if(!nodealert)
- //world << "Missing node from [src] at [src.x],[src.y],[src.z]"
- nodealert = 1
- else if (nodealert)
- nodealert = 0
-*/
-
- return
-
- initialize()
- normalize_dir()
-
- var/node1_dir
- var/node2_dir
-
- for(var/direction in cardinal)
- if(direction&initialize_directions)
- if (!node1_dir)
- node1_dir = direction
- else if (!node2_dir)
- node2_dir = direction
-
- for(var/obj/machinery/atmospherics/target in get_step(src,node1_dir))
- if(target.initialize_directions & get_dir(target,src))
- node1 = target
- break
- for(var/obj/machinery/atmospherics/target in get_step(src,node2_dir))
- if(target.initialize_directions & get_dir(target,src))
- node2 = target
- break
-
- build_network()
-
- if(openDuringInit)
- close()
- open()
- openDuringInit = 0
-
-/*
- var/connect_directions
- switch(dir)
- if(NORTH)
- connect_directions = NORTH|SOUTH
- if(SOUTH)
- connect_directions = NORTH|SOUTH
- if(EAST)
- connect_directions = EAST|WEST
- if(WEST)
- connect_directions = EAST|WEST
+ if("valve_toggle")
+ if(open)
+ close()
else
- connect_directions = dir
-
- for(var/direction in cardinal)
- if(direction&connect_directions)
- for(var/obj/machinery/atmospherics/target in get_step(src,direction))
- if(target.initialize_directions & get_dir(target,src))
- connect_directions &= ~direction
- node1 = target
- break
- if(node1)
- break
-
- for(var/direction in cardinal)
- if(direction&connect_directions)
- for(var/obj/machinery/atmospherics/target in get_step(src,direction))
- if(target.initialize_directions & get_dir(target,src))
- node2 = target
- break
- if(node1)
- break
-*/
- build_network()
- if(!network_node1 && node1)
- network_node1 = new /datum/pipe_network()
- network_node1.normal_members += src
- network_node1.build_network(node1, src)
-
- if(!network_node2 && node2)
- network_node2 = new /datum/pipe_network()
- network_node2.normal_members += src
- network_node2.build_network(node2, src)
-
-
- return_network(obj/machinery/atmospherics/reference)
- build_network()
-
- if(reference==node1)
- return network_node1
-
- if(reference==node2)
- return network_node2
-
- return null
-
- reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
- if(network_node1 == old_network)
- network_node1 = new_network
- if(network_node2 == old_network)
- network_node2 = new_network
+ open()
+/obj/machinery/atmospherics/valve/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+ if (!istype(W, /obj/item/weapon/wrench))
+ return ..()
+ if (istype(src, /obj/machinery/atmospherics/valve/digital))
+ user << "\red You cannot unwrench this [src], it's too complicated."
return 1
-
- return_network_air(datum/network/reference)
- return null
-
- disconnect(obj/machinery/atmospherics/reference)
- if(reference==node1)
- del(network_node1)
- node1 = null
-
- else if(reference==node2)
- del(network_node2)
- node2 = null
-
- return null
-
- digital // can be controlled by AI
- name = "digital valve"
- desc = "A digitally controlled valve."
- icon = 'icons/obj/atmospherics/digital_valve.dmi'
-
- attack_ai(mob/user as mob)
- return src.attack_hand(user)
-
- attack_hand(mob/user as mob)
- if(!src.allowed(user))
- user << "\red Access denied."
- return
- ..()
-
- //Radio remote control
-
- proc
- set_frequency(new_frequency)
- radio_controller.remove_object(src, frequency)
- frequency = new_frequency
- if(frequency)
- radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
-
- var/frequency = 0
- var/id = null
- var/datum/radio_frequency/radio_connection
-
- initialize()
- ..()
- if(frequency)
- set_frequency(frequency)
-
- receive_signal(datum/signal/signal)
- if(!signal.data["tag"] || (signal.data["tag"] != id))
- return 0
-
- switch(signal.data["command"])
- if("valve_open")
- if(!open)
- open()
-
- if("valve_close")
- if(open)
- close()
-
- if("valve_toggle")
- if(open)
- close()
- else
- open()
-
- attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
- if (!istype(W, /obj/item/weapon/wrench))
- return ..()
- if (istype(src, /obj/machinery/atmospherics/valve/digital))
- user << "\red You cannot unwrench this [src], it's too complicated."
- return 1
- var/turf/T = src.loc
- if (level==1 && isturf(T) && T.intact)
- user << "\red You must remove the plating first."
- return 1
- var/datum/gas_mixture/int_air = return_air()
- var/datum/gas_mixture/env_air = loc.return_air()
- if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
- user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
- add_fingerprint(user)
- return 1
- playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "\blue You begin to unfasten \the [src]..."
- if (do_after(user, 40))
- user.visible_message( \
- "[user] unfastens \the [src].", \
- "\blue You have unfastened \the [src].", \
- "You hear ratchet.")
- new /obj/item/pipe(loc, make_from=src)
- del(src)
+ var/datum/gas_mixture/int_air = return_air()
+ var/datum/gas_mixture/env_air = loc.return_air()
+ if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
+ user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+ add_fingerprint(user)
+ return 1
+ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+ user << "\blue You begin to unfasten \the [src]..."
+ if (do_after(user, 40))
+ user.visible_message( \
+ "[user] unfastens \the [src].", \
+ "\blue You have unfastened \the [src].", \
+ "You hear ratchet.")
+ new /obj/item/pipe(loc, make_from=src)
+ del(src)
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/mapdebugging.dm b/code/ATMOSPHERICS/mapdebugging.dm
deleted file mode 100644
index 2dc3949713..0000000000
--- a/code/ATMOSPHERICS/mapdebugging.dm
+++ /dev/null
@@ -1,16 +0,0 @@
-client/verb/discon_pipes()
- set name = "Show Disconnected Pipes"
- set category = "Debug"
-
- for(var/obj/machinery/atmospherics/pipe/simple/P in world)
- if(!P.node1 || !P.node2)
- usr << "[P], [P.x], [P.y], [P.z], [P.loc.loc]"
-
- for(var/obj/machinery/atmospherics/pipe/manifold/P in world)
- if(!P.node1 || !P.node2 || !P.node3)
- usr << "[P], [P.x], [P.y], [P.z], [P.loc.loc]"
-
- for(var/obj/machinery/atmospherics/pipe/manifold4w/P in world)
- if(!P.node1 || !P.node2 || !P.node3 || !P.node4)
- usr << "[P], [P.x], [P.y], [P.z], [P.loc.loc]"
-//With thanks to mini. Check before use, uncheck after. Do Not Use on a live server.
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm
index 11daee64c3..875c5a67ee 100644
--- a/code/ATMOSPHERICS/pipes.dm
+++ b/code/ATMOSPHERICS/pipes.dm
@@ -1,4 +1,4 @@
-obj/machinery/atmospherics/pipe
+/obj/machinery/atmospherics/pipe
var/datum/gas_mixture/air_temporary //used when reconstructing a pipeline that broke
var/datum/pipeline/parent
@@ -12,51 +12,57 @@ obj/machinery/atmospherics/pipe
var/alert_pressure = 80*ONE_ATMOSPHERE
//minimum pressure before check_pressure(...) should be called
-obj/machinery/atmospherics/pipe/proc/pipeline_expansion()
+/obj/machinery/atmospherics/pipe/New()
+ ..()
+ //so pipes under walls are hidden
+ if(!istype(get_turf(src), /turf/simulated/floor))
+ level = 1
+
+/obj/machinery/atmospherics/pipe/proc/pipeline_expansion()
return null
-obj/machinery/atmospherics/pipe/proc/check_pressure(pressure)
+/obj/machinery/atmospherics/pipe/proc/check_pressure(pressure)
//Return 1 if parent should continue checking other pipes
//Return null if parent should stop checking other pipes. Recall: del(src) will by default return null
return 1
-obj/machinery/atmospherics/pipe/return_air()
+/obj/machinery/atmospherics/pipe/return_air()
if(!parent)
parent = new /datum/pipeline()
parent.build_pipeline(src)
return parent.air
-obj/machinery/atmospherics/pipe/build_network()
+/obj/machinery/atmospherics/pipe/build_network()
if(!parent)
parent = new /datum/pipeline()
parent.build_pipeline(src)
return parent.return_network()
-obj/machinery/atmospherics/pipe/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+/obj/machinery/atmospherics/pipe/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
if(!parent)
parent = new /datum/pipeline()
parent.build_pipeline(src)
return parent.network_expand(new_network, reference)
-obj/machinery/atmospherics/pipe/return_network(obj/machinery/atmospherics/reference)
+/obj/machinery/atmospherics/pipe/return_network(obj/machinery/atmospherics/reference)
if(!parent)
parent = new /datum/pipeline()
parent.build_pipeline(src)
return parent.return_network(reference)
-obj/machinery/atmospherics/pipe/Del()
+/obj/machinery/atmospherics/pipe/Del()
del(parent)
if(air_temporary)
loc.assume_air(air_temporary)
..()
-obj/machinery/atmospherics/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+/obj/machinery/atmospherics/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
if (istype(src, /obj/machinery/atmospherics/pipe/tank))
return ..()
if (istype(src, /obj/machinery/atmospherics/pipe/vent))
@@ -91,10 +97,44 @@ obj/machinery/atmospherics/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/u
del(meter)
del(src)
+/obj/machinery/atmospherics/proc/change_color(var/new_color)
+ //only pass valid pipe colors please ~otherwise your pipe will turn invisible
+ if(!pipe_color_check(new_color))
+ return
-obj/machinery/atmospherics/pipe/simple
- icon = 'icons/obj/pipes.dmi'
+ pipe_color = new_color
+ update_icon()
+/obj/machinery/atmospherics/pipe/add_underlay(var/obj/machinery/atmospherics/node, var/direction)
+ if(istype(src, /obj/machinery/atmospherics/pipe/tank)) //todo: move tanks to unary devices
+ return ..()
+
+ if(node)
+ var/temp_dir = get_dir(src, node)
+ underlays += icon_manager.get_atmos_icon("pipe_underlay_intact", temp_dir, color_cache_name(node))
+ return temp_dir
+ else if(direction)
+ underlays += icon_manager.get_atmos_icon("pipe_underlay_exposed", direction, pipe_color)
+ else
+ return null
+
+/obj/machinery/atmospherics/pipe/color_cache_name(var/obj/machinery/atmospherics/node)
+ if(istype(src, /obj/machinery/atmospherics/pipe/tank))
+ return ..()
+
+ if(istype(node, /obj/machinery/atmospherics/pipe/manifold) || istype(node, /obj/machinery/atmospherics/pipe/manifold4w))
+ if(pipe_color == node.pipe_color)
+ return node.pipe_color
+ else
+ return null
+ else if(istype(node, /obj/machinery/atmospherics/pipe/simple))
+ return node.pipe_color
+ else
+ return pipe_color
+
+/obj/machinery/atmospherics/pipe/simple
+ icon = 'icons/atmos/pipes.dmi'
+ icon_state = "intact"
name = "pipe"
desc = "A one meter section of regular pipe"
@@ -113,12 +153,16 @@ obj/machinery/atmospherics/pipe/simple
var/fatigue_pressure = 55*ONE_ATMOSPHERE
alert_pressure = 55*ONE_ATMOSPHERE
-
level = 1
-obj/machinery/atmospherics/pipe/simple/New()
+/obj/machinery/atmospherics/pipe/simple/New()
..()
+
+ // Pipe colors and icon states are handled by an image cache - so color and icon should
+ // be null. For mapping purposes color is defined in the object definitions.
+ icon = null
alpha = 255
+
switch(dir)
if(SOUTH || NORTH)
initialize_directions = SOUTH|NORTH
@@ -133,53 +177,18 @@ obj/machinery/atmospherics/pipe/simple/New()
if(SOUTHWEST)
initialize_directions = SOUTH|WEST
-
-obj/machinery/atmospherics/pipe/simple/hide(var/i)
+/obj/machinery/atmospherics/pipe/simple/hide(var/i)
if(level == 1 && istype(loc, /turf/simulated))
invisibility = i ? 101 : 0
update_icon()
-obj/machinery/atmospherics/pipe/simple/process()
+/obj/machinery/atmospherics/pipe/simple/process()
if(!parent) //This should cut back on the overhead calling build_network thousands of times per cycle
..()
else
. = PROCESS_KILL
- /*if(!node1)
- parent.mingle_with_turf(loc, volume)
- if(!nodealert)
- //world << "Missing node from [src] at [src.x],[src.y],[src.z]"
- nodealert = 1
-
- else if(!node2)
- parent.mingle_with_turf(loc, volume)
- if(!nodealert)
- //world << "Missing node from [src] at [src.x],[src.y],[src.z]"
- nodealert = 1
- else if (nodealert)
- nodealert = 0
-
-
- else if(parent)
- var/environment_temperature = 0
-
- if(istype(loc, /turf/simulated/))
- if(loc:blocks_air)
- environment_temperature = loc:temperature
- else
- var/datum/gas_mixture/environment = loc.return_air()
- environment_temperature = environment.temperature
-
- else
- environment_temperature = loc:temperature
-
- var/datum/gas_mixture/pipe_air = return_air()
-
- if(abs(environment_temperature-pipe_air.temperature) > minimum_temperature_difference)
- parent.temperature_interact(loc, volume, thermal_conductivity)
- */ //Screw you heat lag
-
-obj/machinery/atmospherics/pipe/simple/check_pressure(pressure)
+/obj/machinery/atmospherics/pipe/simple/check_pressure(pressure)
var/datum/gas_mixture/environment = loc.return_air()
var/pressure_difference = pressure - environment.return_pressure()
@@ -194,7 +203,7 @@ obj/machinery/atmospherics/pipe/simple/check_pressure(pressure)
else return 1
-obj/machinery/atmospherics/pipe/simple/proc/burst()
+/obj/machinery/atmospherics/pipe/simple/proc/burst()
src.visible_message("\red \bold [src] bursts!");
playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
var/datum/effect/effect/system/smoke_spread/smoke = new
@@ -202,13 +211,13 @@ obj/machinery/atmospherics/pipe/simple/proc/burst()
smoke.start()
del(src)
-obj/machinery/atmospherics/pipe/simple/proc/normalize_dir()
+/obj/machinery/atmospherics/pipe/simple/proc/normalize_dir()
if(dir==3)
dir = 1
else if(dir==12)
dir = 4
-obj/machinery/atmospherics/pipe/simple/Del()
+/obj/machinery/atmospherics/pipe/simple/Del()
if(node1)
node1.disconnect(src)
if(node2)
@@ -216,42 +225,42 @@ obj/machinery/atmospherics/pipe/simple/Del()
..()
-obj/machinery/atmospherics/pipe/simple/pipeline_expansion()
+/obj/machinery/atmospherics/pipe/simple/pipeline_expansion()
return list(node1, node2)
-obj/machinery/atmospherics/pipe/simple/update_icon()
- switch(pipe_color)
- if ("red") color = COLOR_RED
- if ("blue") color = COLOR_BLUE
- if ("cyan") color = COLOR_CYAN
- if ("green") color = COLOR_GREEN
- if ("yellow") color = "#FFCC00"
- if ("purple") color = "#5C1EC0"
- if ("grey") color = null
+/obj/machinery/atmospherics/pipe/simple/change_color(var/new_color)
+ ..()
+ //for updating connected atmos device pipes (i.e. vents, manifolds, etc)
+ if(node1)
+ node1.update_underlays()
+ if(node2)
+ node2.update_underlays()
- if(node1 && node2)
- icon_state = "intact[invisibility ? "-f" : "" ]"
+/obj/machinery/atmospherics/pipe/simple/update_icon(var/safety = 0)
+ if(!check_icon_cache())
+ return
- //var/node1_direction = get_dir(src, node1)
- //var/node2_direction = get_dir(src, node2)
+ alpha = 255
- //dir = node1_direction|node2_direction
+ overlays.Cut()
+ if(!node1 && !node2)
+ var/turf/T = get_turf(src)
+ new /obj/item/pipe(loc, make_from=src)
+ for (var/obj/machinery/meter/meter in T)
+ if (meter.target == src)
+ new /obj/item/pipe_meter(T)
+ del(meter)
+ del(src)
+ else if(node1 && node2)
+ overlays += icon_manager.get_atmos_icon("pipe", , pipe_color, "intact")
else
- if(!node1 && !node2)
- var/turf/T = get_turf(src)
- new /obj/item/pipe(loc, make_from=src)
- for (var/obj/machinery/meter/meter in T)
- if (meter.target == src)
- new /obj/item/pipe_meter(T)
- del(meter)
- del(src)
- var/have_node1 = node1?1:0
- var/have_node2 = node2?1:0
- icon_state = "exposed[have_node1][have_node2][invisibility ? "-f" : "" ]"
+ overlays += icon_manager.get_atmos_icon("pipe", , pipe_color, "exposed[node1?1:0][node2?1:0]")
+/obj/machinery/atmospherics/pipe/simple/update_underlays()
+ return
-obj/machinery/atmospherics/pipe/simple/initialize()
+/obj/machinery/atmospherics/pipe/simple/initialize()
normalize_dir()
var/node1_dir
var/node2_dir
@@ -276,12 +285,12 @@ obj/machinery/atmospherics/pipe/simple/initialize()
del(src)
return
- var/turf/T = src.loc // hide if turf is not intact
- hide(T.intact)
+ var/turf/T = get_turf(src)
+ if(istype(T))
+ hide(T.intact)
update_icon()
- //update_icon()
-obj/machinery/atmospherics/pipe/simple/disconnect(obj/machinery/atmospherics/reference)
+/obj/machinery/atmospherics/pipe/simple/disconnect(obj/machinery/atmospherics/reference)
if(reference == node1)
if(istype(node1, /obj/machinery/atmospherics/pipe))
del(parent)
@@ -296,55 +305,54 @@ obj/machinery/atmospherics/pipe/simple/disconnect(obj/machinery/atmospherics/ref
return null
-
-
-
-obj/machinery/atmospherics/pipe/simple/visible
+/obj/machinery/atmospherics/pipe/simple/visible
level = 2
- icon_state = "intact"
-obj/machinery/atmospherics/pipe/simple/visible/scrubbers
- name="Scrubbers pipe"
- color=COLOR_RED
+/obj/machinery/atmospherics/pipe/simple/visible/scrubbers
+ name = "Scrubbers pipe"
+ color = PIPE_COLOR_RED
-obj/machinery/atmospherics/pipe/simple/visible/supply
- name="Air supply pipe"
- color=COLOR_BLUE
+/obj/machinery/atmospherics/pipe/simple/visible/supply
+ name = "Air supply pipe"
+ color = PIPE_COLOR_BLUE
-obj/machinery/atmospherics/pipe/simple/visible/yellow
- color="#FFCC00"
+/obj/machinery/atmospherics/pipe/simple/visible/yellow
+ color = PIPE_COLOR_YELLOW
-obj/machinery/atmospherics/pipe/simple/visible/cyan
- color=COLOR_CYAN
+/obj/machinery/atmospherics/pipe/simple/visible/cyan
+ color = PIPE_COLOR_CYAN
-obj/machinery/atmospherics/pipe/simple/visible/green
- color=COLOR_GREEN
+/obj/machinery/atmospherics/pipe/simple/visible/green
+ color = PIPE_COLOR_GREEN
+/obj/machinery/atmospherics/pipe/simple/visible/purple
+ color = PIPE_COLOR_PURPLE
-obj/machinery/atmospherics/pipe/simple/hidden
+/obj/machinery/atmospherics/pipe/simple/hidden
level = 1
- icon_state = "intact-f"
- alpha = 192 //set for the benefit of mapping - this is reset to opaque when the pipe is spawned in game
+ alpha = 128 //set for the benefit of mapping - this is reset to opaque when the pipe is spawned in game
-obj/machinery/atmospherics/pipe/simple/hidden/scrubbers
- name="Scrubbers pipe"
- color=COLOR_RED
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers
+ name = "Scrubbers pipe"
+ color = PIPE_COLOR_RED
-obj/machinery/atmospherics/pipe/simple/hidden/supply
- name="Air supply pipe"
- color=COLOR_BLUE
+/obj/machinery/atmospherics/pipe/simple/hidden/supply
+ name = "Air supply pipe"
+ color = PIPE_COLOR_BLUE
-obj/machinery/atmospherics/pipe/simple/hidden/yellow
- color="#FFCC00"
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow
+ color = PIPE_COLOR_YELLOW
-obj/machinery/atmospherics/pipe/simple/hidden/cyan
- color=COLOR_CYAN
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan
+ color = PIPE_COLOR_CYAN
-obj/machinery/atmospherics/pipe/simple/hidden/green
- color=COLOR_GREEN
+/obj/machinery/atmospherics/pipe/simple/hidden/green
+ color = PIPE_COLOR_GREEN
+/obj/machinery/atmospherics/pipe/simple/hidden/purple
+ color = PIPE_COLOR_PURPLE
-obj/machinery/atmospherics/pipe/simple/insulated
+/obj/machinery/atmospherics/pipe/simple/insulated
icon = 'icons/obj/atmospherics/red_pipe.dmi'
icon_state = "intact"
@@ -357,9 +365,9 @@ obj/machinery/atmospherics/pipe/simple/insulated
level = 2
-obj/machinery/atmospherics/pipe/manifold
- icon = 'icons/obj/atmospherics/pipe_manifold.dmi'
-
+/obj/machinery/atmospherics/pipe/manifold
+ icon = 'icons/atmos/manifold.dmi'
+ icon_state = "map"
name = "pipe manifold"
desc = "A manifold composed of regular pipes"
@@ -375,8 +383,11 @@ obj/machinery/atmospherics/pipe/manifold
level = 1
layer = 2.4 //under wires with their 2.44
-obj/machinery/atmospherics/pipe/manifold/New()
+/obj/machinery/atmospherics/pipe/manifold/New()
+ ..()
alpha = 255
+ icon = null
+
switch(dir)
if(NORTH)
initialize_directions = EAST|SOUTH|WEST
@@ -387,43 +398,21 @@ obj/machinery/atmospherics/pipe/manifold/New()
if(WEST)
initialize_directions = NORTH|EAST|SOUTH
- ..()
-
-
-
-obj/machinery/atmospherics/pipe/manifold/hide(var/i)
+/obj/machinery/atmospherics/pipe/manifold/hide(var/i)
if(level == 1 && istype(loc, /turf/simulated))
invisibility = i ? 101 : 0
update_icon()
-obj/machinery/atmospherics/pipe/manifold/pipeline_expansion()
+/obj/machinery/atmospherics/pipe/manifold/pipeline_expansion()
return list(node1, node2, node3)
-obj/machinery/atmospherics/pipe/manifold/process()
+/obj/machinery/atmospherics/pipe/manifold/process()
if(!parent)
..()
else
. = PROCESS_KILL
-/*
- if(!node1)
- parent.mingle_with_turf(loc, 70)
- if(!nodealert)
- //world << "Missing node from [src] at [src.x],[src.y],[src.z]"
- nodealert = 1
- else if(!node2)
- parent.mingle_with_turf(loc, 70)
- if(!nodealert)
- //world << "Missing node from [src] at [src.x],[src.y],[src.z]"
- nodealert = 1
- else if(!node3)
- parent.mingle_with_turf(loc, 70)
- if(!nodealert)
- //world << "Missing node from [src] at [src.x],[src.y],[src.z]"
- nodealert = 1
- else if (nodealert)
- nodealert = 0
-*/
-obj/machinery/atmospherics/pipe/manifold/Del()
+
+/obj/machinery/atmospherics/pipe/manifold/Del()
if(node1)
node1.disconnect(src)
if(node2)
@@ -433,7 +422,7 @@ obj/machinery/atmospherics/pipe/manifold/Del()
..()
-obj/machinery/atmospherics/pipe/manifold/disconnect(obj/machinery/atmospherics/reference)
+/obj/machinery/atmospherics/pipe/manifold/disconnect(obj/machinery/atmospherics/reference)
if(reference == node1)
if(istype(node1, /obj/machinery/atmospherics/pipe))
del(parent)
@@ -453,40 +442,51 @@ obj/machinery/atmospherics/pipe/manifold/disconnect(obj/machinery/atmospherics/r
..()
-obj/machinery/atmospherics/pipe/manifold/update_icon()
- if(node1&&node2&&node3)
- switch(pipe_color)
- if ("red") color = COLOR_RED
- if ("blue") color = COLOR_BLUE
- if ("cyan") color = COLOR_CYAN
- if ("green") color = COLOR_GREEN
- if ("yellow") color = "#FFCC00"
- if ("purple") color = "#5C1EC0"
- if ("grey") color = null
- icon_state = "manifold[invisibility ? "-f" : "" ]"
+/obj/machinery/atmospherics/pipe/manifold/change_color(var/new_color)
+ ..()
+ //for updating connected atmos device pipes (i.e. vents, manifolds, etc)
+ if(node1)
+ node1.update_underlays()
+ if(node2)
+ node2.update_underlays()
+ if(node3)
+ node3.update_underlays()
+/obj/machinery/atmospherics/pipe/manifold/update_icon(var/safety = 0)
+ if(!check_icon_cache())
+ return
+
+ alpha = 255
+
+ if(!node1 && !node2 && !node3)
+ var/turf/T = get_turf(src)
+ new /obj/item/pipe(loc, make_from=src)
+ for (var/obj/machinery/meter/meter in T)
+ if (meter.target == src)
+ new /obj/item/pipe_meter(T)
+ del(meter)
+ del(src)
else
- var/connected = 0
- var/unconnected = 0
- var/connect_directions = (NORTH|SOUTH|EAST|WEST)&(~dir)
+ overlays.Cut()
+ overlays += icon_manager.get_atmos_icon("manifold", , pipe_color, "core")
+ overlays += icon_manager.get_atmos_icon("manifold", , , "clamps")
+ underlays.Cut()
+
+ var/list/directions = list(NORTH, SOUTH, EAST, WEST)
+ directions -= dir
- if(node1)
- connected |= get_dir(src, node1)
- if(node2)
- connected |= get_dir(src, node2)
- if(node3)
- connected |= get_dir(src, node3)
+ directions -= add_underlay(node1)
+ directions -= add_underlay(node2)
+ directions -= add_underlay(node3)
- unconnected = (~connected)&(connect_directions)
+ for(var/D in directions)
+ add_underlay(,D)
- icon_state = "manifold_[connected]_[unconnected]"
+/obj/machinery/atmospherics/pipe/manifold/update_underlays()
+ ..()
+ update_icon()
- if(!connected)
- del(src)
-
- return
-
-obj/machinery/atmospherics/pipe/manifold/initialize()
+/obj/machinery/atmospherics/pipe/manifold/initialize()
var/connect_directions = (NORTH|SOUTH|EAST|WEST)&(~dir)
for(var/direction in cardinal)
@@ -521,61 +521,61 @@ obj/machinery/atmospherics/pipe/manifold/initialize()
if (node3)
break
- var/turf/T = src.loc // hide if turf is not intact
- hide(T.intact)
- //update_icon()
+ var/turf/T = get_turf(src)
+ if(istype(T))
+ hide(T.intact)
update_icon()
-
-obj/machinery/atmospherics/pipe/manifold/visible
+/obj/machinery/atmospherics/pipe/manifold/visible
level = 2
- icon_state = "manifold"
-obj/machinery/atmospherics/pipe/manifold/visible/supply
- name="Air supply pipe"
- color=COLOR_BLUE
+/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers
+ name = "Scrubbers pipe"
+ color = PIPE_COLOR_RED
-obj/machinery/atmospherics/pipe/manifold/visible/scrubbers
- name="Scrubbers pipe"
- color=COLOR_RED
+/obj/machinery/atmospherics/pipe/manifold/visible/supply
+ name = "Air supply pipe"
+ color = PIPE_COLOR_BLUE
-obj/machinery/atmospherics/pipe/manifold/visible/yellow
- color="#FFCC00"
+/obj/machinery/atmospherics/pipe/manifold/visible/yellow
+ color = PIPE_COLOR_YELLOW
-obj/machinery/atmospherics/pipe/manifold/visible/cyan
- color=COLOR_CYAN
+/obj/machinery/atmospherics/pipe/manifold/visible/cyan
+ color = PIPE_COLOR_CYAN
-obj/machinery/atmospherics/pipe/manifold/visible/green
- color=COLOR_GREEN
+/obj/machinery/atmospherics/pipe/manifold/visible/green
+ color = PIPE_COLOR_GREEN
+/obj/machinery/atmospherics/pipe/manifold/visible/purple
+ color = PIPE_COLOR_PURPLE
-obj/machinery/atmospherics/pipe/manifold/hidden
+/obj/machinery/atmospherics/pipe/manifold/hidden
level = 1
- icon_state = "manifold-f"
- alpha = 192 //set for the benefit of mapping - this is reset to opaque when the pipe is spawned in game
+ alpha = 128 //set for the benefit of mapping - this is reset to opaque when the pipe is spawned in game
-obj/machinery/atmospherics/pipe/manifold/hidden/supply
- name="Air supply pipe"
- color=COLOR_BLUE
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers
+ name = "Scrubbers pipe"
+ color = PIPE_COLOR_RED
-obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers
- name="Scrubbers pipe"
- color = COLOR_RED
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply
+ name = "Air supply pipe"
+ color = PIPE_COLOR_BLUE
-obj/machinery/atmospherics/pipe/manifold/hidden/yellow
- color="#FFCC00"
+/obj/machinery/atmospherics/pipe/manifold/hidden/yellow
+ color = PIPE_COLOR_YELLOW
-obj/machinery/atmospherics/pipe/manifold/hidden/cyan
- color=COLOR_CYAN
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan
+ color = PIPE_COLOR_CYAN
-obj/machinery/atmospherics/pipe/manifold/hidden/green
- color=COLOR_GREEN
+/obj/machinery/atmospherics/pipe/manifold/hidden/green
+ color = PIPE_COLOR_GREEN
+/obj/machinery/atmospherics/pipe/manifold/hidden/purple
+ color = PIPE_COLOR_PURPLE
-
-obj/machinery/atmospherics/pipe/manifold4w
- icon = 'icons/obj/atmospherics/pipe_manifold.dmi'
-
+/obj/machinery/atmospherics/pipe/manifold4w
+ icon = 'icons/atmos/manifold.dmi'
+ icon_state = "map_4way"
name = "4-way pipe manifold"
desc = "A manifold composed of regular pipes"
@@ -592,43 +592,21 @@ obj/machinery/atmospherics/pipe/manifold4w
level = 1
layer = 2.4 //under wires with their 2.44
-obj/machinery/atmospherics/pipe/manifold4w/New()
+/obj/machinery/atmospherics/pipe/manifold4w/New()
..()
alpha = 255
+ icon = null
-obj/machinery/atmospherics/pipe/manifold4w/hide(var/i)
- if(level == 1 && istype(loc, /turf/simulated))
- invisibility = i ? 101 : 0
- update_icon()
-
-obj/machinery/atmospherics/pipe/manifold4w/pipeline_expansion()
+/obj/machinery/atmospherics/pipe/manifold4w/pipeline_expansion()
return list(node1, node2, node3, node4)
-obj/machinery/atmospherics/pipe/manifold4w/process()
+/obj/machinery/atmospherics/pipe/manifold4w/process()
if(!parent)
..()
else
. = PROCESS_KILL
-/*
- if(!node1)
- parent.mingle_with_turf(loc, 70)
- if(!nodealert)
- //world << "Missing node from [src] at [src.x],[src.y],[src.z]"
- nodealert = 1
- else if(!node2)
- parent.mingle_with_turf(loc, 70)
- if(!nodealert)
- //world << "Missing node from [src] at [src.x],[src.y],[src.z]"
- nodealert = 1
- else if(!node3)
- parent.mingle_with_turf(loc, 70)
- if(!nodealert)
- //world << "Missing node from [src] at [src.x],[src.y],[src.z]"
- nodealert = 1
- else if (nodealert)
- nodealert = 0
-*/
-obj/machinery/atmospherics/pipe/manifold4w/Del()
+
+/obj/machinery/atmospherics/pipe/manifold4w/Del()
if(node1)
node1.disconnect(src)
if(node2)
@@ -640,7 +618,7 @@ obj/machinery/atmospherics/pipe/manifold4w/Del()
..()
-obj/machinery/atmospherics/pipe/manifold4w/disconnect(obj/machinery/atmospherics/reference)
+/obj/machinery/atmospherics/pipe/manifold4w/disconnect(obj/machinery/atmospherics/reference)
if(reference == node1)
if(istype(node1, /obj/machinery/atmospherics/pipe))
del(parent)
@@ -665,37 +643,58 @@ obj/machinery/atmospherics/pipe/manifold4w/disconnect(obj/machinery/atmospherics
..()
-obj/machinery/atmospherics/pipe/manifold4w/update_icon()
- overlays.Cut()
- if(node1&&node2&&node3&&node4)
- switch(pipe_color)
- if ("red") color = COLOR_RED
- if ("blue") color = COLOR_BLUE
- if ("cyan") color = COLOR_CYAN
- if ("green") color = COLOR_GREEN
- if ("yellow") color = "#FFCC00"
- if ("purple") color = "#5C1EC0"
- if ("grey") color = null
- icon_state = "manifold4w[invisibility ? "-f" : "" ]"
+/obj/machinery/atmospherics/pipe/manifold4w/change_color(var/new_color)
+ ..()
+ //for updating connected atmos device pipes (i.e. vents, manifolds, etc)
+ if(node1)
+ node1.update_underlays()
+ if(node2)
+ node2.update_underlays()
+ if(node3)
+ node3.update_underlays()
+ if(node4)
+ node4.update_underlays()
+/obj/machinery/atmospherics/pipe/manifold4w/update_icon(var/safety = 0)
+ if(!check_icon_cache())
+ return
+
+ alpha = 255
+
+ if(!node1 && !node2 && !node3 && !node4)
+ var/turf/T = get_turf(src)
+ new /obj/item/pipe(loc, make_from=src)
+ for (var/obj/machinery/meter/meter in T)
+ if (meter.target == src)
+ new /obj/item/pipe_meter(T)
+ del(meter)
+ del(src)
else
- icon_state = "manifold4w_ex"
- var/icon/con = new/icon('icons/obj/atmospherics/pipe_manifold.dmi',"manifold4w_con") //Since 4-ways are supposed to be directionless, they need an overlay instead it seems.
+ overlays.Cut()
+ overlays += icon_manager.get_atmos_icon("manifold", , pipe_color, "4way")
+ overlays += icon_manager.get_atmos_icon("manifold", , , "clamps_4way")
+ underlays.Cut()
+
+ var/list/directions = list(NORTH, SOUTH, EAST, WEST)
- if(node1)
- overlays += new/image(con,dir=1)
- if(node2)
- overlays += new/image(con,dir=2)
- if(node3)
- overlays += new/image(con,dir=4)
- if(node4)
- overlays += new/image(con,dir=8)
+ directions -= add_underlay(node1)
+ directions -= add_underlay(node2)
+ directions -= add_underlay(node3)
+ directions -= add_underlay(node4)
- if(!node1 && !node2 && !node3 && !node4)
- del(src)
- return
+ for(var/D in directions)
+ add_underlay(,D)
-obj/machinery/atmospherics/pipe/manifold4w/initialize()
+/obj/machinery/atmospherics/pipe/manifold4w/update_underlays()
+ ..()
+ update_icon()
+
+/obj/machinery/atmospherics/pipe/manifold4w/hide(var/i)
+ if(level == 1 && istype(loc, /turf/simulated))
+ invisibility = i ? 101 : 0
+ update_icon()
+
+/obj/machinery/atmospherics/pipe/manifold4w/initialize()
for(var/obj/machinery/atmospherics/target in get_step(src,1))
if(target.initialize_directions & 2)
@@ -717,58 +716,59 @@ obj/machinery/atmospherics/pipe/manifold4w/initialize()
node4 = target
break
- var/turf/T = src.loc // hide if turf is not intact
- hide(T.intact)
- //update_icon()
+ var/turf/T = get_turf(src)
+ if(istype(T))
+ hide(T.intact)
update_icon()
-
-obj/machinery/atmospherics/pipe/manifold4w/visible
+/obj/machinery/atmospherics/pipe/manifold4w/visible
level = 2
- icon_state = "manifold4w"
-obj/machinery/atmospherics/pipe/manifold4w/visible/supply
- name="Air supply pipe"
- color=COLOR_BLUE
+/obj/machinery/atmospherics/pipe/manifold4w/visible/scrubbers
+ name = "Scrubbers pipe"
+ color = PIPE_COLOR_RED
-obj/machinery/atmospherics/pipe/manifold4w/visible/scrubbers
- name="Scrubbers pipe"
- color=COLOR_RED
+/obj/machinery/atmospherics/pipe/manifold4w/visible/supply
+ name = "Air supply pipe"
+ color = PIPE_COLOR_BLUE
-obj/machinery/atmospherics/pipe/manifold4w/visible/yellow
- color="#FFCC00"
+/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow
+ color = PIPE_COLOR_YELLOW
-obj/machinery/atmospherics/pipe/manifold4w/visible/cyan
- color=COLOR_CYAN
+/obj/machinery/atmospherics/pipe/manifold4w/visible/cyan
+ color = PIPE_COLOR_CYAN
-obj/machinery/atmospherics/pipe/manifold4w/visible/green
- color=COLOR_GREEN
+/obj/machinery/atmospherics/pipe/manifold4w/visible/green
+ color = PIPE_COLOR_GREEN
+/obj/machinery/atmospherics/pipe/manifold4w/visible/purple
+ color = PIPE_COLOR_PURPLE
-obj/machinery/atmospherics/pipe/manifold4w/hidden
+/obj/machinery/atmospherics/pipe/manifold4w/hidden
level = 1
- icon_state = "manifold4w-f"
- alpha = 192 //set for the benefit of mapping - this is reset to opaque when the pipe is spawned in game
+ alpha = 128 //set for the benefit of mapping - this is reset to opaque when the pipe is spawned in game
-obj/machinery/atmospherics/pipe/manifold4w/hidden/supply
- name="Air supply pipe"
- color=COLOR_BLUE
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers
+ name = "Scrubbers pipe"
+ color = PIPE_COLOR_RED
-obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers
- name="Scrubbers pipe"
- color=COLOR_RED
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply
+ name = "Air supply pipe"
+ color = PIPE_COLOR_BLUE
-obj/machinery/atmospherics/pipe/manifold4w/hidden/yellow
- color="#FFCC00"
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/yellow
+ color = PIPE_COLOR_YELLOW
-obj/machinery/atmospherics/pipe/manifold4w/hidden/cyan
- color=COLOR_CYAN
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/cyan
+ color = PIPE_COLOR_CYAN
-obj/machinery/atmospherics/pipe/manifold4w/hidden/green
- color=COLOR_GREEN
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/green
+ color = PIPE_COLOR_GREEN
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/purple
+ color = PIPE_COLOR_PURPLE
-obj/machinery/atmospherics/pipe/cap
+/obj/machinery/atmospherics/pipe/cap
name = "pipe endcap"
desc = "An endcap for pipes"
icon = 'icons/obj/pipes.dmi'
@@ -783,7 +783,7 @@ obj/machinery/atmospherics/pipe/cap
var/obj/machinery/atmospherics/node
-obj/machinery/atmospherics/pipe/cap/New()
+/obj/machinery/atmospherics/pipe/cap/New()
..()
switch(dir)
if(SOUTH)
@@ -795,26 +795,26 @@ obj/machinery/atmospherics/pipe/cap/New()
if(EAST)
initialize_directions = WEST
-obj/machinery/atmospherics/pipe/cap/hide(var/i)
+/obj/machinery/atmospherics/pipe/cap/hide(var/i)
if(level == 1 && istype(loc, /turf/simulated))
invisibility = i ? 101 : 0
update_icon()
-obj/machinery/atmospherics/pipe/cap/pipeline_expansion()
+/obj/machinery/atmospherics/pipe/cap/pipeline_expansion()
return list(node)
-obj/machinery/atmospherics/pipe/cap/process()
+/obj/machinery/atmospherics/pipe/cap/process()
if(!parent)
..()
else
. = PROCESS_KILL
-obj/machinery/atmospherics/pipe/cap/Del()
+/obj/machinery/atmospherics/pipe/cap/Del()
if(node)
node.disconnect(src)
..()
-obj/machinery/atmospherics/pipe/cap/disconnect(obj/machinery/atmospherics/reference)
+/obj/machinery/atmospherics/pipe/cap/disconnect(obj/machinery/atmospherics/reference)
if(reference == node)
if(istype(node, /obj/machinery/atmospherics/pipe))
del(parent)
@@ -824,13 +824,13 @@ obj/machinery/atmospherics/pipe/cap/disconnect(obj/machinery/atmospherics/refere
..()
-obj/machinery/atmospherics/pipe/cap/update_icon()
+/obj/machinery/atmospherics/pipe/cap/update_icon()
overlays = new()
icon_state = "cap[invisibility ? "-f" : ""]"
return
-obj/machinery/atmospherics/pipe/cap/initialize()
+/obj/machinery/atmospherics/pipe/cap/initialize()
for(var/obj/machinery/atmospherics/target in get_step(src, dir))
if(target.initialize_directions & get_dir(target,src))
node = target
@@ -838,151 +838,65 @@ obj/machinery/atmospherics/pipe/cap/initialize()
var/turf/T = src.loc // hide if turf is not intact
hide(T.intact)
- //update_icon()
update_icon()
-obj/machinery/atmospherics/pipe/cap/visible
+/obj/machinery/atmospherics/pipe/cap/visible
level = 2
icon_state = "cap"
-obj/machinery/atmospherics/pipe/cap/hidden
+/obj/machinery/atmospherics/pipe/cap/hidden
level = 1
icon_state = "cap-f"
-obj/machinery/atmospherics/pipe/tank
- icon = 'icons/obj/atmospherics/pipe_tank.dmi'
- icon_state = "intact"
+/obj/machinery/atmospherics/pipe/tank
+ icon = 'icons/atmos/tank.dmi'
+ icon_state = "air_map"
name = "Pressure Tank"
desc = "A large vessel containing pressurized gas."
- volume = 2000 //in liters, 1 meters by 1 meters by 2 meters
+ volume = 10000 //in liters, 1 meters by 1 meters by 2 meters ~tweaked it a little to simulate a pressure tank without needing to recode them yet
+ level = 1
dir = SOUTH
initialize_directions = SOUTH
density = 1
var/obj/machinery/atmospherics/node1
-obj/machinery/atmospherics/pipe/tank/New()
+/obj/machinery/atmospherics/pipe/tank/New()
+ icon_state = "air"
initialize_directions = dir
..()
-obj/machinery/atmospherics/pipe/tank/process()
+/obj/machinery/atmospherics/pipe/tank/process()
if(!parent)
..()
else
. = PROCESS_KILL
-/* if(!node1)
- parent.mingle_with_turf(loc, 200)
- if(!nodealert)
- //world << "Missing node from [src] at [src.x],[src.y],[src.z]"
- nodealert = 1
- else if (nodealert)
- nodealert = 0
-*/
-obj/machinery/atmospherics/pipe/tank/carbon_dioxide
- name = "Pressure Tank (Carbon Dioxide)"
- New()
- air_temporary = new
- air_temporary.volume = volume
- air_temporary.temperature = T20C
-
- air_temporary.carbon_dioxide = (25*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
-
- ..()
-
-obj/machinery/atmospherics/pipe/tank/phoron
- icon = 'icons/obj/atmospherics/orange_pipe_tank.dmi'
- name = "Pressure Tank (Phoron)"
-
- New()
- air_temporary = new
- air_temporary.volume = volume
- air_temporary.temperature = T20C
-
- air_temporary.phoron = (25*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
-
- ..()
-
-obj/machinery/atmospherics/pipe/tank/oxygen_agent_b
- icon = 'icons/obj/atmospherics/red_orange_pipe_tank.dmi'
- name = "Pressure Tank (Oxygen + Phoron)"
-
- New()
- air_temporary = new
- air_temporary.volume = volume
- air_temporary.temperature = T0C
-
- var/datum/gas/oxygen_agent_b/trace_gas = new
- trace_gas.moles = (25*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
-
- air_temporary.trace_gases += trace_gas
-
- ..()
-
-obj/machinery/atmospherics/pipe/tank/oxygen
- icon = 'icons/obj/atmospherics/blue_pipe_tank.dmi'
- name = "Pressure Tank (Oxygen)"
-
- New()
- air_temporary = new
- air_temporary.volume = volume
- air_temporary.temperature = T20C
-
- air_temporary.oxygen = (25*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
-
- ..()
-
-obj/machinery/atmospherics/pipe/tank/nitrogen
- icon = 'icons/obj/atmospherics/red_pipe_tank.dmi'
- name = "Pressure Tank (Nitrogen)"
-
- New()
- air_temporary = new
- air_temporary.volume = volume
- air_temporary.temperature = T20C
-
- air_temporary.nitrogen = (25*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
-
- ..()
-
-obj/machinery/atmospherics/pipe/tank/air
- icon = 'icons/obj/atmospherics/red_pipe_tank.dmi'
- name = "Pressure Tank (Air)"
-
- New()
- air_temporary = new
- air_temporary.volume = volume
- air_temporary.temperature = T20C
-
- air_temporary.oxygen = (25*ONE_ATMOSPHERE*O2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
- air_temporary.nitrogen = (25*ONE_ATMOSPHERE*N2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
-
- ..()
-
-obj/machinery/atmospherics/pipe/tank/Del()
+/obj/machinery/atmospherics/pipe/tank/Del()
if(node1)
node1.disconnect(src)
..()
-obj/machinery/atmospherics/pipe/tank/pipeline_expansion()
+/obj/machinery/atmospherics/pipe/tank/pipeline_expansion()
return list(node1)
-obj/machinery/atmospherics/pipe/tank/update_icon()
- if(node1)
- icon_state = "intact"
+/obj/machinery/atmospherics/pipe/tank/update_underlays()
+ if(..())
+ underlays.Cut()
+ var/turf/T = get_turf(src)
+ if(!istype(T))
+ return
+ add_underlay(T, node1, dir)
- dir = get_dir(src, node1)
-
- else
- icon_state = "exposed"
-
-obj/machinery/atmospherics/pipe/tank/initialize()
+/obj/machinery/atmospherics/pipe/tank/hide()
+ update_underlays()
+/obj/machinery/atmospherics/pipe/tank/initialize()
var/connect_direction = dir
for(var/obj/machinery/atmospherics/target in get_step(src,connect_direction))
@@ -990,20 +904,23 @@ obj/machinery/atmospherics/pipe/tank/initialize()
node1 = target
break
- update_icon()
+ update_underlays()
-obj/machinery/atmospherics/pipe/tank/disconnect(obj/machinery/atmospherics/reference)
+/obj/machinery/atmospherics/pipe/tank/disconnect(obj/machinery/atmospherics/reference)
if(reference == node1)
if(istype(node1, /obj/machinery/atmospherics/pipe))
del(parent)
node1 = null
- update_icon()
+ update_underlays()
return null
-obj/machinery/atmospherics/pipe/tank/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
- if (istype(W, /obj/item/device/analyzer) && get_dist(user, src) <= 1)
+/obj/machinery/atmospherics/pipe/tank/attackby(var/obj/item/W as obj, var/mob/user as mob)
+ if(istype(W, /obj/item/device/pipe_painter))
+ return
+
+ if(istype(W, /obj/item/device/analyzer) && in_range(user, src))
for (var/mob/O in viewers(user, null))
O << "\red [user] has used the analyzer on \icon[icon]"
@@ -1030,7 +947,95 @@ obj/machinery/atmospherics/pipe/tank/attackby(var/obj/item/weapon/W as obj, var/
else
user << "\blue Tank is empty!"
-obj/machinery/atmospherics/pipe/vent
+/obj/machinery/atmospherics/pipe/tank/air
+ name = "Pressure Tank (Air)"
+ icon_state = "air_map"
+
+/obj/machinery/atmospherics/pipe/tank/air/New()
+ air_temporary = new
+ air_temporary.volume = volume
+ air_temporary.temperature = T20C
+
+ air_temporary.oxygen = (25*ONE_ATMOSPHERE*O2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+ air_temporary.nitrogen = (25*ONE_ATMOSPHERE*N2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+
+ ..()
+ icon_state = "air"
+
+/obj/machinery/atmospherics/pipe/tank/oxygen
+ name = "Pressure Tank (Oxygen)"
+ icon_state = "o2_map"
+
+/obj/machinery/atmospherics/pipe/tank/oxygen/New()
+ air_temporary = new
+ air_temporary.volume = volume
+ air_temporary.temperature = T20C
+
+ air_temporary.oxygen = (25*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+
+ ..()
+ icon_state = "o2"
+
+/obj/machinery/atmospherics/pipe/tank/nitrogen
+ name = "Pressure Tank (Nitrogen)"
+ icon_state = "n2_map"
+
+/obj/machinery/atmospherics/pipe/tank/nitrogen/New()
+ air_temporary = new
+ air_temporary.volume = volume
+ air_temporary.temperature = T20C
+
+ air_temporary.nitrogen = (25*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+
+ ..()
+ icon_state = "n2"
+
+/obj/machinery/atmospherics/pipe/tank/carbon_dioxide
+ name = "Pressure Tank (Carbon Dioxide)"
+ icon_state = "co2_map"
+
+/obj/machinery/atmospherics/pipe/tank/carbon_dioxide/New()
+ air_temporary = new
+ air_temporary.volume = volume
+ air_temporary.temperature = T20C
+
+ air_temporary.carbon_dioxide = (25*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+
+ ..()
+ icon_state = "co2"
+
+/obj/machinery/atmospherics/pipe/tank/phoron
+ name = "Pressure Tank (Phoron)"
+ icon_state = "phoron_map"
+
+/obj/machinery/atmospherics/pipe/tank/phoron/New()
+ air_temporary = new
+ air_temporary.volume = volume
+ air_temporary.temperature = T20C
+
+ air_temporary.phoron = (25*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+
+ ..()
+ icon_state = "phoron"
+
+/obj/machinery/atmospherics/pipe/tank/nitrous_oxide
+ name = "Pressure Tank (Nitrous Oxide)"
+ icon_state = "n2o_map"
+
+/obj/machinery/atmospherics/pipe/tank/nitrous_oxide/New()
+ air_temporary = new
+ air_temporary.volume = volume
+ air_temporary.temperature = T0C
+
+ var/datum/gas/sleeping_agent/trace_gas = new
+ trace_gas.moles = (25*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+
+ air_temporary.trace_gases += trace_gas
+
+ ..()
+ icon_state = "n2o"
+
+/obj/machinery/atmospherics/pipe/vent
icon = 'icons/obj/atmospherics/pipe_vent.dmi'
icon_state = "intact"
@@ -1048,15 +1053,15 @@ obj/machinery/atmospherics/pipe/vent
var/obj/machinery/atmospherics/node1
-obj/machinery/atmospherics/pipe/vent/New()
+/obj/machinery/atmospherics/pipe/vent/New()
initialize_directions = dir
..()
-obj/machinery/atmospherics/pipe/vent/high_volume
+/obj/machinery/atmospherics/pipe/vent/high_volume
name = "Larger vent"
volume = 1000
-obj/machinery/atmospherics/pipe/vent/process()
+/obj/machinery/atmospherics/pipe/vent/process()
if(!parent)
if(build_killswitch <= 0)
. = PROCESS_KILL
@@ -1066,24 +1071,17 @@ obj/machinery/atmospherics/pipe/vent/process()
return
else
parent.mingle_with_turf(loc, volume)
-/*
- if(!node1)
- if(!nodealert)
- //world << "Missing node from [src] at [src.x],[src.y],[src.z]"
- nodealert = 1
- else if (nodealert)
- nodealert = 0
-*/
-obj/machinery/atmospherics/pipe/vent/Del()
+
+/obj/machinery/atmospherics/pipe/vent/Del()
if(node1)
node1.disconnect(src)
..()
-obj/machinery/atmospherics/pipe/vent/pipeline_expansion()
+/obj/machinery/atmospherics/pipe/vent/pipeline_expansion()
return list(node1)
-obj/machinery/atmospherics/pipe/vent/update_icon()
+/obj/machinery/atmospherics/pipe/vent/update_icon()
if(node1)
icon_state = "intact"
@@ -1092,7 +1090,7 @@ obj/machinery/atmospherics/pipe/vent/update_icon()
else
icon_state = "exposed"
-obj/machinery/atmospherics/pipe/vent/initialize()
+/obj/machinery/atmospherics/pipe/vent/initialize()
var/connect_direction = dir
for(var/obj/machinery/atmospherics/target in get_step(src,connect_direction))
@@ -1102,7 +1100,7 @@ obj/machinery/atmospherics/pipe/vent/initialize()
update_icon()
-obj/machinery/atmospherics/pipe/vent/disconnect(obj/machinery/atmospherics/reference)
+/obj/machinery/atmospherics/pipe/vent/disconnect(obj/machinery/atmospherics/reference)
if(reference == node1)
if(istype(node1, /obj/machinery/atmospherics/pipe))
del(parent)
@@ -1112,7 +1110,7 @@ obj/machinery/atmospherics/pipe/vent/disconnect(obj/machinery/atmospherics/refer
return null
-obj/machinery/atmospherics/pipe/vent/hide(var/i) //to make the little pipe section invisible, the icon changes.
+/obj/machinery/atmospherics/pipe/vent/hide(var/i) //to make the little pipe section invisible, the icon changes.
if(node1)
icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]intact"
dir = get_dir(src, node1)
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index 864e893dc9..e8ec749a31 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -52,7 +52,7 @@ Buildable meters
if (make_from)
src.dir = make_from.dir
src.pipename = make_from.name
- color = make_from.color
+ color = make_from.pipe_color
var/is_bent
if (make_from.initialize_directions in list(NORTH|SOUTH, WEST|EAST))
is_bent = 0
@@ -324,12 +324,12 @@ Buildable meters
return 1
// no conflicts found
- var/pipefailtext = "\red There's nothing to connect this pipe section to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
+ var/pipefailtext = "\red There's nothing to connect this pipe section to!" //(with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
switch(pipe_type)
if(PIPE_SIMPLE_STRAIGHT, PIPE_SIMPLE_BENT)
var/obj/machinery/atmospherics/pipe/simple/P = new( src.loc )
- P.color = color
+ P.pipe_color = color
P.dir = src.dir
P.initialize_directions = pipe_dir
var/turf/T = P.loc
@@ -382,7 +382,7 @@ Buildable meters
if(PIPE_MANIFOLD) //manifold
var/obj/machinery/atmospherics/pipe/manifold/M = new( src.loc )
- M.color = color
+ M.pipe_color = color
M.dir = dir
M.initialize_directions = pipe_dir
//M.New()
@@ -390,7 +390,7 @@ Buildable meters
M.level = T.intact ? 2 : 1
M.initialize()
if (!M)
- usr << "There's nothing to connect this manifold to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
+ usr << "There's nothing to connect this manifold to!" //(with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
return 1
M.build_network()
if (M.node1)
@@ -405,7 +405,7 @@ Buildable meters
if(PIPE_MANIFOLD4W) //4-way manifold
var/obj/machinery/atmospherics/pipe/manifold4w/M = new( src.loc )
- M.color = color
+ M.pipe_color = color
M.dir = dir
M.initialize_directions = pipe_dir
//M.New()
@@ -413,7 +413,7 @@ Buildable meters
M.level = T.intact ? 2 : 1
M.initialize()
if (!M)
- usr << "There's nothing to connect this manifold to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
+ usr << "There's nothing to connect this manifold to!" //(with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
return 1
M.build_network()
if (M.node1)
@@ -438,7 +438,7 @@ Buildable meters
//P.level = T.intact ? 2 : 1
P.initialize()
if (!P)
- usr << "There's nothing to connect this pipe to!" //(with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
+ usr << pipefailtext //"There's nothing to connect this pipe to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
return 1
P.build_network()
if (P.node1)
@@ -709,7 +709,7 @@ Buildable meters
C.node.initialize()
C.node.build_network()
///// Z-Level stuff
- if(PIPE_UP) //volume pump
+ if(PIPE_UP)
var/obj/machinery/atmospherics/pipe/zpipe/up/P = new(src.loc)
P.dir = dir
P.initialize_directions = pipe_dir
@@ -725,7 +725,7 @@ Buildable meters
if (P.node2)
P.node2.initialize()
P.node2.build_network()
- if(PIPE_DOWN) //volume pump
+ if(PIPE_DOWN)
var/obj/machinery/atmospherics/pipe/zpipe/down/P = new(src.loc)
P.dir = dir
P.initialize_directions = pipe_dir
diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm
index 3a062adca4..74374297cc 100644
--- a/code/game/objects/items/devices/pipe_painter.dm
+++ b/code/game/objects/items/devices/pipe_painter.dm
@@ -3,8 +3,15 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "labeler1"
item_state = "flight"
- var/list/modes = list("grey","red","blue","cyan","green","yellow","purple")
- var/mode = "grey"
+ var/list/modes
+ var/mode
+
+/obj/item/device/pipe_painter/New()
+ ..()
+ modes = new()
+ for(var/C in pipe_colors)
+ modes += "[C]"
+ mode = pick(modes)
/obj/item/device/pipe_painter/afterattack(atom/A, mob/user as mob)
if(!istype(A,/obj/machinery/atmospherics/pipe) || istype(A,/obj/machinery/atmospherics/pipe/tank) || istype(A,/obj/machinery/atmospherics/pipe/vent) || istype(A,/obj/machinery/atmospherics/pipe/simple/heat_exchanging) || istype(A,/obj/machinery/atmospherics/pipe/simple/insulated) || !in_range(user, A))
@@ -16,12 +23,10 @@
user << "\red You must remove the plating first."
return
- P.pipe_color = mode
- user.visible_message("[user] paints \the [P] [mode].","You paint \the [P] [mode].")
- P.update_icon()
+ P.change_color(pipe_colors[mode])
/obj/item/device/pipe_painter/attack_self(mob/user as mob)
- mode = input("Which colour do you want to use?","Pipe painter") in modes
+ mode = input("Which colour do you want to use?", "Pipe painter", mode) in modes
/obj/item/device/pipe_painter/examine()
..()
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 6bc605a9c9..2a8ec10569 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -48,11 +48,13 @@ REAGENT SCANNER
if(O.invisibility == 101)
O.invisibility = 0
+ O.alpha = 128
spawn(10)
if(O)
var/turf/U = O.loc
if(U.intact)
O.invisibility = 101
+ O.alpha = 255
var/mob/living/M = locate() in T
if(M && M.invisibility == 2)
diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm
index dec999f0fc..932e40e8c5 100644
--- a/code/game/turfs/simulated/floor_types.dm
+++ b/code/game/turfs/simulated/floor_types.dm
@@ -53,6 +53,7 @@
icon_state = "engine"
thermal_conductivity = 0.025
heat_capacity = 325000
+ intact = 0
/turf/simulated/floor/engine/attackby(obj/item/weapon/C as obj, mob/user as mob)
if(!C)
@@ -154,7 +155,7 @@
name = "skipjack floor"
oxygen = 0
nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD
-
+
/turf/simulated/floor/beach
name = "Beach"
icon = 'icons/misc/beach.dmi'
diff --git a/code/modules/admin/verbs/atmosdebug.dm b/code/modules/admin/verbs/atmosdebug.dm
index dd5fee98f6..f4e163394c 100644
--- a/code/modules/admin/verbs/atmosdebug.dm
+++ b/code/modules/admin/verbs/atmosdebug.dm
@@ -1,11 +1,16 @@
/client/proc/atmosscan()
set category = "Mapping"
- set name = "Check Plumbing"
+ set name = "Check Piping"
+ set background = 1
if(!src.holder)
src << "Only administrators may use this command."
return
feedback_add_details("admin_verb","CP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+ if(alert("WARNING: This command should not be run on a live server. Do you want to continue?", "Check Piping", "No", "Yes") == "No")
+ return
+ usr << "Checking for disconnected pipes..."
//all plumbing - yes, some things might get stated twice, doesn't matter.
for (var/obj/machinery/atmospherics/plumbing in world)
if (plumbing.nodealert)
@@ -21,6 +26,19 @@
if (!pipe.node1 || !pipe.node2)
usr << "Unconnected [pipe.name] located at [pipe.x],[pipe.y],[pipe.z] ([get_area(pipe.loc)])"
+ usr << "Checking for overlapping pipes..."
+ next_turf:
+ for(var/turf/T in world)
+ for(var/dir in cardinal)
+ var/check = 0
+ for(var/obj/machinery/atmospherics/pipe in T)
+ if(dir & pipe.initialize_directions)
+ check++
+ if(check > 1)
+ usr << "Overlapping pipe ([pipe.name]) located at [T.x],[T.y],[T.z] ([get_area(T)])"
+ continue next_turf
+ usr << "Done"
+
/client/proc/powerdebug()
set category = "Mapping"
set name = "Check Power"
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 38e1ff3bfb..0280599d5e 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -736,10 +736,10 @@
// this will be revealed if a T-scanner is used
// if visible, use regular icon_state
proc/updateicon()
- if(invisibility)
+/* if(invisibility) //we hide things with alpha now, no need for transparent icons
icon_state = "[base_icon_state]f"
else
- icon_state = base_icon_state
+ icon_state = base_icon_state*/
return
diff --git a/icons/atmos/connector.dmi b/icons/atmos/connector.dmi
new file mode 100644
index 0000000000..cf4ea7a3c8
Binary files /dev/null and b/icons/atmos/connector.dmi differ
diff --git a/icons/atmos/digital_tvalve.dmi b/icons/atmos/digital_tvalve.dmi
new file mode 100644
index 0000000000..b34d2903b5
Binary files /dev/null and b/icons/atmos/digital_tvalve.dmi differ
diff --git a/icons/atmos/digital_valve.dmi b/icons/atmos/digital_valve.dmi
new file mode 100644
index 0000000000..b1adc8b651
Binary files /dev/null and b/icons/atmos/digital_valve.dmi differ
diff --git a/icons/atmos/filter.dmi b/icons/atmos/filter.dmi
new file mode 100644
index 0000000000..8b5cd81c70
Binary files /dev/null and b/icons/atmos/filter.dmi differ
diff --git a/icons/atmos/injector.dmi b/icons/atmos/injector.dmi
new file mode 100644
index 0000000000..03a60d2e5d
Binary files /dev/null and b/icons/atmos/injector.dmi differ
diff --git a/icons/atmos/manifold.dmi b/icons/atmos/manifold.dmi
new file mode 100644
index 0000000000..f6b24341c9
Binary files /dev/null and b/icons/atmos/manifold.dmi differ
diff --git a/icons/atmos/mixer.dmi b/icons/atmos/mixer.dmi
new file mode 100644
index 0000000000..0fcb92820f
Binary files /dev/null and b/icons/atmos/mixer.dmi differ
diff --git a/icons/atmos/omni_devices.dmi b/icons/atmos/omni_devices.dmi
new file mode 100644
index 0000000000..494ea7e24d
Binary files /dev/null and b/icons/atmos/omni_devices.dmi differ
diff --git a/icons/atmos/passive_gate.dmi b/icons/atmos/passive_gate.dmi
new file mode 100644
index 0000000000..3fa7ec6d14
Binary files /dev/null and b/icons/atmos/passive_gate.dmi differ
diff --git a/icons/atmos/pipe_underlays.dmi b/icons/atmos/pipe_underlays.dmi
new file mode 100644
index 0000000000..0edf79e500
Binary files /dev/null and b/icons/atmos/pipe_underlays.dmi differ
diff --git a/icons/atmos/pipes.dmi b/icons/atmos/pipes.dmi
new file mode 100644
index 0000000000..019be28ffd
Binary files /dev/null and b/icons/atmos/pipes.dmi differ
diff --git a/icons/atmos/pump.dmi b/icons/atmos/pump.dmi
new file mode 100644
index 0000000000..6350782a2f
Binary files /dev/null and b/icons/atmos/pump.dmi differ
diff --git a/icons/atmos/tank.dmi b/icons/atmos/tank.dmi
new file mode 100644
index 0000000000..bc2fb0b901
Binary files /dev/null and b/icons/atmos/tank.dmi differ
diff --git a/icons/atmos/tvalve.dmi b/icons/atmos/tvalve.dmi
new file mode 100644
index 0000000000..197862b32a
Binary files /dev/null and b/icons/atmos/tvalve.dmi differ
diff --git a/icons/atmos/valve.dmi b/icons/atmos/valve.dmi
new file mode 100644
index 0000000000..04351917b6
Binary files /dev/null and b/icons/atmos/valve.dmi differ
diff --git a/icons/atmos/vent_pump.dmi b/icons/atmos/vent_pump.dmi
new file mode 100644
index 0000000000..8846103633
Binary files /dev/null and b/icons/atmos/vent_pump.dmi differ
diff --git a/icons/atmos/vent_scrubber.dmi b/icons/atmos/vent_scrubber.dmi
new file mode 100644
index 0000000000..a116f6ab67
Binary files /dev/null and b/icons/atmos/vent_scrubber.dmi differ
diff --git a/icons/atmos/volume_pump.dmi b/icons/atmos/volume_pump.dmi
new file mode 100644
index 0000000000..0f81c408ee
Binary files /dev/null and b/icons/atmos/volume_pump.dmi differ
diff --git a/icons/obj/atmospherics/omni_devices.dmi b/icons/obj/atmospherics/omni_devices.dmi
index 642e90a0f1..398fd5f159 100644
Binary files a/icons/obj/atmospherics/omni_devices.dmi and b/icons/obj/atmospherics/omni_devices.dmi differ