Skip to content

Commit

Permalink
Last ones
Browse files Browse the repository at this point in the history
  • Loading branch information
AyIong committed Nov 28, 2023
1 parent f90bc26 commit 2a9b9bd
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion code/modules/mob/living/silicon/robot/misc_robot_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/obj/item/pen/multi/robopen/attack_self(mob/user as mob)

var/choice = input("Would you like to change colour or mode?") as null|anything in list("Colour","Mode")
var/choice = tgui_input_list(user, "Would you like to change colour or mode?", name, list("Colour","Mode"))
if(!choice) return

switch(choice)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/silicon/robot/robot_mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
if(!C.is_missing())
installed_components += V

var/toggle = input(src, "Which component do you want to toggle?", "Toggle Component") as null|anything in installed_components
var/toggle = tgui_input_list(src, "Which component do you want to toggle?", "Toggle Component", installed_components)
if(!toggle)
return

Expand Down Expand Up @@ -939,7 +939,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
removable_components += V
if(module)
removable_components += module.custom_removals
var/remove = input(user, "Which component do you want to pry out?", "Remove Component") as null|anything in removable_components
var/remove = tgui_input_list(user, "Which component do you want to pry out?", "Remove Component", removable_components)
if(!remove || !Adjacent(user) || !opened)
return

Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/living/simple_animal/bot/mulebot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -238,15 +238,15 @@
if(mode == BOT_IDLE || mode == BOT_DELIVER)
start_home()
if("destination")
var/new_dest = input(usr, "Enter Destination:", name, destination) as null|anything in GLOB.deliverybeacontags
var/new_dest = tgui_input_list(usr, "Enter Destination", name, GLOB.deliverybeacontags)
if(new_dest)
set_destination(new_dest)
if("setid")
var/new_id = stripped_input(usr, "Enter ID:", name, suffix, MAX_NAME_LEN)
if(new_id)
set_suffix(new_id)
if("sethome")
var/new_home = input(usr, "Enter Home:", name, home_destination) as null|anything in GLOB.deliverybeacontags
var/new_home = tgui_input_list(usr, "Enter Home", name, GLOB.deliverybeacontags)
if(new_home)
home_destination = new_home
if("unload")
Expand Down Expand Up @@ -779,7 +779,7 @@
unload(0)

if("target")
var/dest = input("Select Bot Destination", "Mulebot [suffix] Interlink", destination) as null|anything in GLOB.deliverybeacontags
var/dest = tgui_input_list(user, "Select Bot Destination", "Mulebot [suffix] Interlink", GLOB.deliverybeacontags)
if(dest)
set_destination(dest)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@
if(!found_mirror)
to_chat(usr, "<span class='warning'>You are not close enough to a working mirror to teleport!</span>")
return
var/input_mirror = input(usr, "Choose a mirror to teleport to.", "Mirror to Teleport to") as null|anything in mirrors_to_use
var/input_mirror = tgui_input_list(usr, "Choose a mirror to teleport to.", "Mirror to Teleport to", mirrors_to_use)
var/obj/chosen = mirrors_to_use[input_mirror]
if(chosen == null)
return
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mod/mod_control.dm
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
if(!module.removable)
continue
removable_modules += module
var/obj/item/mod/module/module_to_remove = input(user, "Which module do you want to pry out?", "Module Removal") as null|anything in removable_modules
var/obj/item/mod/module/module_to_remove = tgui_input_list(user, "Which module do you want to pry out?", "Module Removal", removable_modules)
if(!module_to_remove?.mod)
return FALSE
uninstall(module_to_remove)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/paperwork/paper.dm
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@
usr.gender, //current gender
usr.dna.species //current species
)
var/input_element = input("Select the text you want to add:", "Select item") as null|anything in menu_list
var/input_element = tgui_input_list(usr, "Select the text you want to add", "Select item", menu_list)
switch(input_element) //format selected menu items in pencode and internal data
if(sign_text)
input_element = "\[sign\]"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/ruins/ghost_bar.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
our_characters_names += saves.real_name
our_character_saves += list(saves.real_name = saves)

