From f2223bb122874a51bb743fb82263ff63172b466c Mon Sep 17 00:00:00 2001
From: Aylong <69762909+AyIong@users.noreply.github.com>
Date: Sat, 24 Feb 2024 20:14:03 +0200
Subject: [PATCH] TGUI Input fixes (#24270)
* Some tgui input fixes and reverts
Add default to suit sensors and beaker transfer amount.
Revert languages list and paper text inputs
* Some tgui input fixes and reverts
Add default to suit sensors and beaker transfer amount.
Revert languages list and paper text inputs
* Meh
---
code/modules/clothing/clothing.dm | 2 +-
code/modules/mob/living/default_language.dm | 8 ++++----
code/modules/paperwork/paper.dm | 2 +-
code/modules/reagents/reagent_containers.dm | 3 ++-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index be4488ff62a..1f8fef4c2d9 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -313,7 +313,7 @@
return
var/list/modes = list("Off", "Binary sensors", "Vitals tracker", "Tracking beacon")
- var/switchMode = tgui_input_list(user, "Select a sensor mode:", "Suit Sensor Mode", modes)
+ var/switchMode = tgui_input_list(user, "Select a sensor mode:", "Suit Sensor Mode", modes, modes[sensor_mode + 1])
if(!user.Adjacent(src))
to_chat(user, "You have moved too far away!")
return
diff --git a/code/modules/mob/living/default_language.dm b/code/modules/mob/living/default_language.dm
index 61fa3addbff..14497d34a6e 100644
--- a/code/modules/mob/living/default_language.dm
+++ b/code/modules/mob/living/default_language.dm
@@ -1,7 +1,7 @@
-/mob/living/verb/set_default_language()
+/mob/living/verb/set_default_language(language as null|anything in languages)
set name = "Set Default Language"
set category = "IC"
- var/language = tgui_input_list(src, "Your current default language is: [default_language]", "Set your default language", languages)
+
if(language)
to_chat(src, "You will now speak [language] if you do not specify a language when speaking.")
else
@@ -9,10 +9,10 @@
default_language = language
// Silicons can't neccessarily speak everything in their languages list
-/mob/living/silicon/set_default_language()
+/mob/living/silicon/set_default_language(language as null|anything in speech_synthesizer_langs)
set name = "Set Default Language"
set category = "IC"
- var/language = tgui_input_list(src, "Your current default language is: [default_language]", "Set your default language", speech_synthesizer_langs)
+
if(language)
to_chat(src, "You will now speak [language] if you do not specify a language when speaking.")
else
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index af89ade2857..6a6a80bd78f 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -373,7 +373,7 @@
topic_href_write(id, input_element)
if(href_list["write"])
var/id = href_list["write"]
- var/input_element = tgui_input_text(usr, "Enter what you want to write:", "Write", multiline = TRUE, encode = FALSE)
+ var/input_element = input("Enter what you want to write:", "Write") as message
topic_href_write(id, input_element)
/obj/item/paper/attackby(obj/item/P, mob/living/user, params)
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index e4bbb6e6418..44bb7655de2 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -18,7 +18,8 @@
/obj/item/reagent_containers/AltClick(mob/user)
if(!Adjacent(user) || !length(possible_transfer_amounts) || !ishuman(user) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
return
- var/new_transfer_rate = tgui_input_list(user, "Amount per transfer from this:", "[src]", possible_transfer_amounts)
+
+ var/new_transfer_rate = tgui_input_list(user, "Amount per transfer from this:", "[src]", possible_transfer_amounts, "[amount_per_transfer_from_this]")
if(!new_transfer_rate)
return