mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 18:32:03 +00:00
FFix random name generation (Chiyihakiti Hitler, etc.)
This commit is contained in:
@@ -35,13 +35,7 @@ Bonus
|
||||
else
|
||||
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)]"
|
||||
var/random_name = H.species.makeName(H.gender,H)
|
||||
H.SetSpecialVoice(random_name)
|
||||
|
||||
return
|
||||
|
||||
@@ -150,11 +150,7 @@
|
||||
|
||||
var/i
|
||||
while (!i)
|
||||
var/randomname
|
||||
if (O.gender == MALE)
|
||||
randomname = capitalize(pick(first_names_male) + " " + capitalize(pick(last_names)))
|
||||
else
|
||||
randomname = capitalize(pick(first_names_female) + " " + capitalize(pick(last_names)))
|
||||
var/randomname = O.species.makeName(O.gender,O)
|
||||
if (findname(randomname))
|
||||
continue
|
||||
else
|
||||
|
||||
@@ -34,12 +34,7 @@
|
||||
user << "\red You failed to inject [M.name]."
|
||||
|
||||
proc/injected(var/mob/living/carbon/target, var/mob/living/carbon/user)
|
||||
if(target.gender == MALE)
|
||||
target.name = pick(first_names_male)
|
||||
else
|
||||
target.name = pick(first_names_female)
|
||||
|
||||
target.name += " [pick(last_names)]"
|
||||
target.generate_name()
|
||||
target.real_name = target.name
|
||||
|
||||
scramble(1, target, 100)
|
||||
|
||||
@@ -394,11 +394,7 @@ client/proc/one_click_antag()
|
||||
|
||||
var/datum/preferences/A = new()
|
||||
A.randomize_appearance_for(new_character)
|
||||
if(new_character.gender == MALE)
|
||||
new_character.real_name = "[pick(first_names_male)] [pick(last_names)]"
|
||||
else
|
||||
new_character.real_name = "[pick(first_names_female)] [pick(last_names)]"
|
||||
new_character.name = new_character.real_name
|
||||
new_character.generate_name()
|
||||
new_character.age = rand(17,45)
|
||||
|
||||
new_character.dna.ready_dna(new_character)
|
||||
|
||||
@@ -430,10 +430,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
|
||||
new_character.real_name = G_found.real_name
|
||||
|
||||
if(!new_character.real_name)
|
||||
if(new_character.gender == MALE)
|
||||
new_character.real_name = capitalize(pick(first_names_male)) + " " + capitalize(pick(last_names))
|
||||
else
|
||||
new_character.real_name = capitalize(pick(first_names_female)) + " " + capitalize(pick(last_names))
|
||||
new_character.generate_name()
|
||||
new_character.name = new_character.real_name
|
||||
|
||||
if(G_found.mind && !G_found.mind.active)
|
||||
|
||||
@@ -1299,7 +1299,7 @@ datum/preferences
|
||||
if(be_random_name)
|
||||
real_name = random_name(gender,species)
|
||||
|
||||
if(config.humans_need_surnames)
|
||||
if(config.humans_need_surnames && species == "Human")
|
||||
var/firstspace = findtext(real_name, " ")
|
||||
var/name_length = length(real_name)
|
||||
if(!firstspace) //we need a surname
|
||||
|
||||
@@ -102,11 +102,11 @@
|
||||
|
||||
return
|
||||
|
||||
/datum/species/proc/handle_post_spawn(var/mob/living/carbon/human/H) //Handles anything not already covered by basic species assignment.
|
||||
/datum/species/proc/handle_post_spawn(var/mob/living/carbon/C) //Handles anything not already covered by basic species assignment.
|
||||
return
|
||||
|
||||
// Used for species-specific names (Vox, etc)
|
||||
/datum/species/proc/makeName(var/gender,var/mob/living/carbon/human/H=null)
|
||||
/datum/species/proc/makeName(var/gender,var/mob/living/carbon/C=null)
|
||||
if(gender==FEMALE) return capitalize(pick(first_names_female)) + " " + capitalize(pick(last_names))
|
||||
else return capitalize(pick(first_names_male)) + " " + capitalize(pick(last_names))
|
||||
|
||||
|
||||
@@ -97,14 +97,8 @@
|
||||
new_mob.universal_speak = 1
|
||||
if("human")
|
||||
new_mob = new /mob/living/carbon/human(M.loc)
|
||||
if(M.gender == MALE)
|
||||
new_mob.gender = MALE
|
||||
new_mob.name = pick(first_names_male)
|
||||
else
|
||||
new_mob.gender = FEMALE
|
||||
new_mob.name = pick(first_names_female)
|
||||
new_mob.name += " [pick(last_names)]"
|
||||
new_mob.real_name = new_mob.name
|
||||
|
||||
new_mob.gender = M.gender
|
||||
|
||||
var/datum/preferences/A = new() //Randomize appearance for the human
|
||||
A.randomize_appearance_for(new_mob)
|
||||
@@ -112,6 +106,7 @@
|
||||
var/mob/living/carbon/human/H = new_mob
|
||||
var/newspecies = pick(all_species)
|
||||
H.set_species(newspecies)
|
||||
H.generate_name()
|
||||
else
|
||||
return
|
||||
|
||||
|
||||
@@ -73,13 +73,7 @@
|
||||
|
||||
var/mob/living/carbon/human/H = hit
|
||||
|
||||
if(H.gender == MALE)
|
||||
H.name = pick(first_names_male)
|
||||
else
|
||||
H.name = pick(first_names_female)
|
||||
|
||||
H.name += " [pick(last_names)]"
|
||||
H.real_name = H.name
|
||||
H.generate_name()
|
||||
|
||||
scramble(1, H, 100) // Scramble all UIs
|
||||
scramble(null, H, 5) // Scramble SEs, 5% chance for each block
|
||||
|
||||
Reference in New Issue
Block a user