From b2b8f068bb615e5f3ae145094f24affc6dbb0269 Mon Sep 17 00:00:00 2001 From: ShadowLarkens Date: Thu, 24 Dec 2020 05:17:34 -0800 Subject: [PATCH] TGUI Fixes --- code/ATMOSPHERICS/components/unary/cold_sink.dm | 3 ++- code/game/objects/items/devices/radio/radio.dm | 4 ++-- code/modules/pda/pda_tgui.dm | 4 ++-- tgui/packages/tgui/interfaces/GasTemperatureSystem.js | 4 ++-- tgui/packages/tgui/interfaces/pAIInterface.js | 6 +++--- tgui/packages/tgui/public/tgui.bundle.js | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/code/ATMOSPHERICS/components/unary/cold_sink.dm b/code/ATMOSPHERICS/components/unary/cold_sink.dm index 3ee79d88da..34ba7f370e 100644 --- a/code/ATMOSPHERICS/components/unary/cold_sink.dm +++ b/code/ATMOSPHERICS/components/unary/cold_sink.dm @@ -100,7 +100,8 @@ else set_temperature = max(amount, 0) if("setPower") //setting power to 0 is redundant anyways - var/new_setting = between(0, text2num(params["value"]), 100) + var/new_setting = CLAMP(text2num(params["value"]), 0, 100) + to_chat(world, "param value was [params["value"]], new_setting was [new_setting]") // DEBUG set_power_level(new_setting) add_fingerprint(usr) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index cff1fbb67f..9af996a591 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -156,10 +156,10 @@ var/global/list/default_medbay_channels = list( log_runtime(EXCEPTION("Warning: Topic() was improperly called on radio [src] [type], with the track href and \[[href] [json_encode(href_list)]]. Please update the caller to use tgui_act.")) . = ..() -/obj/item/device/radio/tgui_interact(mob/user, datum/tgui/ui) +/obj/item/device/radio/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "Radio", name) + ui = new(user, src, "Radio", name, parent_ui = parent_ui) ui.open() /obj/item/device/radio/tgui_data(mob/user) diff --git a/code/modules/pda/pda_tgui.dm b/code/modules/pda/pda_tgui.dm index 4937d42325..e082385b1d 100644 --- a/code/modules/pda/pda_tgui.dm +++ b/code/modules/pda/pda_tgui.dm @@ -7,10 +7,10 @@ if(!can_use()) . = min(., STATUS_UPDATE) -/obj/item/device/pda/tgui_interact(mob/user, datum/tgui/ui) +/obj/item/device/pda/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "Pda", "Personal Data Assistant") + ui = new(user, src, "Pda", "Personal Data Assistant", parent_ui = parent_ui) ui.open() /obj/item/device/pda/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) diff --git a/tgui/packages/tgui/interfaces/GasTemperatureSystem.js b/tgui/packages/tgui/interfaces/GasTemperatureSystem.js index 663ef8d216..b272923599 100644 --- a/tgui/packages/tgui/interfaces/GasTemperatureSystem.js +++ b/tgui/packages/tgui/interfaces/GasTemperatureSystem.js @@ -34,8 +34,8 @@ export const GasTemperatureSystem = (props, context) => { act("setPower", { value: val })} diff --git a/tgui/packages/tgui/interfaces/pAIInterface.js b/tgui/packages/tgui/interfaces/pAIInterface.js index 7bad72e5b9..1e3480742a 100644 --- a/tgui/packages/tgui/interfaces/pAIInterface.js +++ b/tgui/packages/tgui/interfaces/pAIInterface.js @@ -19,7 +19,7 @@ export const pAIInterface = (props, context) => {
- {emotions.map(emote => ( + {!!Array.isArray(emotions) && emotions.map(emote => (