From 199f4d7e2b19de8dc2c053183a0edc4e2dafb734 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 4 Nov 2021 10:57:52 +0000 Subject: [PATCH] =?UTF-8?q?[MIRROR]=20AtmoZphere=20(tablet=20program)=20wi?= =?UTF-8?q?ll=20show=20the=20tile's=20temperature=20as=20both=20=C2=B0C=20?= =?UTF-8?q?and=20K=20now.=20[MDB=20IGNORE]=20(#9231)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * AtmoZphere also display the temperature in K (#62533) * AtmoZphere (tablet program) will show the tile's temperature as both °C and K now. Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com> --- .../modular_computers/file_system/programs/atmosscan.dm | 6 ++++-- tgui/packages/tgui/interfaces/NtosAtmos.js | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/modules/modular_computers/file_system/programs/atmosscan.dm b/code/modules/modular_computers/file_system/programs/atmosscan.dm index 6d732d25515..e9ae86d3a3b 100644 --- a/code/modules/modular_computers/file_system/programs/atmosscan.dm +++ b/code/modules/modular_computers/file_system/programs/atmosscan.dm @@ -27,7 +27,8 @@ var/pressure = environment.return_pressure() var/total_moles = environment.total_moles() data["AirPressure"] = round(pressure,0.1) - data["AirTemp"] = round(environment.temperature-T0C) + data["AirTempC"] = round(environment.temperature-T0C) + data["AirTempK"] = round(environment.temperature) if (total_moles) for(var/id in env_gases) var/gas_level = env_gases[id][MOLES]/total_moles @@ -36,7 +37,8 @@ data["AirData"] = airlist else data["AirPressure"] = 0 - data["AirTemp"] = 0 + data["AirTempC"] = 0 + data["AirTempK"] = 0 data["AirData"] = list(list()) return data diff --git a/tgui/packages/tgui/interfaces/NtosAtmos.js b/tgui/packages/tgui/interfaces/NtosAtmos.js index b5c3136dd16..94a4a4cbd67 100644 --- a/tgui/packages/tgui/interfaces/NtosAtmos.js +++ b/tgui/packages/tgui/interfaces/NtosAtmos.js @@ -9,7 +9,8 @@ import { NtosWindow } from '../layouts'; export const NtosAtmos = (props, context) => { const { act, data } = useBackend(context); const { - AirTemp, + AirTempC, + AirTempK, AirPressure, } = data; const gases = flow([ @@ -25,7 +26,7 @@ export const NtosAtmos = (props, context) => {
- {AirTemp}°C + {AirTempC}°C | {AirTempK}K {AirPressure} kPa