cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update air_alarm.dm

Browse Source
This commit is contained in:
Novacat
2021-06-19 09:24:59 -04:00
committed by GitHub
parent 26b4e8bd4c
commit a6548ebbb2
1 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/air_alarm.dm
+1 -17
View File
@@ -568,27 +568,12 @@
var/list/info = alarm_area.air_scrub_info[id_tag]
if(!info)
continue
<<<<<<< HEAD
var/list/list/filters = list()
scrubbers.Add(list(list(
=======
scrubbers += list(list(
>>>>>>> a132767... Fixes unlocked air alarm uis (#8149)
"id_tag" = id_tag,
"long_name" = sanitize(long_name),
"power" = info["power"],
"scrubbing" = info["scrubbing"],
"panic" = info["panic"],
<<<<<<< HEAD
"filters" = filters
)))
filters.Add(list(list("name" = "Oxygen", "command" = "o2_scrub", "val" = info["filter_o2"])))
filters.Add(list(list("name" = "Nitrogen", "command" = "n2_scrub", "val" = info["filter_n2"])))
filters.Add(list(list("name" = "Carbon Dioxide", "command" = "co2_scrub","val" = info["filter_co2"])))
filters.Add(list(list("name" = "Toxin" , "command" = "tox_scrub","val" = info["filter_phoron"])))
filters.Add(list(list("name" = "Nitrous Oxide", "command" = "n2o_scrub","val" = info["filter_n2o"])))
filters.Add(list(list("name" = "Fuel", "command" = "fuel_scrub","val" = info["filter_fuel"])))
=======
"filters" = list(
list("name" = "Oxygen", "command" = "o2_scrub", "val" = info["filter_o2"]),
list("name" = "Nitrogen", "command" = "n2_scrub", "val" = info["filter_n2"]),
@@ -599,7 +584,6 @@
)
))
data["scrubbers"] = scrubbers
>>>>>>> a132767... Fixes unlocked air alarm uis (#8149)
data["mode"] = mode
@@ -815,4 +799,4 @@
TLV["temperature"] = list(T0C - 40, T0C - 20, T0C + 40, T0C + 66) // K, Lower Temperature for Freezer Air Alarms (This is because TLV is hardcoded to be generated on first_run, and therefore the only way to modify this without changing TLV generation)
// VOREStation Edit End
// VOREStation Edit End