From 8b05c6cc159ff840218d7112a5f034e575a271dd Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Thu, 18 Nov 2021 00:48:21 -0600 Subject: [PATCH] bruh --- code/modules/clothing/spacesuits/rig/rig.dm | 6 +++--- .../clothing/spacesuits/rig/rig_tgui.dm | 4 ++++ tgui/packages/tgui/interfaces/RIGSuit.js | 20 ++++++++++++++----- tgui/public/tgui.bundle.js | 2 +- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index a749d6824d8..52922098076 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -183,7 +183,7 @@ . += "The access panel is [locked? "locked" : "unlocked"]." . += "The maintenance panel is [open ? "open" : "closed"]." . += "Hardsuit systems are [offline ? "offline" : "online"]." - . += "The cooling stystem is [cooling_on ? "active" : "inactive"]." + . += "The cooling system is [cooling_on ? "active" : "inactive"]." if(open) . += "It's equipped with [english_list(installed_modules)]." @@ -414,10 +414,10 @@ if(!cell) return if(cell.charge <= 0) - to_chat(user, "\The [src] has no power!.") + to_chat(user, "\The [src] has no power!") return if(!suit_is_deployed()) - to_chat(user, "The hardsuit needs to be deployed first!.") + to_chat(user, "The hardsuit needs to be deployed first!") return cooling_on = 1 diff --git a/code/modules/clothing/spacesuits/rig/rig_tgui.dm b/code/modules/clothing/spacesuits/rig/rig_tgui.dm index 0a493264e59..66c7266d3dd 100644 --- a/code/modules/clothing/spacesuits/rig/rig_tgui.dm +++ b/code/modules/clothing/spacesuits/rig/rig_tgui.dm @@ -51,6 +51,7 @@ else data["ai"] = FALSE + data["cooling"] = cooling_on data["sealed"] = !canremove data["sealing"] = sealing data["helmet"] = (helmet ? "[helmet.name]" : "None.") @@ -130,6 +131,9 @@ if("toggle_seals") toggle_seals(usr) . = TRUE + if("toggle_cooling") + toggle_cooling(usr) // cooling toggles have its own to_chats, tbf + . = TRUE if("toggle_ai_control") ai_override_enabled = !ai_override_enabled notify_ai("Synthetic suit control has been [ai_override_enabled ? "enabled" : "disabled"].") diff --git a/tgui/packages/tgui/interfaces/RIGSuit.js b/tgui/packages/tgui/interfaces/RIGSuit.js index 3b248a56a93..cc7ec9abe30 100644 --- a/tgui/packages/tgui/interfaces/RIGSuit.js +++ b/tgui/packages/tgui/interfaces/RIGSuit.js @@ -25,7 +25,7 @@ export const RIGSuit = (props, context) => { // Non-AI trying to control the hardsuit while it's AI control overridden override = -- HARDSUIT CONTROL OVERRIDDEN BY AI --; } - + return ( { const RIGSuitStatus = (props, context) => { const { act, data } = useBackend(context); - + const { // Power Bar chargestatus, @@ -57,6 +57,7 @@ const RIGSuitStatus = (props, context) => { // Suit Status sealing, sealed, + cooling, // Cover Locks emagged, securitycheck, @@ -77,6 +78,14 @@ const RIGSuitStatus = (props, context) => { onClick={() => act("toggle_seals")} /> ); + const CoolingButton = ( +