diff --git a/code/datums/action.dm b/code/datums/action.dm index ffc14bffc0..8b8ea7efd5 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -564,7 +564,7 @@ var/list/areas = list() for (var/area/a in owner.siliconaccessareas) areas[a.name] = a - var/removeAPC = tgui_input_list("Select an APC to remove:","Remove APC Control", areas) + var/removeAPC = tgui_input_list(owner, "Select an APC to remove:","Remove APC Control", areas) if (!removeAPC) return var/area/area = areas[removeAPC] @@ -586,7 +586,7 @@ var/list/areas = list() for (var/area/a in owner.siliconaccessareas) areas[a.name] = a - var/accessAPC = tgui_input_list("Select an APC to access:","Access APC Interface", areas) + var/accessAPC = tgui_input_list(owner, "Select an APC to access:","Access APC Interface", areas) if (!accessAPC) return var/area/area = areas[accessAPC] diff --git a/code/game/gamemodes/gangs/gang.dm b/code/game/gamemodes/gangs/gang.dm index d5231e97fe..af2b830788 100644 --- a/code/game/gamemodes/gangs/gang.dm +++ b/code/game/gamemodes/gangs/gang.dm @@ -141,7 +141,7 @@ promote() /datum/antagonist/gang/proc/admin_adjust_influence() - var/inf = tgui_input_num("Influence for [gang.name]","Gang influence", gang.influence) + var/inf = tgui_input_num(usr, "Influence for [gang.name]","Gang influence", gang.influence) if(!isnull(inf)) gang.influence = inf message_admins("[key_name_admin(usr)] changed [gang.name]'s influence to [inf].") diff --git a/code/game/objects/items/debug_items.dm b/code/game/objects/items/debug_items.dm index c354b9ee10..f743e2e4e8 100644 --- a/code/game/objects/items/debug_items.dm +++ b/code/game/objects/items/debug_items.dm @@ -21,7 +21,7 @@ /obj/item/debug/human_spawner/attack_self(mob/user) ..() - var/choice = tgui_input_list("Select a species", "Human Spawner", null, GLOB.species_list) + var/choice = tgui_input_list(user, "Select a species", "Human Spawner", null, GLOB.species_list) selected_species = GLOB.species_list[choice] /* Revive this once we purge all the istype checks for tools for tool_behaviour diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index dd421d8074..a1716cd8cc 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -184,7 +184,7 @@ /obj/effect/mob_spawn/human/golem/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags) if(isgolem(user) && can_transfer) - var/transfer_choice = tgui_alert("Transfer your soul to [src]? (Warning, your old body will die!)",,list("Yes","No")) + var/transfer_choice = tgui_alert(user, "Transfer your soul to [src]? (Warning, your old body will die!)",,list("Yes","No")) if(transfer_choice != "Yes" || QDELETED(src) || uses <= 0 || !user.canUseTopic(src, BE_CLOSE, NO_DEXTERY, NO_TK)) return log_game("[key_name(user)] golem-swapped into [src]") diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index a99139c6b0..6dc345d7e8 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1531,7 +1531,7 @@ if(!ismob(M)) to_chat(usr, "this can only be used on instances of type /mob.") - var/speech = tgui_input_text("What will [key_name(M)] say?", "Force speech", "")// Don't need to sanitize, since it does that in say(), we also trust our admins. + var/speech = tgui_input_text(usr, "What will [key_name(M)] say?", "Force speech", "")// Don't need to sanitize, since it does that in say(), we also trust our admins. if(!speech) return M.say(speech, forced = "admin speech") diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index 3d50cfca48..f8a3cf5ffb 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -215,7 +215,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") else choices[C] = C choices = sortList(choices) - var/selection = tgui_input_list("Please, select a player!", "Ignore", choices) + var/selection = tgui_input_list(src, "Please, select a player!", "Ignore", choices) if(!selection || !(selection in choices)) return selection = choices[selection] diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index c70e9feca3..1713a558cd 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -93,7 +93,7 @@ /datum/action/chameleon_outfit/proc/select_outfit(mob/user) if(!user || !IsAvailable()) return FALSE - var/selected = tgui_input_list("Select outfit to change into", "Chameleon Outfit", outfit_options) + var/selected = tgui_input_list(user, "Select outfit to change into", "Chameleon Outfit", outfit_options) if(!IsAvailable() || QDELETED(src) || QDELETED(user)) return FALSE var/outfit_type = outfit_options[selected] @@ -178,7 +178,7 @@ /datum/action/item_action/chameleon/change/proc/select_look(mob/user) var/obj/item/picked_item var/picked_name - picked_name = tgui_input_list("Select [chameleon_name] to change into", "Chameleon [chameleon_name]", chameleon_list) + picked_name = tgui_input_list(user, "Select [chameleon_name] to change into", "Chameleon [chameleon_name]", chameleon_list) if(!picked_name) return picked_item = chameleon_list[picked_name] diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index 0630c4a5f6..1535e9265d 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -232,7 +232,7 @@ return 0 var/list/modes = list("Off", "Binary vitals", "Exact vitals", "Tracking beacon") - var/switchMode = tgui_input_list("Select a sensor mode:", "Suit Sensor Mode", modes) + var/switchMode = tgui_input_list(usr, "Select a sensor mode:", "Suit Sensor Mode", modes) if(get_dist(usr, src) > 1) to_chat(usr, "You have moved too far away!") return diff --git a/code/modules/integrated_electronics/core/debugger.dm b/code/modules/integrated_electronics/core/debugger.dm index 434dda4e07..7f5dd87dbc 100644 --- a/code/modules/integrated_electronics/core/debugger.dm +++ b/code/modules/integrated_electronics/core/debugger.dm @@ -12,7 +12,7 @@ var/copy_values = FALSE /obj/item/integrated_electronics/debugger/attack_self(mob/user) - var/type_to_use = tgui_input_list("Please choose a type to use.","[src] type setting", list("string","number","ref","copy","null")) + var/type_to_use = tgui_input_list(user, "Please choose a type to use.","[src] type setting", list("string","number","ref","copy","null")) if(!user.IsAdvancedToolUser()) return diff --git a/code/modules/integrated_electronics/core/pins.dm b/code/modules/integrated_electronics/core/pins.dm index 91d3e984a7..43421ec7eb 100644 --- a/code/modules/integrated_electronics/core/pins.dm +++ b/code/modules/integrated_electronics/core/pins.dm @@ -177,7 +177,7 @@ D [1]/ || /datum/integrated_io/proc/ask_for_data_type(mob/user, var/default, var/list/allowed_data_types = list("string","number","null")) - var/type_to_use = tgui_input_list("Please choose a type to use.","[src] type setting", allowed_data_types) + var/type_to_use = tgui_input_list(user, "Please choose a type to use.","[src] type setting", allowed_data_types) if(!holder.check_interactivity(user)) return @@ -189,7 +189,7 @@ D [1]/ || to_chat(user, "You input "+new_data+" into the pin.") return new_data if("number") - new_data = tgui_input_num("Now type in a number.","[src] number writing", isnum(default) ? default : null) + new_data = tgui_input_num(user, "Now type in a number.","[src] number writing", isnum(default) ? default : null) if(isnum(new_data) && holder.check_interactivity(user) ) to_chat(user, "You input [new_data] into the pin.") return new_data