shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "TGUI alerts, lists, inputs"

Browse Source
This commit is contained in:
Letter N
2021-10-28 12:17:29 +08:00
committed by GitHub
parent 853ff1d8ad
commit bcdf96f274
362 changed files with 1149 additions and 1570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/gasmixtures/gas_mixture.dm
+5 -5
View File
@@ -63,7 +63,7 @@ GLOBAL_LIST_INIT(auxtools_atmos_initialized,FALSE)
if(!.)
return
if(href_list[VV_HK_PARSE_GASSTRING])
var/gasstring = tgui_input_text(usr, "Input Gas String (WARNING: Advanced. Don't use this unless you know how these work.)", "Gas String Parse")
var/gasstring = input(usr, "Input Gas String (WARNING: Advanced. Don't use this unless you know how these work.", "Gas String Parse") as text|null
if(!istext(gasstring))
return
log_admin("[key_name(usr)] modified gas mixture [REF(src)]: Set to gas string [gasstring].")
@@ -77,10 +77,10 @@ GLOBAL_LIST_INIT(auxtools_atmos_initialized,FALSE)
var/list/gases = get_gases()
for(var/gas in gases)
gases[gas] = get_moles(gas)
var/gasid = tgui_input_list(usr, "What kind of gas?", "Set Gas", GLOB.gas_data.ids)
var/gasid = input(usr, "What kind of gas?", "Set Gas") as null|anything in GLOB.gas_data.ids
if(!gasid)
return
var/amount = tgui_input_num(usr, "Input amount", "Set Gas", gases[gasid] || 0)
var/amount = input(usr, "Input amount", "Set Gas", gases[gasid] || 0) as num|null
if(!isnum(amount))
return
amount = max(0, amount)
@@ -88,7 +88,7 @@ GLOBAL_LIST_INIT(auxtools_atmos_initialized,FALSE)
message_admins("[key_name(usr)] modified gas mixture [REF(src)]: Set gas [gasid] to [amount] moles.")
set_moles(gasid, amount)
if(href_list[VV_HK_SET_TEMPERATURE])
var/temp = tgui_input_num(usr, "Set the temperature of this mixture to?", "Set Temperature", return_temperature())
var/temp = input(usr, "Set the temperature of this mixture to?", "Set Temperature", return_temperature()) as num|null
if(!isnum(temp))
return
temp = max(2.7, temp)
@@ -96,7 +96,7 @@ GLOBAL_LIST_INIT(auxtools_atmos_initialized,FALSE)
message_admins("[key_name(usr)] modified gas mixture [REF(src)]: Changed temperature to [temp].")
set_temperature(temp)
if(href_list[VV_HK_SET_VOLUME])
var/volume = tgui_input_num(usr, "Set the volume of this mixture to?", "Set Volume", return_volume())
var/volume = input(usr, "Set the volume of this mixture to?", "Set Volume", return_volume()) as num|null
if(!isnum(volume))
return
volume = max(0, volume)
code/modules/atmospherics/machinery/airalarm.dm
+1 -1
View File
@@ -428,7 +428,7 @@
var/datum/tlv/tlv = TLV[env]
if(isnull(tlv))
return
var/value = tgui_input_num(usr, "New [name] for [env]:", name, tlv.vars[name])
var/value = input("New [name] for [env]:", name, tlv.vars[name]) as num|null
if(!isnull(value) && !..())
if(value < 0)
tlv.vars[name] = -1
code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
+1 -1
View File
@@ -107,7 +107,7 @@ Passive gate is similar to the regular pump except:
pressure = MAX_OUTPUT_PRESSURE
. = TRUE
else if(pressure == "input")
pressure = tgui_input_num(usr, "New output pressure (0-[MAX_OUTPUT_PRESSURE] kPa):", name, target_pressure)
pressure = input("New output pressure (0-[MAX_OUTPUT_PRESSURE] kPa):", name, target_pressure) as num|null
if(!isnull(pressure) || !..())
. = TRUE
else if(text2num(pressure) != null)
code/modules/atmospherics/machinery/components/binary_devices/pump.dm
+1 -1
View File
@@ -135,7 +135,7 @@
pressure = MAX_OUTPUT_PRESSURE
. = TRUE
else if(pressure == "input")
pressure = tgui_input_num(usr, "New output pressure (0-[MAX_OUTPUT_PRESSURE] kPa):", name, target_pressure)
pressure = input("New output pressure (0-[MAX_OUTPUT_PRESSURE] kPa):", name, target_pressure) as num|null
if(!isnull(pressure) && !..())
. = TRUE
else if(text2num(pressure) != null)
code/modules/atmospherics/machinery/components/binary_devices/relief_valve.dm
+2 -2
View File
@@ -83,7 +83,7 @@
pressure = 50*ONE_ATMOSPHERE
. = TRUE
else if(pressure == "input") // The manual expirience.
pressure = tgui_input_num(usr, "New output pressure ([close_pressure]-[50*ONE_ATMOSPHERE] kPa):", name, open_pressure)
pressure = input("New output pressure ([close_pressure]-[50*ONE_ATMOSPHERE] kPa):", name, open_pressure) as num|null
if(!isnull(pressure) && !..())
. = TRUE
else if(text2num(pressure) != null)
@@ -98,7 +98,7 @@
pressure = open_pressure
. = TRUE
else if(pressure == "input")
pressure = tgui_input_num(usr, "New output pressure (0-[open_pressure] kPa):", name, close_pressure)
pressure = input("New output pressure (0-[open_pressure] kPa):", name, close_pressure) as num|null
if(!isnull(pressure) && !..())
. = TRUE
else if(text2num(pressure) != null)
code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
+1 -1
View File
@@ -125,7 +125,7 @@
rate = MAX_TRANSFER_RATE
. = TRUE
else if(rate == "input")
rate = tgui_input_num(usr, "New transfer rate (0-[MAX_TRANSFER_RATE] L/s):", name, transfer_rate)
rate = input("New transfer rate (0-[MAX_TRANSFER_RATE] L/s):", name, transfer_rate) as num|null
if(!isnull(rate) && !..())
. = TRUE
else if(text2num(rate) != null)
code/modules/atmospherics/machinery/components/components_base.dm
+1 -1
View File
@@ -126,7 +126,7 @@
air_update_turf(1)
/obj/machinery/atmospherics/components/proc/safe_input(var/title, var/text, var/default_set)
var/new_value = tgui_input_num(usr,text,title,default_set)
var/new_value = input(usr,text,title,default_set) as num
if(usr.canUseTopic(src))
return new_value
return default_set
code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
+1 -1
View File
@@ -143,7 +143,7 @@
rate = MAX_TRANSFER_RATE
. = TRUE
else if(rate == "input")
rate = tgui_input_num(usr, "New transfer rate (0-[MAX_TRANSFER_RATE] L/s):", name, transfer_rate)
rate = input("New transfer rate (0-[MAX_TRANSFER_RATE] L/s):", name, transfer_rate) as num|null
if(!isnull(rate) && !..())
. = TRUE
else if(text2num(rate) != null)
code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
+1 -1
View File
@@ -151,7 +151,7 @@
pressure = MAX_OUTPUT_PRESSURE
. = TRUE
else if(pressure == "input")
pressure = tgui_input_num(usr, "New output pressure (0-[MAX_OUTPUT_PRESSURE] kPa):", name, target_pressure)
pressure = input("New output pressure (0-[MAX_OUTPUT_PRESSURE] kPa):", name, target_pressure) as num|null
if(!isnull(pressure) && !..())
. = TRUE
else if(text2num(pressure) != null)
code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
+1 -1
View File
@@ -166,7 +166,7 @@
rate = MAX_TRANSFER_RATE
. = TRUE
else if(rate == "input")
rate = tgui_input_num(usr, "New transfer rate (0-[MAX_TRANSFER_RATE] L/s):", name, volume_rate)
rate = input("New transfer rate (0-[MAX_TRANSFER_RATE] L/s):", name, volume_rate) as num|null
if(!isnull(rate) && !..())
. = TRUE
else if(text2num(rate) != null)
code/modules/atmospherics/machinery/components/unary_devices/relief_valve.dm
+2 -2
View File
@@ -82,7 +82,7 @@
pressure = 50*ONE_ATMOSPHERE
. = TRUE
else if(pressure == "input")
pressure = tgui_input_num(usr, "New output pressure ([close_pressure]-[50*ONE_ATMOSPHERE] kPa):", name, open_pressure)
pressure = input("New output pressure ([close_pressure]-[50*ONE_ATMOSPHERE] kPa):", name, open_pressure) as num|null
if(!isnull(pressure) && !..())
. = TRUE
else if(text2num(pressure) != null)
@@ -97,7 +97,7 @@
pressure = open_pressure
. = TRUE
else if(pressure == "input")
pressure = tgui_input_num(usr, "New output pressure (0-[open_pressure] kPa):", name, close_pressure)
pressure = input("New output pressure (0-[open_pressure] kPa):", name, close_pressure) as num|null
if(!isnull(pressure) && !..())
. = TRUE
else if(text2num(pressure) != null)
code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
+1 -1
View File
@@ -158,7 +158,7 @@
var/target = params["target"]
var/adjust = text2num(params["adjust"])
if(target == "input")
target = tgui_input_num(usr, "Set new target ([min_temperature]-[max_temperature] K):", name, target_temperature)
target = input("Set new target ([min_temperature]-[max_temperature] K):", name, target_temperature) as num|null
if(!isnull(target))
. = TRUE
else if(adjust)
code/modules/atmospherics/machinery/portable/canister.dm
+3 -3
View File
@@ -388,7 +388,7 @@
return
switch(action)
if("relabel")
var/label = tgui_input_list(usr, "New canister label:", name, sortList(label2types))
var/label = input("New canister label:", name) as null|anything in sortList(label2types)
if(label && !..())
var/newtype = label2types[label]
if(newtype)
@@ -416,7 +416,7 @@
pressure = can_max_release_pressure
. = TRUE
else if(pressure == "input")
pressure = tgui_input_num(usr, "New release pressure ([can_min_release_pressure]-[can_max_release_pressure] kPa):", name, release_pressure)
pressure = input("New release pressure ([can_min_release_pressure]-[can_max_release_pressure] kPa):", name, release_pressure) as num|null
if(!isnull(pressure) && !..())
. = TRUE
else if(text2num(pressure) != null)
@@ -461,7 +461,7 @@
if("increase")
timer_set = min(maximum_timer_set, timer_set + 10)
if("input")
var/user_input = tgui_input_num(usr, "Set time to valve toggle.", name, timer_set)
var/user_input = input(usr, "Set time to valve toggle.", name) as null|num
if(!user_input)
return
var/N = text2num(user_input)