Renames duplicate random_name() proc

This commit is contained in:
Ikarrus
2015-07-06 20:15:47 -06:00
parent e4038dd7b6
commit b1d8d049c1
10 changed files with 14 additions and 17 deletions
+2 -2
View File
@@ -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))
+2 -2
View File
@@ -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)
+1 -1
View File
@@ -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)
+2 -5
View File
@@ -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)
+1 -1
View File
@@ -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)
+2 -2
View File
@@ -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)
@@ -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)
@@ -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)
+1 -1
View File
@@ -110,7 +110,7 @@
src << "<span class='notice'>Now teleporting.</span>"
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
+1 -1
View File
@@ -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