cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Scrubbers and Alarms (#15358)

Browse Source 
* Fixes Scrubbers and Alarms

* true/false
This commit is contained in:
Fox McCloud
2021-01-27 17:41:08 +00:00
committed by GitHub
parent 81138b8b66
commit f74e98c79c
5 changed files with 100 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/unary_devices/vent_pump.dm
+26 -54
View File
@@ -236,86 +236,58 @@
/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)
if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
return FALSE
if("purge" in signal.data)
pressure_checks &= ~1
pump_direction = 0
if(signal.data["stabilize"] != null)
if("stabalize" in signal.data)
pressure_checks |= 1
pump_direction = 1
if(signal.data["power"] != null)
if("power" in signal.data)
on = text2num(signal.data["power"])
if(signal.data["power_toggle"] != null)
if("power_toggle" in signal.data)
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("checks" in signal.data)
pressure_checks = text2num(signal.data["checks"])
if(signal.data["checks_toggle"] != null)
pressure_checks = (pressure_checks?0:3)
if("checks_toggle" in signal.data)
pressure_checks = (pressure_checks ? 0 : 3)
if(signal.data["direction"] != null)
if("direction" in signal.data)
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,
text2num(signal.data["set_internal_pressure"]),
ONE_ATMOSPHERE*50
)
if("set_internal_pressure" in signal.data)
internal_pressure_bound = clamp(text2num(signal.data["set_internal_pressure"]), 0, ONE_ATMOSPHERE * 50)
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
)
if("set_external_pressure" in signal.data)
external_pressure_bound = clamp(text2num(signal.data["set_external_pressure"]), 0, ONE_ATMOSPHERE * 50)
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("reset_external_pressure" in signal.data)
external_pressure_bound = ONE_ATMOSPHERE
if(signal.data["adjust_external_pressure"] != null)
if("adjust_internal_pressure" in signal.data)
internal_pressure_bound = clamp(internal_pressure_bound + text2num(signal.data["adjust_internal_pressure"]), 0, ONE_ATMOSPHERE * 50)
if("adjust_external_pressure" in signal.data)
external_pressure_bound = clamp(external_pressure_bound + text2num(signal.data["adjust_external_pressure"]), 0, ONE_ATMOSPHERE * 50)
external_pressure_bound = between(
0,
external_pressure_bound + text2num(signal.data["adjust_external_pressure"]),
ONE_ATMOSPHERE*50
)
if(signal.data["init"] != null)
if("init" in signal.data)
name = signal.data["init"]
return
if(signal.data["status"] != null)
spawn(2)
broadcast_status()
if("status" in signal.data)
broadcast_status()
return //do not update_icon
//log_admin("DEBUG \[[world.timeofday]\]: vent_pump/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
spawn(2)
broadcast_status()
broadcast_status()
update_icon()
return
/obj/machinery/atmospherics/unary/vent_pump/can_crawl_through()
return !welded
code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
+20 -25
View File
@@ -41,8 +41,6 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on
on = TRUE
scrub_N2O = TRUE
scrub_Toxins = TRUE
/obj/machinery/atmospherics/unary/vent_scrubber/New()
..()
@@ -283,12 +281,12 @@
/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
if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"] != "command"))
return FALSE
if(signal.data["power"] != null)
if("power" in signal.data)
on = text2num(signal.data["power"])
if(signal.data["power_toggle"] != null)
if("power_toggle" in signal.data)
on = !on
if("widenet" in signal.data)
@@ -296,49 +294,46 @@
if("toggle_widenet" in signal.data)
widenet = !widenet
if(signal.data["scrubbing"] != null)
if("scrubbing" in signal.data)
scrubbing = text2num(signal.data["scrubbing"])
if(signal.data["toggle_scrubbing"])
if("toggle_scrubbing" in signal.data)
scrubbing = !scrubbing
if(signal.data["o2_scrub"] != null)
if("o2_scrub" in signal.data)
scrub_O2 = text2num(signal.data["o2_scrub"])
if(signal.data["toggle_o2_scrub"])
if("toggle_o2_scrub" in signal.data)
scrub_O2 = !scrub_O2
if(signal.data["n2_scrub"] != null)
if("n2_scrub" in signal.data)
scrub_N2 = text2num(signal.data["n2_scrub"])
if(signal.data["toggle_n2_scrub"])
if("toggle_n2_scrub" in signal.data)
scrub_N2 = !scrub_N2
if(signal.data["co2_scrub"] != null)
if("co2_scrub" in signal.data)
scrub_CO2 = text2num(signal.data["co2_scrub"])
if(signal.data["toggle_co2_scrub"])
if("toggle_co2_scrub" in signal.data)
scrub_CO2 = !scrub_CO2
if(signal.data["tox_scrub"] != null)
if("tox_scrub" in signal.data)
scrub_Toxins = text2num(signal.data["tox_scrub"])
if(signal.data["toggle_tox_scrub"])
if("toggle_tox_scrub" in signal.data)
scrub_Toxins = !scrub_Toxins
if(signal.data["n2o_scrub"] != null)
if("n2o_scrub" in signal.data)
scrub_N2O = text2num(signal.data["n2o_scrub"])
if(signal.data["toggle_n2o_scrub"])
if("toggle_n2o_scrub" in signal.data)
scrub_N2O = !scrub_N2O
if(signal.data["init"] != null)
if("init" in signal.data)
name = signal.data["init"]
return
if(signal.data["status"] != null)
spawn(2)
broadcast_status()
if("status" in signal.data)
broadcast_status()
return //do not update_icon
spawn(2)
broadcast_status()
broadcast_status()
update_icon()
return
/obj/machinery/atmospherics/unary/vent_scrubber/power_change()
var/old_stat = stat