var/character_name = input("Select a character", "Character selection") as null|anything in our_characters_names
var/character_name = tgui_input_list(user, "Select a character", "Character selection", our_characters_names)
if(!character_name)
return
if(QDELETED(user))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/shuttle/navigation_computer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@
L[S.name] = S

playsound(console, 'sound/machines/terminal_prompt.ogg', 25, 0)
var/selected = input("Choose location to jump to", "Locations", null) as null|anything in L
var/selected = tgui_input_list(target, "Choose location to jump to", "Locations", L)
if(QDELETED(src) || QDELETED(target) || !isliving(target))
return
playsound(src, "terminal_type", 25, 0)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/surgery/organs_internal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
organs -= O
organs[O.name] = O

var/obj/item/organ/internal/I = input("Remove which organ?", "Surgery", null, null) as null|anything in organs
var/obj/item/organ/internal/I = tgui_input_list(user, "Remove which organ?", "Surgery", organs)
if(I && user && target && user.Adjacent(target) && user.get_active_hand() == tool)
extracting = organs[I]
if(!extracting)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/surgery/plastic_surgery.dm
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
for(var/i in 1 to list_size)
names += "Subject [target.gender == MALE ? "I" : "O"]-[pick("A", "B", "C", "D", "E")]-[rand(10000, 99999)]"
names += random_name(target.gender, species_names) //give one normal name in case they want to do regular plastic surgery
var/chosen_name = input(user, "Choose a new name to assign.", "Plastic Surgery") as null|anything in names
var/chosen_name = tgui_input_list(user, "Choose a new name to assign.", "Plastic Surgery", names)
if(!chosen_name)
return
var/oldname = target.real_name
Expand Down
6 changes: 3 additions & 3 deletions code/modules/surgery/robotics.dm
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@
organs -= O
organs[O.name] = O

I = input("Remove which organ?", "Surgery", null, null) as null|anything in organs
I = tgui_input_list(usr, "Remove which organ?", "Surgery", organs)
if(I && user && target && user.Adjacent(target) && user.get_active_hand() == tool)
I = organs[I]
if(!I)
Expand Down Expand Up @@ -644,7 +644,7 @@
return ..()

/datum/surgery_step/robotics/external/customize_appearance/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/chosen_appearance = input(user, "Select the company appearance for this limb.", "Limb Company Selection") as null|anything in GLOB.selectable_robolimbs
var/chosen_appearance = tgui_input_list(user, "Select the company appearance for this limb.", "Limb Company Selection", GLOB.selectable_robolimbs)
if(!chosen_appearance)
return SURGERY_STEP_INCOMPLETE
var/obj/item/organ/external/affected = target.get_organ(target_zone)
Expand Down Expand Up @@ -701,7 +701,7 @@
to_chat(user, "<span class='warning'>The multitool is out of range! Please try again.</span>")
return SURGERY_STEP_INCOMPLETE
var/static/list/gender_list = list("Male" = MALE, "Female" = FEMALE, "Genderless" = PLURAL, "Object" = NEUTER)
var/gender_key = input(user, "Choose a gender for this machine.", "Select Gender", target.gender) as null|anything in gender_list
var/gender_key = tgui_input_list(user, "Choose a gender for this machine", "Select Gender", gender_list)
if(!gender_key)
to_chat(user, "<span class='warning'>You must choose a gender! Please try again.</span>")
return SURGERY_STEP_INCOMPLETE
Expand Down
2 changes: 1 addition & 1 deletion code/modules/tgui/modules/appearance_changer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@

if("hair_gradient")
if(can_change(APPEARANCE_HAIR) && length(valid_hairstyles))
var/new_style = input("Please select gradient style.", "Hair Gradient", head_organ.h_grad_style) as null|anything in GLOB.hair_gradients_list
var/new_style = tgui_input_list(usr, "Please select gradient style", "Hair Gradient", GLOB.hair_gradients_list)
if(new_style)
owner.change_hair_gradient(style = new_style)

Expand Down

0 comments on commit 2a9b9bd

Please sign in to comment.