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/mining/abandoned_crates.dm
+1 -1
View File
@@ -152,7 +152,7 @@
/obj/structure/closet/crate/secure/loot/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
if(locked)
to_chat(user, "<span class='notice'>The crate is locked with a Deca-code lock.</span>")
var/input = tgui_input_text(usr, "Enter [codelen] digits. All digits must be unique.", "Deca-Code Lock", "")
var/input = input(usr, "Enter [codelen] digits. All digits must be unique.", "Deca-Code Lock", "") as text
if(user.canUseTopic(src, BE_CLOSE))
var/list/sanitised = list()
var/sanitycheck = TRUE
code/modules/mining/aux_base_camera.dm
+1 -1
View File
@@ -200,7 +200,7 @@
return
var/list/buildlist = list("Walls and Floors" = 1,"Airlocks" = 2,"Deconstruction" = 3,"Windows and Grilles" = 4)
var/buildmode = tgui_input_list(usr, "Set construction mode.", "Base Console", buildlist)
var/buildmode = input("Set construction mode.", "Base Console", null) in buildlist
if(buildmode)
B.RCD.mode = buildlist[buildmode]
to_chat(owner, "Build mode is now [buildmode].")
code/modules/mining/equipment/marker_beacons.dm
+2 -2
View File
@@ -60,7 +60,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE))
return
. = TRUE
var/input_color = tgui_input_list(user, "Choose a color.", "Beacon Color", GLOB.marker_beacon_colors)
var/input_color = input(user, "Choose a color.", "Beacon Color") as null|anything in GLOB.marker_beacon_colors
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE))
return
if(input_color)
@@ -133,7 +133,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE))
return
. = TRUE
var/input_color = tgui_input_list(user, "Choose a color.", "Beacon Color", GLOB.marker_beacon_colors)
var/input_color = input(user, "Choose a color.", "Beacon Color") as null|anything in GLOB.marker_beacon_colors
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE))
return
if(input_color)
code/modules/mining/fulton.dm
+1 -1
View File
@@ -31,7 +31,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
else
var/A
A = tgui_input_list(user, "Select a beacon to connect to", "Balloon Extraction Pack", possible_beacons)
A = input("Select a beacon to connect to", "Balloon Extraction Pack", A) as null|anything in possible_beacons
if(!A)
return
code/modules/mining/lavaland/necropolis_chests.dm
+1 -1
View File
@@ -1138,7 +1138,7 @@
var/mob/living/L = I
da_list[L.real_name] = L
var/choice = tgui_input_list(user,"Who do you want dead?","Choose Your Victim", da_list)
var/choice = input(user,"Who do you want dead?","Choose Your Victim") as null|anything in da_list
choice = da_list[choice]
code/modules/mining/machine_redemption.dm
+2 -2
View File
@@ -287,7 +287,7 @@
if (params["sheets"])
desired = text2num(params["sheets"])
else
desired = tgui_input_num(usr, "How many sheets?", "How many sheets would you like to smelt?", 1)
desired = input("How many sheets?", "How many sheets would you like to smelt?", 1) as null|num
var/sheets_to_remove = round(min(desired,50,stored_amount))
@@ -332,7 +332,7 @@
if (params["sheets"])
desired = text2num(params["sheets"])
else
desired = tgui_input_num(usr, "How many sheets?", "How many sheets would you like to smelt?", 1)
desired = input("How many sheets?", "How many sheets would you like to smelt?", 1) as null|num
var/amount = round(min(desired,50,smelt_amount))
mat_container.use_materials(alloy.materials, amount)
materials.silo_log(src, "released", -amount, "sheets", alloy.materials)