From b1d8d049c1d1fdd63273bca6e6b9bcf6bce5ef12 Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Mon, 6 Jul 2015 20:15:47 -0600 Subject: [PATCH] Renames duplicate random_name() proc --- code/__HELPERS/mobs.dm | 4 ++-- code/game/machinery/computer/medical.dm | 4 ++-- code/modules/admin/create_mob.dm | 2 +- code/modules/client/preferences.dm | 7 ++----- code/modules/client/preferences_savefile.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 4 ++-- code/modules/mob/living/carbon/human/species.dm | 2 +- code/modules/mob/living/carbon/human/species_types.dm | 2 +- code/modules/mob/new_player/new_player.dm | 2 +- code/modules/mob/transform_procs.dm | 2 +- 10 files changed, 14 insertions(+), 17 deletions(-) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index a1730fed7f2..4abf1181a05 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -69,7 +69,7 @@ if(FEMALE) return pick(facial_hair_styles_female_list) else return pick(facial_hair_styles_list) -/proc/random_name(gender, attempts_to_find_unique_name=10) +/proc/random_unique_name(gender, attempts_to_find_unique_name=10) for(var/i=1, i<=attempts_to_find_unique_name, i++) if(gender==FEMALE) . = capitalize(pick(first_names_female)) + " " + capitalize(pick(last_names)) else . = capitalize(pick(first_names_male)) + " " + capitalize(pick(last_names)) @@ -77,7 +77,7 @@ if(i != attempts_to_find_unique_name && !findname(.)) break -/proc/random_lizard_name(gender, attempts_to_find_unique_name=10) +/proc/random_unique_lizard_name(gender, attempts_to_find_unique_name=10) for(var/i=1, i<=attempts_to_find_unique_name, i++) . = capitalize(lizard_name(gender)) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 3cfe5474fd3..d1d0041a41c 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -562,9 +562,9 @@ switch(rand(1,6)) if(1) if(prob(10)) - R.fields["name"] = random_lizard_name(R.fields["sex"],1) + R.fields["name"] = random_unique_lizard_name(R.fields["sex"],1) else - R.fields["name"] = random_name(R.fields["sex"],1) + R.fields["name"] = random_unique_name(R.fields["sex"],1) if(2) R.fields["sex"] = pick("Male", "Female") if(3) diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index 11ed127148b..e32260b95ef 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -10,7 +10,7 @@ /proc/randomize_human(mob/living/carbon/human/H) H.gender = pick(MALE, FEMALE) - H.real_name = random_name(H.gender) + H.real_name = random_unique_name(H.gender) H.name = H.real_name H.dna.generate_uni_identity(H) H.underwear = random_underwear(H.gender) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 9d5908f7655..64f79d9143f 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1017,7 +1017,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set if("changeslot") if(!load_character(text2num(href_list["num"]))) random_character() - real_name = random_name(gender) + real_name = random_unique_name(gender) save_character() if("tab") @@ -1029,10 +1029,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set proc/copy_to(mob/living/carbon/human/character) if(be_random_name) - if(pref_species.id == "lizard") - real_name = random_lizard_name(gender) - else - real_name = random_name(gender) + real_name = pref_species.random_name(gender) if(be_random_body) random_character(gender) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 141c043310c..86835039c0c 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -223,7 +223,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car real_name = reject_bad_name(real_name) if(!features["mcolor"] || features["mcolor"] == "#000") features["mcolor"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F") - if(!real_name) real_name = random_name(gender) + if(!real_name) real_name = random_unique_name(gender) be_random_name = sanitize_integer(be_random_name, 0, 1, initial(be_random_name)) be_random_body = sanitize_integer(be_random_body, 0, 1, initial(be_random_body)) gender = sanitize_gender(gender) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 1ce49c7de90..81c39b3beb4 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -45,7 +45,7 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi if(body.real_name) name = body.real_name else - name = random_name(gender) + name = random_unique_name(gender) mind = body.mind //we don't transfer the mind but we keep a reference to it. @@ -53,7 +53,7 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi loc = T if(!name) //To prevent nameless ghosts - name = random_name(gender) + name = random_unique_name(gender) real_name = name if(!fun_verbs) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index e8b735e2fc3..5f9ea9ff9d8 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -86,7 +86,7 @@ /datum/species/proc/random_name(gender,unique,lastname) if(unique) - return random_name(gender) + return random_unique_name(gender) var/randname if(gender == MALE) diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index 3912c369172..c8fa08fab3c 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/code/modules/mob/living/carbon/human/species_types.dm @@ -70,7 +70,7 @@ datum/species/human/spec_death(var/gibbed, var/mob/living/carbon/human/H) /datum/species/lizard/random_name(gender,unique,lastname) if(unique) - return random_lizard_name(gender) + return random_unique_lizard_name(gender) var/randname = lizard_name(gender) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index e4e1ce303f2..47399af616a 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -110,7 +110,7 @@ src << "Now teleporting." observer.loc = O.loc if(client.prefs.be_random_name) - client.prefs.real_name = random_name(gender) + client.prefs.real_name = random_unique_name(gender) if(client.prefs.be_random_body) client.prefs.random_character(gender) observer.real_name = client.prefs.real_name diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index d586bc3c04c..96f631e6d71 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -156,7 +156,7 @@ O.real_name = newname else if(cmptext("monkey",copytext(O.dna.real_name,1,7))) - O.dna.real_name = random_name(O.gender) + O.dna.real_name = random_unique_name(O.gender) O.real_name = O.dna.real_name O.name = O.real_name