From b0cfaf401fc3112c8f5ef448c205daa960f9000c Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Sun, 5 Jul 2015 18:35:56 -0600 Subject: [PATCH 1/4] Random Names for Lizards Lizards now have their own list of names to pull from when randomizing their names. --- code/__HELPERS/mobs.dm | 8 + code/__HELPERS/names.dm | 9 +- code/_globalvars/lists/names.dm | 2 + .../diseases/advance/symptoms/voice_change.dm | 19 +- code/game/gamemodes/nuclear/nuclear.dm | 19 +- code/game/machinery/computer/medical.dm | 5 +- code/game/machinery/computer/security.dm | 5 +- code/modules/admin/verbs/one_click_antag.dm | 24 +- code/modules/admin/verbs/randomverbs.dm | 5 +- code/modules/client/preferences.dm | 15 +- code/modules/events/wizard/race.dm | 15 +- code/modules/mob/new_player/new_player.dm | 5 +- code/modules/ninja/suit/mask.dm | 4 +- code/modules/surgery/plastic_surgery.dm | 5 +- config/names/lizard_female.txt | 123 +++++++++ config/names/lizard_male.txt | 260 ++++++++++++++++++ 16 files changed, 489 insertions(+), 34 deletions(-) create mode 100644 config/names/lizard_female.txt create mode 100644 config/names/lizard_male.txt diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 46a58da0fb6..56f8eb4472e 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -77,6 +77,14 @@ if(i != attempts_to_find_unique_name && !findname(.)) break +/proc/random_lizard_name(gender, attempts_to_find_unique_name=10) + for(var/i=1, i<=attempts_to_find_unique_name, i++) + if(gender==FEMALE) . = capitalize(pick(lizard_names_female)) + else . = capitalize(pick(lizard_names_male)) + + if(i != attempts_to_find_unique_name && !findname(.)) + break + /proc/random_skin_tone() return pick(skin_tones) diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index e5976a5c460..d9d964190d4 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -185,9 +185,12 @@ var/syndicate_code_response//Code response for traitors. if(names.len&&prob(70)) code_phrase += pick(names) else - code_phrase += pick(pick(first_names_male,first_names_female)) - code_phrase += " " - code_phrase += pick(last_names) + if(prob(20)) + code_phrase += pick(pick(lizard_names_male,lizard_names_female)) + else + code_phrase += pick(pick(first_names_male,first_names_female)) + code_phrase += " " + code_phrase += pick(last_names) if(2) code_phrase += pick(get_all_jobs())//Returns a job. safety -= 1 diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm index edaa74eab14..834f4aa8dd6 100644 --- a/code/_globalvars/lists/names.dm +++ b/code/_globalvars/lists/names.dm @@ -7,6 +7,8 @@ var/list/commando_names = file2list("config/names/death_commando.txt") var/list/first_names_male = file2list("config/names/first_male.txt") var/list/first_names_female = file2list("config/names/first_female.txt") var/list/last_names = file2list("config/names/last.txt") +var/list/lizard_names_male = file2list("config/names/lizard_male.txt") +var/list/lizard_names_female = file2list("config/names/lizard_female.txt") var/list/clown_names = file2list("config/names/clown.txt") var/list/mime_names = file2list("config/names/mime.txt") diff --git a/code/datums/diseases/advance/symptoms/voice_change.dm b/code/datums/diseases/advance/symptoms/voice_change.dm index 02f352f3550..273e5d4cb9c 100644 --- a/code/datums/diseases/advance/symptoms/voice_change.dm +++ b/code/datums/diseases/advance/symptoms/voice_change.dm @@ -37,12 +37,19 @@ Bonus if(ishuman(M)) var/mob/living/carbon/human/H = M var/random_name = "" - switch(H.gender) - if(MALE) - random_name = pick(first_names_male) - else - random_name = pick(first_names_female) - random_name += " [pick(last_names)]" + if(H.dna.species.id == "lizard") + switch(H.gender) + if(MALE) + random_name = pick(lizard_names_male) + else + random_name = pick(lizard_names_female) + else + switch(H.gender) + if(MALE) + random_name = pick(first_names_male) + else + random_name = pick(first_names_female) + random_name += " [pick(last_names)]" H.SetSpecialVoice(random_name) return diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 251a562fe3c..e7bc7814098 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -332,10 +332,19 @@ /proc/NukeNameAssign(var/lastname,var/list/syndicates) for(var/datum/mind/synd_mind in syndicates) - switch(synd_mind.current.gender) - if(MALE) - synd_mind.name = "[pick(first_names_male)] [lastname]" - if(FEMALE) - synd_mind.name = "[pick(first_names_female)] [lastname]" + var/mob/living/carbon/human/H = synd_mind.current + if(H.dna.species.id == "lizard") + switch(synd_mind.current.gender) + if(MALE) + synd_mind.name = pick(lizard_names_male) + if(FEMALE) + synd_mind.name = pick(lizard_names_female) + else + switch(synd_mind.current.gender) + if(MALE) + synd_mind.name = pick(first_names_male) + if(FEMALE) + synd_mind.name = pick(first_names_female) + synd_mind.name += " [lastname]" synd_mind.current.real_name = synd_mind.name return \ No newline at end of file diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 4c27c1b1552..1b6d1d4aa8a 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -561,7 +561,10 @@ if(prob(10/severity)) switch(rand(1,6)) if(1) - R.fields["name"] = random_name(R.fields["sex"],1) + if(prob(20)) + R.fields["name"] = random_lizard_name(R.fields["sex"],1) + else + R.fields["name"] = random_name(R.fields["sex"],1) if(2) R.fields["sex"] = pick("Male", "Female") if(3) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 4a0aad15867..c4d70174cdf 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -711,7 +711,10 @@ What a mess.*/ if(prob(10/severity)) switch(rand(1,8)) if(1) - R.fields["name"] = "[pick(pick(first_names_male), pick(first_names_female))] [pick(last_names)]" + if(prob(20)) + R.fields["name"] = "[pick(pick(lizard_names_male), pick(lizard_names_female))]" + else + R.fields["name"] = "[pick(pick(first_names_male), pick(first_names_female))] [pick(last_names)]" if(2) R.fields["sex"] = pick("Male", "Female") if(3) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index e294c26928b..c02acfe81f6 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -422,7 +422,10 @@ var/mob/living/carbon/human/newmob = new (pick(emergencyresponseteamspawn)) chosen_candidate.client.prefs.copy_to(newmob) ready_dna(newmob) - newmob.real_name = random_name(newmob.gender) + if(newmob.dna.species.id == "lizard") + newmob.real_name = random_lizard_name(newmob.gender) + else + newmob.real_name = random_name(newmob.gender) newmob.key = chosen_candidate.key newmob.mind.assigned_role = "Centcom Official" equip_centcomofficial(newmob) @@ -492,27 +495,28 @@ var/list/lastname = last_names chosen_candidate.client.prefs.copy_to(ERTOperative) ready_dna(ERTOperative) + var/ertname = ((ERTOperative.dna.species.id == "lizard") ? (ERTOperative.gender==MALE ? pick(lizard_names_male) : pick(lizard_names_female)) : pick(lastname)) switch(numagents) if(1) - ERTOperative.real_name = "Commander [pick(lastname)]" + ERTOperative.real_name = "Commander [ertname]" equip_emergencyresponsesquad(ERTOperative, "commander",redalert) if(2) - ERTOperative.real_name = "Security Officer [pick(lastname)]" + ERTOperative.real_name = "Security Officer [ertname]" equip_emergencyresponsesquad(ERTOperative, "sec",redalert) if(3) - ERTOperative.real_name = "Medical Officer [pick(lastname)]" + ERTOperative.real_name = "Medical Officer [ertname]" equip_emergencyresponsesquad(ERTOperative, "med",redalert) if(4) - ERTOperative.real_name = "Engineer [pick(lastname)]" + ERTOperative.real_name = "Engineer [ertname]" equip_emergencyresponsesquad(ERTOperative, "eng",redalert) if(5) - ERTOperative.real_name = "Security Officer [pick(lastname)]" + ERTOperative.real_name = "Security Officer [ertname]" equip_emergencyresponsesquad(ERTOperative, "sec",redalert) if(6) - ERTOperative.real_name = "Medical Officer [pick(lastname)]" + ERTOperative.real_name = "Medical Officer [ertname]" equip_emergencyresponsesquad(ERTOperative, "med",redalert) if(7) - ERTOperative.real_name = "Engineer [pick(lastname)]" + ERTOperative.real_name = "Engineer [ertname]" equip_emergencyresponsesquad(ERTOperative, "eng",redalert) ERTOperative.key = chosen_candidate.key ERTOperative.mind.assigned_role = "ERT" @@ -590,9 +594,9 @@ temp.abductors |= list(agent_mind,scientist_mind) temp.make_abductor_team(number,preset_scientist=scientist_mind,preset_agent=agent_mind) temp.post_setup_team(number) - + ticker.mode.abductor_teams++ - + if(ticker.mode.config_tag != "abduction") ticker.mode.abductors |= temp.abductors diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 57bea51a682..2967971a176 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -286,7 +286,10 @@ Traitors and the like can also be revived with the previous role mostly intact. A.copy_to(new_character) if(!new_character.real_name) - new_character.real_name = random_name(new_character.gender) + if(new_character.dna.species.id == "lizard") + new_character.real_name = random_lizard_name(new_character.gender) + else + new_character.real_name = random_name(new_character.gender) new_character.name = new_character.real_name if(G_found.mind && !G_found.mind.active) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 011fe1a6015..153569a78ad 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -111,7 +111,10 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set return //we couldn't load character data so just randomize the character appearance + name random_character() //let's create a random character then - rather than a fat, bald and naked man. - real_name = random_name(gender) + if(pref_species.id == "lizard") + real_name = random_lizard_name(gender) + else + real_name = random_name(gender) if(!loaded_preferences_successfully) save_preferences() save_character() //let's save this new random character so it doesn't keep generating new ones. @@ -674,7 +677,10 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set if("random") switch(href_list["preference"]) if("name") - real_name = random_name(gender) + if(pref_species.id == "lizard") + real_name = random_lizard_name(gender) + else + real_name = random_name(gender) if("age") age = rand(AGE_MIN, AGE_MAX) if("hair") @@ -1029,7 +1035,10 @@ 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) - real_name = random_name(gender) + if(pref_species.id == "lizard") + real_name = random_lizard_name(gender) + else + real_name = random_name(gender) if(be_random_body) random_character(gender) diff --git a/code/modules/events/wizard/race.dm b/code/modules/events/wizard/race.dm index bed5d08b5f4..f1a2e3c0992 100644 --- a/code/modules/events/wizard/race.dm +++ b/code/modules/events/wizard/race.dm @@ -15,13 +15,26 @@ if(!S.dangerous_existence) all_species += speciestype - var/new_species = pick(all_species) + var/datum/species/new_species = pick(all_species) if(prob(50)) all_the_same = 1 for(var/mob/living/carbon/human/H in mob_list) //yes, even the dead if(H.dna) + if(new_species.id != H.dna.species.id) //Change their name if their species changes + if(new_species.id == "lizard") + switch(H.gender) + if(MALE) + H.real_name = pick(lizard_names_male) + if(FEMALE) + H.real_name = pick(lizard_names_female) + else + switch(H.gender) + if(MALE) + H.real_name = pick(first_names_male) + if(FEMALE) + H.real_name = pick(first_names_female) hardset_dna(H, null, null, null, null, new_species) H.regenerate_icons() H << "You feel somehow... different?" diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 05b6fdb0b8a..255ea3769f1 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -382,7 +382,10 @@ if(config.force_random_names || appearance_isbanned(src)) client.prefs.random_character() - client.prefs.real_name = random_name(gender) + if(client.prefs.pref_species.id == "lizard") + client.prefs.real_name = random_lizard_name(gender) + else + client.prefs.real_name = random_name(gender) client.prefs.copy_to(new_character) if(mind) diff --git a/code/modules/ninja/suit/mask.dm b/code/modules/ninja/suit/mask.dm index cd8a2ba822d..1b9755ba861 100644 --- a/code/modules/ninja/suit/mask.dm +++ b/code/modules/ninja/suit/mask.dm @@ -114,7 +114,9 @@ Contents: switch(chance) if(1 to 50)//High chance of a regular name. voice = "[rand(0,1) == 1 ? pick(first_names_female) : pick(first_names_male)] [pick(last_names)]" - if(51 to 80)//Smaller chance of a clown name. + if(51 to 70)//Smaller chance of a lizard name. + voice = "[pick(pick(lizard_names_female), pick(lizard_names_male))]" + if(71 to 80)//Small chance of a clown name. voice = "[pick(clown_names)]" if(81 to 90)//Small chance of a wizard name. voice = "[pick(wizard_first)] [pick(wizard_second)]" diff --git a/code/modules/surgery/plastic_surgery.dm b/code/modules/surgery/plastic_surgery.dm index 52695210d1c..3557432e9c9 100644 --- a/code/modules/surgery/plastic_surgery.dm +++ b/code/modules/surgery/plastic_surgery.dm @@ -18,7 +18,10 @@ user.visible_message("[user] successfully restores [target]'s appearance!", "You successfully restore [target]'s appearance.") else var/oldname = target.real_name - target.real_name = random_name(target.gender) + if(target.dna.species.id == "lizard") + target.real_name = random_lizard_name(target.gender) + else + target.real_name = random_name(target.gender) var/newname = target.real_name //something about how the code handles names required that I use this instead of target.real_name user.visible_message("[user] alters [oldname]'s appearance completely, they are now [newname]!", "You alter [oldname]'s appearance completely, they are now [newname].") return 1 \ No newline at end of file diff --git a/config/names/lizard_female.txt b/config/names/lizard_female.txt new file mode 100644 index 00000000000..61a1abe1a26 --- /dev/null +++ b/config/names/lizard_female.txt @@ -0,0 +1,123 @@ +Adzi-Mota +Ah-Kajul +Ah-Meesei +Ah-Mudeska +Ah-Seeba +Ahaht +Ajim-Kiurz +Akeenus +Akish +Akishan +Aleeto +Am-Eepa +Am-Jasuda +Am-Ra +Amussa +An-Deesei +An-Jeen +Anozz-Crath +Asheemar +Asska +Awas +Azbai-Meenus +Azeez-Eix +Azum +Banalz +Bar-Beekus +Baseenar +Beek-Ja +Beek-Nassa +Beekatan +Beela +Beelei +Beem-Tei +Beewos +Bejeen +Ber-Jaseen +Betzi +Bishalus +Bokeeus +Bur-Meema +Bura-Natoo +Chalaree +Chana-La +Chanil-Lee +Chee-Dooka +Chee-Osheeka +Chee-Saak +Cheesh-Meeus +Cheesh-Mei +Chimatei +Chirurgeon +Cholasistu +Churasu +Dar-Ma +Deeja +Deesh-Meeus +Deetsan +Deetwos +Druja +El-Lurasha +Ereel-Lei +Eutei +Gih-Ja +Gilm +Gish +Hal-Liurz +Hul +Jeed-Ei +Kal-Ma +Kasa +Keel-Raniur +Keerava +Kud-Ei +Mach-Na +Marz +Meeh-Mei +Meen-Sa +Meerana +Milah +Mim-Jeen +Muz-Ra +Nakuma +Nam-La +Neesha +Neetizei +Neetra +Niima +Numeen +Nuralg +Nush +Ocheeva +Okur +Olank-Neeus +On-Wan +On-Wazei +Onasha +Pasha +Rana +Ree-Zish +Reesa +Sanax +Seed-Neeus +Seen-Rei +Shahvee +Shaleez +Shatalg +SheerMeedish +Shei-Chuna +Sigerthe +Skaleel +Tar-Meena +Tasha +Telixith +Tumma-Shah +Veek-Gai +Weedum-Ja +Weewish +Witseidutsei +Wuja-Ei +Wujeeta +Wusha +Xil-Go +Zollassa \ No newline at end of file diff --git a/config/names/lizard_male.txt b/config/names/lizard_male.txt new file mode 100644 index 00000000000..9091dacafb8 --- /dev/null +++ b/config/names/lizard_male.txt @@ -0,0 +1,260 @@ +Abijoo-Anoo +Ah-Malz +Ajum-Kajin +Am-Sakka +Amusei +An-Jeen-Sakka +An-Jeen-Seek +An-Zaw +Aojee-Da +Asum +Az-Muz +Azeel +Azinar +Azjai-Tee +Baar-Taeed +Banka +Bar-Neeus +Barnaxi +Batar-Meej +Batuus +Beem-Ja +Beem-Kiurz +Beshnus +Bijot +Bimee-Kas +Binyaar +Bosekus +Brand-Ra +Brand-Shei +Bun-Teemeeta +Bunach +Bunish +Busheeus +Buujhan +Chakuk +Chalish +Chalureel +Chee-Sei +Cheedal-Gah +Chilwir +Chitakus +Chiwish +Chulz +Chuna +Dakee-Goh +Dan-Ru +DarJee +Darasken +Debameel +Deed-Mema +Deegeeta +Deeh +Deekonus +Deekum +Deekus +Deerkaza +Deetum-Ja +Demeepa +Depasa-Chath +Derkeethus +Deroh-Metaku +Dezanu +Dreet-Lai +Drumarz +Dunaxith +Effe-Tei +Ei-Eiuus +Ei-Etaku +Eleedal-Lei +Er-Jaseen +Er-Teeus +Esqoo +GahJulan +Gajul-Lei +Gam-Kur +Geeh-Lurz +Geel +Geel-Lah +GeemJasaiin +Gin-Wulm +Gulum-Ei +Haj-Ei +Han-Tulm +Haran +Hareeya +Hathei +Heedul +Heem-Jas +Heem-La +Heir-Zish +Hixeeh-Raj +Huleeya +Huzei +Ilas-Tei +Im-Kajin +Im-Kilaya +Im-Zish +Inee +Itan +J'Ram-Dar† +Ja-Reet +Jaraleet +Jaree-Ra +Jee-Tah +Jeela +Jeelius +Jeelus +Jeelus-Tei +Jeer-Maht +Jeer-Tei +Jeetum-Ze +Jilux +Jin-Ei +Junal-Lei +Juunei +Kamax-Ei +Keema-Ta +Keerasa-Tan +Kepanuu +Kiameed +Lara-Eix +Loh-Jat +Lotash +Luh-Maxath +Luteema +Maahi +Madesi +Maheelius +Mahei +Marz-Ja +Mathei +Meejapa +Meensuda +Meer +Miharil +Milos +Miun-Gei +Mobareed +Mohimeem +Mopakuz +Motuu +Mujeen +Muranatepa +Mush-Mere +Napetui +Nazuux +Nebutil +Neeti-Nur +Neetinei +Neetrenaza +Neetzara +Nema-Pachat +Neposh +Netapatuu +Nexith +Nodeeus +Nomu +Nosaleeth +Nowajeem +Noyei-Heem +Nulaz-Eidu +Obaxith +Okan-Shei +Okaw +Okeeh +Oleed-Ei +Oleen-Gei +Olik-Jah +Olink-Nur +Onuja +Onurai-Betu +Opatieel +Otumeel +Owai-Leem +Pacheeva +Pad-Ei +Paduxi +Pajeen +Parash +Peeradeeh +Pejureel +Petaxai +Pideelus +Pimaxi-Loh +Pojeel +Radithax +Rareel +Rasha +Redieeus +Ree-Kia +Reeh-Jah +Reemukeeus +Reenum +Reesa +Reezal-Jul +Resari +Rupah +Sakeepa +Sakeeus +Saliith +Sar-Keer +Schiavas +Seewul +Sejaijilax +Shakiis +Shehs +Silm-Dar +Skeetul +Sureeus +Tah-Tehat +Taleel-Bex +Talen-Jei +Tan-Skee +Tanaka +Tanan +Tee-Lan +Teeba-Ei +Teegla +Teeka +Teekeeus +Teinaava +Teineeja +Terezeeus +Tikaasi +Tim-Jush +Topeeth-Gih +Topith-Kuz +Tsleeixth +Tul +Tun-Zeeus +Ukatsei +Ukawei +Ula +Ulawa +Ullis +Usha +Usheeja +Utadeek +Utamukeeus +Utatul +Uxith-Ei +Vara-Zeen +Veekas +Veenaza +Veezara +Vistha-Kai +Vudeelal +Wanan-Dum +Wanum-Neeus +Wayiteh +Weebam-Na +Weeltul +Weer +Wih-Eius +Wud-Neeus +Wuleen-Shei +Wumeek +Xal-Geh +Yinz'r +Yinz-Hei \ No newline at end of file From 5e50b2b982d87b34b4531d411980760a17bc4ca2 Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Sun, 5 Jul 2015 20:29:36 -0600 Subject: [PATCH 2/4] Update and Changelog Lizard names are now "name1-name2" --- code/__HELPERS/mobs.dm | 3 +- code/__HELPERS/names.dm | 11 +- .../diseases/advance/symptoms/voice_change.dm | 16 +- code/game/gamemodes/nuclear/nuclear.dm | 16 +- code/game/machinery/computer/medical.dm | 2 +- code/game/machinery/computer/security.dm | 4 +- code/modules/admin/verbs/one_click_antag.dm | 7 +- code/modules/admin/verbs/randomverbs.dm | 5 +- code/modules/client/preferences.dm | 10 +- code/modules/events/wizard/race.dm | 13 +- .../mob/living/carbon/human/species.dm | 18 ++ .../mob/living/carbon/human/species_types.dm | 11 + code/modules/mob/new_player/new_player.dm | 5 +- code/modules/ninja/suit/mask.dm | 2 +- code/modules/surgery/plastic_surgery.dm | 5 +- config/names/lizard_female.txt | 152 ++++++---- config/names/lizard_male.txt | 283 +++++++++++------- html/changelogs/ikarrus-lizardnames.yml | 36 +++ 18 files changed, 360 insertions(+), 239 deletions(-) create mode 100644 html/changelogs/ikarrus-lizardnames.yml diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 56f8eb4472e..a1730fed7f2 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -79,8 +79,7 @@ /proc/random_lizard_name(gender, attempts_to_find_unique_name=10) for(var/i=1, i<=attempts_to_find_unique_name, i++) - if(gender==FEMALE) . = capitalize(pick(lizard_names_female)) - else . = capitalize(pick(lizard_names_male)) + . = capitalize(lizard_name(gender)) if(i != attempts_to_find_unique_name && !findname(.)) break diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index d9d964190d4..d60a84fa4cf 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -1,3 +1,10 @@ +/proc/lizard_name(gender) + if(gender == MALE) + return "[pick(lizard_names_male)]-[pick(lizard_names_male)]" + else + return "[pick(lizard_names_female)]-[pick(lizard_names_female)]" + + var/church_name = null /proc/church_name() if (church_name) @@ -185,8 +192,8 @@ var/syndicate_code_response//Code response for traitors. if(names.len&&prob(70)) code_phrase += pick(names) else - if(prob(20)) - code_phrase += pick(pick(lizard_names_male,lizard_names_female)) + if(prob(10)) + code_phrase += pick(lizard_name(MALE),lizard_name(FEMALE)) else code_phrase += pick(pick(first_names_male,first_names_female)) code_phrase += " " diff --git a/code/datums/diseases/advance/symptoms/voice_change.dm b/code/datums/diseases/advance/symptoms/voice_change.dm index 273e5d4cb9c..ccc39b839f7 100644 --- a/code/datums/diseases/advance/symptoms/voice_change.dm +++ b/code/datums/diseases/advance/symptoms/voice_change.dm @@ -36,21 +36,7 @@ Bonus else if(ishuman(M)) var/mob/living/carbon/human/H = M - var/random_name = "" - if(H.dna.species.id == "lizard") - switch(H.gender) - if(MALE) - random_name = pick(lizard_names_male) - else - random_name = pick(lizard_names_female) - else - switch(H.gender) - if(MALE) - random_name = pick(first_names_male) - else - random_name = pick(first_names_female) - random_name += " [pick(last_names)]" - H.SetSpecialVoice(random_name) + H.SetSpecialVoice(H.dna.species.random_name(H.gender)) return diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index e7bc7814098..f549e8c8815 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -328,23 +328,11 @@ M << "That name is reserved." return nukelastname(M) - return newname + return capitalize(newname) /proc/NukeNameAssign(var/lastname,var/list/syndicates) for(var/datum/mind/synd_mind in syndicates) var/mob/living/carbon/human/H = synd_mind.current - if(H.dna.species.id == "lizard") - switch(synd_mind.current.gender) - if(MALE) - synd_mind.name = pick(lizard_names_male) - if(FEMALE) - synd_mind.name = pick(lizard_names_female) - else - switch(synd_mind.current.gender) - if(MALE) - synd_mind.name = pick(first_names_male) - if(FEMALE) - synd_mind.name = pick(first_names_female) - synd_mind.name += " [lastname]" + synd_mind.name = H.dna.species.random_name(H.gender,0,lastname) synd_mind.current.real_name = synd_mind.name return \ No newline at end of file diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 1b6d1d4aa8a..3cfe5474fd3 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -561,7 +561,7 @@ if(prob(10/severity)) switch(rand(1,6)) if(1) - if(prob(20)) + if(prob(10)) R.fields["name"] = random_lizard_name(R.fields["sex"],1) else R.fields["name"] = random_name(R.fields["sex"],1) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index c4d70174cdf..64795c7684e 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -711,8 +711,8 @@ What a mess.*/ if(prob(10/severity)) switch(rand(1,8)) if(1) - if(prob(20)) - R.fields["name"] = "[pick(pick(lizard_names_male), pick(lizard_names_female))]" + if(prob(10)) + R.fields["name"] = "[pick(lizard_name(MALE),lizard_name(FEMALE))]" else R.fields["name"] = "[pick(pick(first_names_male), pick(first_names_female))] [pick(last_names)]" if(2) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index c02acfe81f6..04576802e53 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -422,10 +422,7 @@ var/mob/living/carbon/human/newmob = new (pick(emergencyresponseteamspawn)) chosen_candidate.client.prefs.copy_to(newmob) ready_dna(newmob) - if(newmob.dna.species.id == "lizard") - newmob.real_name = random_lizard_name(newmob.gender) - else - newmob.real_name = random_name(newmob.gender) + newmob.real_name = newmob.dna.species.random_name(newmob.gender,1) newmob.key = chosen_candidate.key newmob.mind.assigned_role = "Centcom Official" equip_centcomofficial(newmob) @@ -495,7 +492,7 @@ var/list/lastname = last_names chosen_candidate.client.prefs.copy_to(ERTOperative) ready_dna(ERTOperative) - var/ertname = ((ERTOperative.dna.species.id == "lizard") ? (ERTOperative.gender==MALE ? pick(lizard_names_male) : pick(lizard_names_female)) : pick(lastname)) + var/ertname = pick(lastname) switch(numagents) if(1) ERTOperative.real_name = "Commander [ertname]" diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 2967971a176..0878357d24e 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -286,10 +286,7 @@ Traitors and the like can also be revived with the previous role mostly intact. A.copy_to(new_character) if(!new_character.real_name) - if(new_character.dna.species.id == "lizard") - new_character.real_name = random_lizard_name(new_character.gender) - else - new_character.real_name = random_name(new_character.gender) + new_character.real_name = new_character.dna.species.random_name(new_character.gender,1) new_character.name = new_character.real_name if(G_found.mind && !G_found.mind.active) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 153569a78ad..9d5908f7655 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -111,10 +111,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set return //we couldn't load character data so just randomize the character appearance + name random_character() //let's create a random character then - rather than a fat, bald and naked man. - if(pref_species.id == "lizard") - real_name = random_lizard_name(gender) - else - real_name = random_name(gender) + real_name = pref_species.random_name(gender,1) if(!loaded_preferences_successfully) save_preferences() save_character() //let's save this new random character so it doesn't keep generating new ones. @@ -677,10 +674,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set if("random") switch(href_list["preference"]) if("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,1) if("age") age = rand(AGE_MIN, AGE_MAX) if("hair") diff --git a/code/modules/events/wizard/race.dm b/code/modules/events/wizard/race.dm index f1a2e3c0992..28691f84a10 100644 --- a/code/modules/events/wizard/race.dm +++ b/code/modules/events/wizard/race.dm @@ -23,18 +23,7 @@ for(var/mob/living/carbon/human/H in mob_list) //yes, even the dead if(H.dna) if(new_species.id != H.dna.species.id) //Change their name if their species changes - if(new_species.id == "lizard") - switch(H.gender) - if(MALE) - H.real_name = pick(lizard_names_male) - if(FEMALE) - H.real_name = pick(lizard_names_female) - else - switch(H.gender) - if(MALE) - H.real_name = pick(first_names_male) - if(FEMALE) - H.real_name = pick(first_names_female) + H.real_name = new_species.random_name(H.gender,1) hardset_dna(H, null, null, null, null, new_species) H.regenerate_icons() H << "You feel somehow... different?" diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 1b93a64cf9d..e8b735e2fc3 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -84,6 +84,24 @@ // PROCS // /////////// +/datum/species/proc/random_name(gender,unique,lastname) + if(unique) + return random_name(gender) + + var/randname + if(gender == MALE) + randname = pick(first_names_male) + else + randname = pick(first_names_female) + + if(lastname) + randname += " [lastname]" + else + randname += " [pick(last_names)]" + + return randname + + //Please override this locally if you want to define when what species qualifies for what rank if human authority is enforced. /datum/species/proc/qualifies_for_rank(var/rank, var/list/features) return 1 diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index f4673249166..3912c369172 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/code/modules/mob/living/carbon/human/species_types.dm @@ -68,6 +68,17 @@ datum/species/human/spec_death(var/gibbed, var/mob/living/carbon/human/H) miss_sound = 'sound/weapons/slashmiss.ogg' meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard +/datum/species/lizard/random_name(gender,unique,lastname) + if(unique) + return random_lizard_name(gender) + + var/randname = lizard_name(gender) + + if(lastname) + randname += " [lastname]" + + return randname + /datum/species/lizard/qualifies_for_rank(var/rank, var/list/features) if(rank in command_positions) return 0 diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 255ea3769f1..e4e1ce303f2 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -382,10 +382,7 @@ if(config.force_random_names || appearance_isbanned(src)) client.prefs.random_character() - if(client.prefs.pref_species.id == "lizard") - client.prefs.real_name = random_lizard_name(gender) - else - client.prefs.real_name = random_name(gender) + client.prefs.real_name = client.prefs.pref_species.random_name(gender,1) client.prefs.copy_to(new_character) if(mind) diff --git a/code/modules/ninja/suit/mask.dm b/code/modules/ninja/suit/mask.dm index 1b9755ba861..308f94245b7 100644 --- a/code/modules/ninja/suit/mask.dm +++ b/code/modules/ninja/suit/mask.dm @@ -115,7 +115,7 @@ Contents: if(1 to 50)//High chance of a regular name. voice = "[rand(0,1) == 1 ? pick(first_names_female) : pick(first_names_male)] [pick(last_names)]" if(51 to 70)//Smaller chance of a lizard name. - voice = "[pick(pick(lizard_names_female), pick(lizard_names_male))]" + voice = "[pick(lizard_name(MALE),lizard_name(FEMALE))]" if(71 to 80)//Small chance of a clown name. voice = "[pick(clown_names)]" if(81 to 90)//Small chance of a wizard name. diff --git a/code/modules/surgery/plastic_surgery.dm b/code/modules/surgery/plastic_surgery.dm index 3557432e9c9..4dd1f600b2d 100644 --- a/code/modules/surgery/plastic_surgery.dm +++ b/code/modules/surgery/plastic_surgery.dm @@ -18,10 +18,7 @@ user.visible_message("[user] successfully restores [target]'s appearance!", "You successfully restore [target]'s appearance.") else var/oldname = target.real_name - if(target.dna.species.id == "lizard") - target.real_name = random_lizard_name(target.gender) - else - target.real_name = random_name(target.gender) + target.real_name = target.dna.species.random_name(target.gender,1) var/newname = target.real_name //something about how the code handles names required that I use this instead of target.real_name user.visible_message("[user] alters [oldname]'s appearance completely, they are now [newname]!", "You alter [oldname]'s appearance completely, they are now [newname].") return 1 \ No newline at end of file diff --git a/config/names/lizard_female.txt b/config/names/lizard_female.txt index 61a1abe1a26..4320d8374df 100644 --- a/config/names/lizard_female.txt +++ b/config/names/lizard_female.txt @@ -1,123 +1,161 @@ -Adzi-Mota -Ah-Kajul -Ah-Meesei -Ah-Mudeska -Ah-Seeba +Adzi +Ah Ahaht -Ajim-Kiurz +Ajim Akeenus Akish Akishan Aleeto -Am-Eepa -Am-Jasuda -Am-Ra +Am Amussa -An-Deesei -An-Jeen -Anozz-Crath +An +Anozz Asheemar Asska Awas -Azbai-Meenus -Azeez-Eix +Azala +Azbai +Azeez Azum Banalz -Bar-Beekus +Bar Baseenar -Beek-Ja -Beek-Nassa +Beek Beekatan +Beekus Beela Beelei -Beem-Tei +Beem Beewos Bejeen -Ber-Jaseen +Ber Betzi Bishalus Bokeeus -Bur-Meema -Bura-Natoo +Bur +Bura Chalaree -Chana-La -Chanil-Lee -Chee-Dooka -Chee-Osheeka -Chee-Saak -Cheesh-Meeus -Cheesh-Mei +Chana +Chanil +Chee +Cheesh Chimatei Chirurgeon Cholasistu +Chuna Churasu -Dar-Ma +Crath +Dar Deeja -Deesh-Meeus +Deesei +Deesh Deetsan Deetwos +Dooka Druja -El-Lurasha -Ereel-Lei +Eepa +Ei +Eix +El +Ereel Eutei -Gih-Ja +Gai +Gih Gilm Gish -Hal-Liurz +Go +Hal Hul -Jeed-Ei -Kal-Ma +Ja +Jaseen +Jasuda +Jeed +Jeen +Kajul +Kal Kasa -Keel-Raniur +Keel Keerava -Kud-Ei -Mach-Na +Kiurz +Kud +La +Lee +Lei +Lifts +Liurz +Lurasha +Ma +Mach Marz -Meeh-Mei -Meen-Sa +Meeh +Meema +Meen +Meena +Meenus Meerana +Meesei +Meeus +Mei Milah -Mim-Jeen -Muz-Ra +Mim +Mota +Mudeska +Muz +Na Nakuma -Nam-La +Nam +Nassa +Natoo Neesha Neetizei Neetra +Neeus Niima Numeen Nuralg Nush Ocheeva Okur -Olank-Neeus -On-Wan -On-Wazei +Olank +On Onasha +Osheeka Pasha +Ra Rana -Ree-Zish +Raniur +Ree Reesa +Rei +Sa +Saak Sanax -Seed-Neeus -Seen-Rei +Seeba +Seed +Seen +Shah Shahvee Shaleez Shatalg SheerMeedish -Shei-Chuna +Shei Sigerthe Skaleel -Tar-Meena +Tail +Tar Tasha +Tei Telixith -Tumma-Shah -Veek-Gai -Weedum-Ja +Tumma +Veek +Wan +Wazei +Weedum Weewish Witseidutsei -Wuja-Ei +Wuja Wujeeta Wusha -Xil-Go +Xil +Zish Zollassa \ No newline at end of file diff --git a/config/names/lizard_male.txt b/config/names/lizard_male.txt index 9091dacafb8..e49bbb2a4d1 100644 --- a/config/names/lizard_male.txt +++ b/config/names/lizard_male.txt @@ -1,33 +1,32 @@ -Abijoo-Anoo -Ah-Malz -Ajum-Kajin -Am-Sakka +Abijoo +Ah +Ajum +Am Amusei -An-Jeen-Sakka -An-Jeen-Seek -An-Zaw -Aojee-Da +An +Anoo +Aojee Asum -Az-Muz +Az Azeel Azinar -Azjai-Tee -Baar-Taeed +Azjai +Baar Banka -Bar-Neeus +Bar Barnaxi -Batar-Meej +Batar Batuus -Beem-Ja -Beem-Kiurz +Beem Beshnus +Betu +Bex Bijot -Bimee-Kas +Bimee Binyaar Bosekus -Brand-Ra -Brand-Shei -Bun-Teemeeta +Brand +Bun Bunach Bunish Busheeus @@ -35,121 +34,163 @@ Buujhan Chakuk Chalish Chalureel -Chee-Sei -Cheedal-Gah +Chath +Chee +Cheedal Chilwir Chitakus Chiwish Chulz Chuna -Dakee-Goh -Dan-Ru +Da +Dakee +Dan +Dar DarJee Darasken Debameel -Deed-Mema +Deed Deegeeta Deeh Deekonus Deekum Deekus Deerkaza -Deetum-Ja +Deetum Demeepa -Depasa-Chath +Depasa Derkeethus -Deroh-Metaku +Deroh Dezanu -Dreet-Lai +Dreet Drumarz +Dum Dunaxith -Effe-Tei -Ei-Eiuus -Ei-Etaku -Eleedal-Lei -Er-Jaseen -Er-Teeus +Effe +Ei +Eidu +Eius +Eiuus +Eix +Eleedal +Er Esqoo +Etaku +Gah GahJulan -Gajul-Lei -Gam-Kur -Geeh-Lurz +Gajul +Gam +Geeh Geel -Geel-Lah GeemJasaiin -Gin-Wulm -Gulum-Ei -Haj-Ei -Han-Tulm +Geh +Gei +Gih +Gin +Goh +Gulum +Haj +Han Haran Hareeya Hathei Heedul -Heem-Jas -Heem-La -Heir-Zish -Hixeeh-Raj +Heem +Hei +Heir +Hixeeh Huleeya Huzei -Ilas-Tei -Im-Kajin -Im-Kilaya -Im-Zish +Ilas +Im Inee Itan -J'Ram-Dar† -Ja-Reet +J'Ram +Ja +Jah Jaraleet -Jaree-Ra -Jee-Tah +Jaree +Jas +Jaseen +Jat +Jee Jeela Jeelius Jeelus -Jeelus-Tei -Jeer-Maht -Jeer-Tei -Jeetum-Ze +Jeen +Jeer +Jeetum +Jei Jilux -Jin-Ei -Junal-Lei +Jin +Jon +Jul +Junal +Jush Juunei -Kamax-Ei -Keema-Ta -Keerasa-Tan +Kai +Kajin +Kamax +Kas +Keema +Keer +Keerasa Kepanuu +Kia Kiameed -Lara-Eix -Loh-Jat +Kilaya +Kiurz +Kur +Kuz +La +Lah +Lai +Lan +Lara +Leem +Lei +Loh Lotash -Luh-Maxath +Luh +Lurz Luteema Maahi Madesi Maheelius Mahei -Marz-Ja +Maht +Malz +Marz Mathei +Maxath +Meej Meejapa Meensuda Meer +Mema +Mere +Metaku Miharil Milos -Miun-Gei +Miun Mobareed Mohimeem Mopakuz Motuu Mujeen Muranatepa -Mush-Mere +Mush +Muz +Na Napetui Nazuux Nebutil -Neeti-Nur +Neeti Neetinei Neetrenaza Neetzara -Nema-Pachat +Neeus +Nema Neposh Netapatuu Nexith @@ -157,23 +198,25 @@ Nodeeus Nomu Nosaleeth Nowajeem -Noyei-Heem -Nulaz-Eidu +Noyei +Nulaz +Nur Obaxith -Okan-Shei +Okan Okaw Okeeh -Oleed-Ei -Oleen-Gei -Olik-Jah -Olink-Nur +Oleed +Oleen +Olik +Olink Onuja -Onurai-Betu +Onurai Opatieel Otumeel -Owai-Leem +Owai +Pachat Pacheeva -Pad-Ei +Pad Paduxi Pajeen Parash @@ -181,53 +224,70 @@ Peeradeeh Pejureel Petaxai Pideelus -Pimaxi-Loh +Pimaxi Pojeel +Ra Radithax +Raj Rareel Rasha Redieeus -Ree-Kia -Reeh-Jah +Ree +Reeh Reemukeeus Reenum Reesa -Reezal-Jul +Reet +Reezal Resari +Riker +Ru Rupah Sakeepa Sakeeus +Sakka Saliith -Sar-Keer +Sar Schiavas +Seek Seewul +Sei Sejaijilax Shakiis Shehs -Silm-Dar +Shei +Silm +Skee Skeetul Sureeus -Tah-Tehat -Taleel-Bex -Talen-Jei -Tan-Skee +Ta +Taeed +Tah +Taleel +Talen +Tan Tanaka Tanan -Tee-Lan -Teeba-Ei +Tee +Teeba Teegla Teeka Teekeeus +Teemeeta +Teeus +Tehat +Tei Teinaava Teineeja Terezeeus Tikaasi -Tim-Jush -Topeeth-Gih -Topith-Kuz +Tim +Topeeth +Topith Tsleeixth Tul -Tun-Zeeus +Tulm +Tun Ukatsei Ukawei Ula @@ -238,23 +298,30 @@ Usheeja Utadeek Utamukeeus Utatul -Uxith-Ei -Vara-Zeen +Uxith +Vara Veekas Veenaza Veezara -Vistha-Kai +Vistha Vudeelal -Wanan-Dum -Wanum-Neeus +Wanan +Wanum Wayiteh -Weebam-Na +Weebam Weeltul Weer -Wih-Eius -Wud-Neeus -Wuleen-Shei +Wih +Wud +Wuleen +Wulm Wumeek -Xal-Geh +Xal +Xemo +Yinz Yinz'r -Yinz-Hei \ No newline at end of file +Zaw +Ze +Zeen +Zeeus +Zish \ No newline at end of file diff --git a/html/changelogs/ikarrus-lizardnames.yml b/html/changelogs/ikarrus-lizardnames.yml new file mode 100644 index 00000000000..4a13636288f --- /dev/null +++ b/html/changelogs/ikarrus-lizardnames.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# spellcheck (typo fixes) +# experiment +# tgs (TG-ported fixes?) +################################# + +# Your name. +author: Ikarrus + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Lizard characters can now get random names unique from humans." \ No newline at end of file From e4038dd7b6f585ee695a0316bfabfcc652bd3833 Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Sun, 5 Jul 2015 22:26:15 -0600 Subject: [PATCH 3/4] Lizard Names --- config/names/lizard_female.txt | 4 +++- config/names/lizard_male.txt | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/names/lizard_female.txt b/config/names/lizard_female.txt index 4320d8374df..078ee7bcff4 100644 --- a/config/names/lizard_female.txt +++ b/config/names/lizard_female.txt @@ -87,6 +87,7 @@ Lurasha Ma Mach Marz +Meedish Meeh Meema Meen @@ -137,10 +138,11 @@ Shah Shahvee Shaleez Shatalg -SheerMeedish +Sheer Shei Sigerthe Skaleel +Sudie Tail Tar Tasha diff --git a/config/names/lizard_male.txt b/config/names/lizard_male.txt index e49bbb2a4d1..9327b92e61f 100644 --- a/config/names/lizard_male.txt +++ b/config/names/lizard_male.txt @@ -77,12 +77,11 @@ Er Esqoo Etaku Gah -GahJulan Gajul Gam Geeh Geel -GeemJasaiin +Geem Geh Gei Gih @@ -111,6 +110,7 @@ Jah Jaraleet Jaree Jas +Jasaiin Jaseen Jat Jee @@ -125,6 +125,7 @@ Jilux Jin Jon Jul +Julan Junal Jush Juunei From b1d8d049c1d1fdd63273bca6e6b9bcf6bce5ef12 Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Mon, 6 Jul 2015 20:15:47 -0600 Subject: [PATCH 4/4] 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