Final parts of the air alarm rewrite.

This commit is contained in:
SkyMarshal
2012-06-21 02:05:33 -07:00
parent f953f78d73
commit 5ac37c7a78
4 changed files with 200 additions and 271 deletions
+53 -65
View File
@@ -7,7 +7,7 @@
level = 1
var/area_uid
var/id_tag = null
var/id_tag
power_channel = ENVIRON
var/on = 0
@@ -24,12 +24,6 @@
var/welded = 0 // Added for aliens -- TLE
var/frequency = 1439
var/datum/radio_frequency/radio_connection
var/radio_filter_out
var/radio_filter_in
New()
var/area/A = get_area(loc)
if (A.master)
@@ -43,6 +37,12 @@
broadcast_status()
..()
Del()
var/area/alarm_area = get_area(src)
if(alarm_area && "\"[id_tag]\"" in alarm_area.master.air_vents)
alarm_area.master.air_vents.Remove("\"[id_tag]\"")
..()
high_volume
name = "Large Air Vent"
@@ -50,6 +50,10 @@
..()
air_contents.volume = 1000
initialize()
spawn(20)
broadcast_status()
update_icon()
if(welded)
icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]weld"
@@ -66,6 +70,7 @@
process()
..()
broadcast_status()
if(stat & (NOPOWER|BROKEN))
return
if (!node)
@@ -123,93 +128,76 @@
//Radio remote control
proc/broadcast_status()
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",
"setting" = pump_speed
)
var/area/alarm_area = get_area(src)
if(alarm_area.master.master_air_alarm && alarm_area.master.master_air_alarm.master_is_operating())
receive_signal(signal)
if(alarm_area.master.master_air_alarm)
if(!id_tag)
if(alarm_area.master.master_air_alarm)
alarm_area.master.master_air_alarm.register_env_machine(src)
world << "No ID, air alarm. New ID = [id_tag]"
else
world << "No ID, no air alarm."
else if(!"\"[id_tag]\"" in alarm_area.air_vents)
if(alarm_area.master.master_air_alarm)
alarm_area.master.master_air_alarm.register_env_machine(src)
world << "ID, air alarm. New ID = [id_tag]"
else
world << "ID = [id_tag], no air alarm."
else if(stat & (NOPOWER|BROKEN))
alarm_area.master.air_vents.Remove("\"[id_tag]\"")
world << "Broken"
else
for(var/area/A in alarm_area.related)
for(var/obj/machinery/alarm/AA in A)
receive_signal(signal)
return 1
world << "Trying to register (No alarm)"
receive_signal(datum/signal/signal)
proc/receive(var/list/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("purge" in signal.data)
if("purge" in signal)
pressure_checks &= ~1
pump_direction = 0
if("stabalize" in signal.data)
if("stabalize" in signal)
pressure_checks |= 1
pump_direction = 1
if("power" in signal.data)
on = text2num(signal.data["power"])
if("power" in signal)
on = text2num(signal["power"])
if("power_toggle" in signal.data)
if("power_toggle" in signal)
on = !on
if("checks" in signal.data)
pressure_checks = text2num(signal.data["checks"])
if("checks" in signal)
pressure_checks = text2num(signal["checks"])
if("checks_toggle" in signal.data)
if("checks_toggle" in signal)
pressure_checks = (pressure_checks?0:3)
if("direction" in signal.data)
pump_direction = text2num(signal.data["direction"])
if("direction" in signal)
pump_direction = text2num(signal["direction"])
if("set_internal_pressure" in signal.data)
internal_pressure_bound = between(0, text2num(signal.data["set_internal_pressure"]), ONE_ATMOSPHERE*50)
if("set_internal_pressure" in signal)
internal_pressure_bound = between(0, text2num(signal["set_internal_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("set_external_pressure" in signal)
external_pressure_bound = between(0, text2num(signal["set_external_pressure"]), ONE_ATMOSPHERE*50)
if("adjust_internal_pressure" in signal.data)
internal_pressure_bound = between(0, text2num(signal.data["adjust_internal_pressure"]), ONE_ATMOSPHERE*50)
if("adjust_internal_pressure" in signal)
internal_pressure_bound = between(0, text2num(signal["adjust_internal_pressure"]), ONE_ATMOSPHERE*50)
if("adjust_external_pressure" in signal.data)
external_pressure_bound = between(0, text2num(signal.data["adjust_external_pressure"]), ONE_ATMOSPHERE*50)
if("adjust_external_pressure" in signal)
external_pressure_bound = between(0, text2num(signal["adjust_external_pressure"]), ONE_ATMOSPHERE*50)
if("init" in signal.data)
name = signal.data["init"]
if("init" in signal)
name = signal["init"]
return
if("status" in signal.data)
spawn(2)
broadcast_status()
return //do not update_icon
if("setting" in signal)
pump_speed = text2num(signal["setting"])
if("setting" in signal.data)
pump_speed = text2num(signal.data["setting"])
//log_admin("DEBUG \[[world.timeofday]\]: vent_pump/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
//log_admin("DEBUG \[[world.timeofday]\]: vent_pump/receive_signal: unknown command \"[signal["command"]]\"\n[signal.debug_print()]")
spawn(2)
broadcast_status()
update_icon()
@@ -8,8 +8,6 @@
level = 1
var/id_tag = null
var/frequency = 1439
var/datum/radio_frequency/radio_connection
var/on = 0
var/scrubbing = 1 //0 = siphoning, 1 = scrubbing
@@ -22,8 +20,6 @@
var/panic = 0 //is this scrubber panicked?
var/area_uid
var/radio_filter_out
var/radio_filter_in
New()
var/area/A = get_area(loc)
if (A.master)
@@ -37,6 +33,16 @@
broadcast_status()
..()
Del()
var/area/alarm_area = get_area(src)
if(alarm_area && "\"[id_tag]\"" in alarm_area.master.air_scrubbers)
alarm_area.master.air_scrubbers.Remove("\"[id_tag]\"")
..()
initialize()
spawn(20)
broadcast_status()
update_icon()
if(node && on && !(stat & (NOPOWER|BROKEN)))
if(scrubbing)
@@ -48,40 +54,26 @@
return
proc/broadcast_status()
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_toxins" = scrub_Toxins,
"filter_n2o" = scrub_N2O,
"sigtype" = "status",
"setting" = scrub_rate
)
var/area/alarm_area = get_area(src)
if(alarm_area.master.master_air_alarm && alarm_area.master.master_air_alarm.master_is_operating())
receive_signal(signal)
else
for(var/area/A in alarm_area.related)
for(var/obj/machinery/alarm/AA in A)
receive_signal(signal)
return 1
if(alarm_area.master.master_air_alarm)
if(!id_tag)
if(alarm_area.master.master_air_alarm)
alarm_area.master.master_air_alarm.register_env_machine(src)
else if(!"\"[id_tag]\"" in alarm_area.air_scrubbers)
if(alarm_area.master.master_air_alarm)
alarm_area.master.master_air_alarm.register_env_machine(src)
else if(stat & (NOPOWER|BROKEN))
alarm_area.master.air_scrubbers.Remove("\"[id_tag]\"")
return
process()
..()
broadcast_status()
if(stat & (NOPOWER|BROKEN))
return
if (!node)
on = 0
//broadcast_status()
if(!on)
return 0
@@ -150,19 +142,17 @@
return
*/
receive_signal(datum/signal/signal)
proc/receive(var/list/signal)
if(stat & (NOPOWER|BROKEN))
return
if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
return 0
if("power" in signal.data)
on = text2num(signal.data["power"])
if("power_toggle" in signal.data)
if("power" in signal)
on = text2num(signal["power"])
if("power_toggle" in signal)
on = !on
if("panic_siphon" in signal.data) //must be before if("scrubbing" thing
panic = text2num(signal.data["panic_siphon"])
if("panic_siphon" in signal) //must be before if("scrubbing" thing
panic = text2num(signal["panic_siphon"])
if(panic)
on = 1
scrubbing = 0
@@ -170,7 +160,7 @@
else
scrubbing = 1
volume_rate = initial(volume_rate)
if("toggle_panic_siphon" in signal.data)
if("toggle_panic_siphon" in signal)
panic = !panic
if(panic)
on = 1
@@ -180,39 +170,33 @@
scrubbing = 1
volume_rate = initial(volume_rate)
if("scrubbing" in signal.data)
scrubbing = text2num(signal.data["scrubbing"])
if("toggle_scrubbing" in signal.data)
if("scrubbing" in signal)
scrubbing = text2num(signal["scrubbing"])
if("toggle_scrubbing" in signal)
scrubbing = !scrubbing
if("co2_scrub" in signal.data)
scrub_CO2 = text2num(signal.data["co2_scrub"])
if("toggle_co2_scrub" in signal.data)
if("co2_scrub" in signal)
scrub_CO2 = text2num(signal["co2_scrub"])
if("toggle_co2_scrub" in signal)
scrub_CO2 = !scrub_CO2
if("tox_scrub" in signal.data)
scrub_Toxins = text2num(signal.data["tox_scrub"])
if("toggle_tox_scrub" in signal.data)
if("tox_scrub" in signal)
scrub_Toxins = text2num(signal["tox_scrub"])
if("toggle_tox_scrub" in signal)
scrub_Toxins = !scrub_Toxins
if("n2o_scrub" in signal.data)
scrub_N2O = text2num(signal.data["n2o_scrub"])
if("toggle_n2o_scrub" in signal.data)
if("n2o_scrub" in signal)
scrub_N2O = text2num(signal["n2o_scrub"])
if("toggle_n2o_scrub" in signal)
scrub_N2O = !scrub_N2O
if("init" in signal.data)
name = signal.data["init"]
if("init" in signal)
name = signal["init"]
return
if("status" in signal.data)
spawn(2)
broadcast_status()
return //do not update_icon
if("setting" in signal)
scrub_rate = text2num(signal["setting"])
if("setting" in signal.data)
scrub_rate = text2num(signal.data["setting"])
// log_admin("DEBUG \[[world.timeofday]\]: vent_scrubber/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
spawn(2)
broadcast_status()
update_icon()