Merge pull request #13289 from Heroman3003/tgui-jobstart-fixes

Fixes tgui issues and also roundstart job slots getting occupied by nothing when spawning fails
This commit is contained in:
Casey
2022-07-07 20:14:43 -04:00
committed by CHOMPStation2
parent ef3e059335
commit 090aa3dc3b
6 changed files with 31 additions and 19 deletions
+2 -2
View File
@@ -109,8 +109,8 @@
data["autofocus"] = autofocus
data["buttons"] = buttons
data["message"] = message
data["large_buttons"] = usr.client.prefs.tgui_large_buttons
data["swapped_buttons"] = !usr.client.prefs.tgui_swapped_buttons
data["large_buttons"] = user.client.prefs.tgui_large_buttons
data["swapped_buttons"] = !user.client.prefs.tgui_swapped_buttons
data["title"] = title
return data
+2 -2
View File
@@ -121,9 +121,9 @@
var/list/data = list()
data["init_value"] = default || items[1]
data["items"] = items
data["large_buttons"] = usr.client.prefs.tgui_large_buttons
data["large_buttons"] = user.client.prefs.tgui_large_buttons
data["message"] = message
data["swapped_buttons"] = !usr.client.prefs.tgui_swapped_buttons
data["swapped_buttons"] = !user.client.prefs.tgui_swapped_buttons
data["title"] = title
return data
+2 -2
View File
@@ -113,11 +113,11 @@
/datum/tgui_input_number/tgui_static_data(mob/user)
var/list/data = list()
data["init_value"] = default // Default is a reserved keyword
data["large_buttons"] = usr.client.prefs.tgui_large_buttons
data["large_buttons"] = user.client.prefs.tgui_large_buttons
data["max_value"] = max_value
data["message"] = message
data["min_value"] = min_value
data["swapped_buttons"] = !usr.client.prefs.tgui_swapped_buttons
data["swapped_buttons"] = !user.client.prefs.tgui_swapped_buttons
data["title"] = title
return data
+2 -2
View File
@@ -116,12 +116,12 @@
/datum/tgui_input_text/tgui_static_data(mob/user)
var/list/data = list()
data["large_buttons"] = usr.client.prefs.tgui_large_buttons
data["large_buttons"] = user.client.prefs.tgui_large_buttons
data["max_length"] = max_length
data["message"] = message
data["multiline"] = multiline
data["placeholder"] = default // Default is a reserved keyword
data["swapped_buttons"] = !usr.client.prefs.tgui_swapped_buttons
data["swapped_buttons"] = !user.client.prefs.tgui_swapped_buttons
data["title"] = title
data["prevent_enter"] = prevent_enter
return data