From 157c3722acb411693f9c3e48f06fe66ea130d66e Mon Sep 17 00:00:00 2001 From: CapnMachaddish Date: Tue, 12 Jan 2021 00:59:24 -0600 Subject: [PATCH] no longer shitcode --- code/__HELPERS/text.dm | 2 +- code/game/machinery/computer/card.dm | 2 +- code/game/objects/items/cards_ids.dm | 2 +- code/game/objects/items/robot/robot_parts.dm | 2 +- code/game/objects/structures/mirror.dm | 2 +- code/modules/antagonists/wizard/wizard.dm | 2 +- code/modules/client/preferences.dm | 2 +- code/modules/client/preferences_savefile.dm | 2 +- code/modules/modular_computers/file_system/programs/card.dm | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 917d200a..3985659b 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -114,7 +114,7 @@ #define LETTERS_DETECTED 4 //Filters out undesirable characters from names -/proc/reject_bad_name(t_in, allow_numbers = TRUE, max_length = MAX_NAME_LEN, ascii_only = TRUE) +/proc/reject_bad_name(t_in, allow_numbers = FALSE, max_length = MAX_NAME_LEN, ascii_only = TRUE) if(!t_in) return //Rejects the input if it is null diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 7f771959..99f8035e 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -481,7 +481,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) if (authenticated) var/t2 = inserted_modify_id if ((authenticated && inserted_modify_id == t2 && (in_range(src, usr) || issilicon(usr)) && isturf(loc))) - var/newName = reject_bad_name(href_list["reg"]) + var/newName = reject_bad_name(href_list["reg"], TRUE) if(newName) inserted_modify_id.registered_name = newName playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index d001077c..b366b571 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -272,7 +272,7 @@ update_label("John Doe", "Clowny") if(user.mind.special_role || anyone) if(alert(user, "Action", "Agent ID", "Show", "Forge") == "Forge") var/input_name = stripped_input(user, "What name would you like to put on this card? Leave blank to randomise.", "Agent card name", registered_name ? registered_name : (ishuman(user) ? user.real_name : user.name), MAX_NAME_LEN) - input_name = reject_bad_name(input_name) + input_name = reject_bad_name(input_name, TRUE) if(!input_name) // Invalid/blank names give a randomly generated one. if(user.gender == MALE) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 06cc7d52..5b4a4386 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -387,7 +387,7 @@ return if(href_list["Name"]) - var/new_name = reject_bad_name(input(usr, "Enter new designation. Set to blank to reset to default.", "Cyborg Debug", src.created_name),1) + var/new_name = reject_bad_name(input(usr, "Enter new designation. Set to blank to reset to default.", "Cyborg Debug", src.created_name), TRUE) if(!in_range(src, usr) && src.loc != usr) return if(new_name) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index cd6f52aa..009c1ca5 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -133,7 +133,7 @@ switch(choice) if("name") - var/newname = reject_bad_name(stripped_input(H, "Who are we again?", "Name change", H.name, MAX_NAME_LEN)) + var/newname = reject_bad_name(stripped_input(H, "Who are we again?", "Name change", H.name, MAX_NAME_LEN), TRUE) if(!newname) return diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index bf061cb2..25438753 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -113,7 +113,7 @@ var/wizard_name_second = pick(GLOB.wizard_second) var/randomname = "[wizard_name_first] [wizard_name_second]" var/mob/living/wiz_mob = owner.current - var/newname = reject_bad_name(stripped_input(wiz_mob, "You are the [name]. Would you like to change your name to something else?", "Name change", randomname, MAX_NAME_LEN)) + var/newname = reject_bad_name(stripped_input(wiz_mob, "You are the [name]. Would you like to change your name to something else?", "Name change", randomname, MAX_NAME_LEN), TRUE) if (!newname) newname = randomname diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 816dc2b9..2a5bc386 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1662,7 +1662,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("name") var/new_name = input(user, "Choose your character's name:", "Character Preference") as text|null if(new_name) - new_name = reject_bad_name(new_name) + new_name = reject_bad_name(new_name, TRUE) if(new_name) real_name = new_name else diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 8a3efdc7..9ad29dee 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -429,7 +429,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car //Sanitize - real_name = reject_bad_name(real_name) + real_name = reject_bad_name(real_name, TRUE) gender = sanitize_gender(gender, TRUE, TRUE) if(!real_name) real_name = random_unique_name(gender) diff --git a/code/modules/modular_computers/file_system/programs/card.dm b/code/modules/modular_computers/file_system/programs/card.dm index 243ae89d..8319dee6 100644 --- a/code/modules/modular_computers/file_system/programs/card.dm +++ b/code/modules/modular_computers/file_system/programs/card.dm @@ -201,7 +201,7 @@ if("PRG_edit") if(computer && authorized()) if(params["name"]) - var/temp_name = reject_bad_name(input("Enter name.", "Name", id_card.registered_name)) + var/temp_name = reject_bad_name(input("Enter name.", "Name", id_card.registered_name), TRUE) if(temp_name) id_card.registered_name = temp_name else