From 26b4e8bd4c751444ba955fc8676a81678046f81b Mon Sep 17 00:00:00 2001 From: Atermonera Date: Fri, 18 Jun 2021 19:12:35 -0700 Subject: [PATCH 1/2] Fixes unlocked air alarm uis --- code/game/machinery/air_alarm.dm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm index f330d839f6a..741ce1d3544 100644 --- a/code/game/machinery/air_alarm.dm +++ b/code/game/machinery/air_alarm.dm @@ -568,13 +568,18 @@ 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"]))) @@ -583,6 +588,18 @@ 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"]), + list("name" = "Carbon Dioxide", "command" = "co2_scrub","val" = info["filter_co2"]), + list("name" = "Toxin" , "command" = "tox_scrub","val" = info["filter_phoron"]), + list("name" = "Nitrous Oxide", "command" = "n2o_scrub","val" = info["filter_n2o"]), + list("name" = "Fuel", "command" = "fuel_scrub","val" = info["filter_fuel"]) + ) + )) + data["scrubbers"] = scrubbers +>>>>>>> a132767... Fixes unlocked air alarm uis (#8149) data["mode"] = mode From a6548ebbb29d1c7aec282145641df733600b56fd Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sat, 19 Jun 2021 09:24:59 -0400 Subject: [PATCH 2/2] Update air_alarm.dm --- code/game/machinery/air_alarm.dm | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm index 741ce1d3544..5d2deb079b6 100644 --- a/code/game/machinery/air_alarm.dm +++ b/code/game/machinery/air_alarm.dm @@ -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 \ No newline at end of file +// VOREStation Edit End