From fef270f6e6ba647675c2f4d80d2b8419566ffdcb Mon Sep 17 00:00:00 2001 From: Geeves Date: Mon, 26 Oct 2020 09:42:37 +0200 Subject: [PATCH] Air Alarm Gas Fix (#10356) --- code/game/machinery/alarm.dm | 4 ++-- html/changelogs/geeves-air_alarm_gas_names.yml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/geeves-air_alarm_gas_names.yml diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 3980a4fe87d..342714fbd18 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -497,8 +497,8 @@ if(total) var/pressure = environment.return_pressure() environment_data[++environment_data.len] = list("name" = "Pressure", "value" = pressure, "unit" = "kPa", "danger_level" = pressure_dangerlevel) - environment_data[++environment_data.len] = list("name" = GAS_OXYGEN, "value" = environment.gas[GAS_OXYGEN] / total * 100, "unit" = "%", "danger_level" = oxygen_dangerlevel) - environment_data[++environment_data.len] = list("name" = GAS_CO2, "value" = environment.gas[GAS_CO2] / total * 100, "unit" = "%", "danger_level" = co2_dangerlevel) + environment_data[++environment_data.len] = list("name" = "Oxygen", "value" = environment.gas[GAS_OXYGEN] / total * 100, "unit" = "%", "danger_level" = oxygen_dangerlevel) + environment_data[++environment_data.len] = list("name" = "Carbon Dioxide", "value" = environment.gas[GAS_CO2] / total * 100, "unit" = "%", "danger_level" = co2_dangerlevel) environment_data[++environment_data.len] = list("name" = "Phoron", "value" = environment.gas[GAS_PHORON] / total * 100, "unit" = "%", "danger_level" = phoron_dangerlevel) environment_data[++environment_data.len] = list("name" = "Temperature", "value" = environment.temperature, "unit" = "K ([round(environment.temperature - T0C, 0.1)]C)", "danger_level" = temperature_dangerlevel) data["total_danger"] = danger_level diff --git a/html/changelogs/geeves-air_alarm_gas_names.yml b/html/changelogs/geeves-air_alarm_gas_names.yml new file mode 100644 index 00000000000..07712a6cd11 --- /dev/null +++ b/html/changelogs/geeves-air_alarm_gas_names.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Fixes the gas names on air alarms." \ No newline at end of file