diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 551746505190..afd8e6eb49c3 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -102,19 +102,12 @@ if(!findname(.)) break -/proc/random_unique_lizard_name(gender, attempts_to_find_unique_name=10, corporate = TRUE) - if(corporate) - for(var/i in 1 to attempts_to_find_unique_name) - . = capitalize(corporate_lizard_name()) - - if(!findname(.)) - break - else - for(var/i in 1 to attempts_to_find_unique_name) - . = capitalize(lizard_name(gender)) +/proc/random_unique_lizard_name(gender, attempts_to_find_unique_name=10) + for(var/i in 1 to attempts_to_find_unique_name) + . = capitalize(lizard_name(gender)) - if(!findname(.)) - break + if(!findname(.)) + break /proc/random_unique_plasmaman_name(attempts_to_find_unique_name=10) for(var/i in 1 to attempts_to_find_unique_name) diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 1ee2dbca4e7c..f7223dda89a3 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -4,9 +4,6 @@ else return "[pick(GLOB.lizard_names_female)]-[pick(GLOB.lizard_names_female)]" -/proc/corporate_lizard_name() - return "[capitalize(pick(GLOB.lizard_verbs))]-the-[capitalize(pick(GLOB.lizard_nouns))]" - /proc/ethereal_name() var/tempname = "[pick(GLOB.ethereal_names)] [random_capital_letter()]" if(prob(65)) diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm index b0d8c1ac87c9..f7231351538d 100644 --- a/code/_globalvars/lists/names.dm +++ b/code/_globalvars/lists/names.dm @@ -9,8 +9,6 @@ GLOBAL_LIST_INIT(first_names_female, world.file2list("strings/names/first_female GLOBAL_LIST_INIT(last_names, world.file2list("strings/names/last.txt")) GLOBAL_LIST_INIT(lizard_names_male, world.file2list("strings/names/lizard_male.txt")) GLOBAL_LIST_INIT(lizard_names_female, world.file2list("strings/names/lizard_female.txt")) -GLOBAL_LIST_INIT(lizard_verbs, world.file2list("strings/names/lizard_verbs.txt")) -GLOBAL_LIST_INIT(lizard_nouns, world.file2list("strings/names/lizard_nouns.txt")) GLOBAL_LIST_INIT(clown_names, world.file2list("strings/names/clown.txt")) GLOBAL_LIST_INIT(mime_names, world.file2list("strings/names/mime.txt")) GLOBAL_LIST_INIT(carp_names, world.file2list("strings/names/carp.txt")) diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index c75d89d0cab1..de9bea423361 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -50,7 +50,7 @@ var/datum/team/ashwalkers/team /obj/effect/mob_spawn/human/ash_walker/special(mob/living/new_spawn) - new_spawn.fully_replace_character_name(null,random_unique_lizard_name(gender, corporate = FALSE)) + new_spawn.fully_replace_character_name(null,random_unique_lizard_name(gender)) to_chat(new_spawn, "Drag the corpses of men and beasts to your nest. It will absorb them to create more of your kind. Glory to the Necropolis!") //yogs - removed a sentence new_spawn.grant_language(/datum/language/draconic) diff --git a/strings/names/lizard_nouns.txt b/strings/names/lizard_nouns.txt deleted file mode 100644 index 3ff88f510ea7..000000000000 --- a/strings/names/lizard_nouns.txt +++ /dev/null @@ -1,97 +0,0 @@ -action items -adoption -alignments -applications -architectures -backend -bandwidth -benefits -best practices -business -catalysts for change -channels -client -clouds -collaboration and idea-sharing -communities -content -convergence -core competencies -customer service -data -deliverables -e-business -e-commerce -e-markets -e-tailers -e-services -experiences -expertise -functionalities -fungibility -growth strategies -human capital -ideas -imperatives -infomediaries -information -infrastructures -initiatives -innovation -intellectual capital -interfaces -internal or "organic" sources -leadership -leadership skills -manufactured products -markets -materials -meta-services -methodologies -methods of empowerment -metrics -mindshare -models -networks -niches -niche markets -nosql -opportunities -"outside the box" thinking -outsourcing -paradigms -partnerships -platforms -portals -potentialities -rocess improvements -processes -products -quality vectors -relationships -resources -results -ROI -scenarios -schemas -scrums -services -solutions -sources -sprints -strategic theme areas -storage -supply chains -synergy -systems -technologies -technology -testing procedures -total linkage -users -value -vortals -web-readiness -web services -wins -virtualization \ No newline at end of file diff --git a/strings/names/lizard_verbs.txt b/strings/names/lizard_verbs.txt deleted file mode 100644 index 19d06c843a4b..000000000000 --- a/strings/names/lizard_verbs.txt +++ /dev/null @@ -1,100 +0,0 @@ -actualizes -administrates -aggregates -architects -benchmarks -brands -builds -cloudifies -communicates -conceptualizes -coordinates -creates -cultivates -customizes -delivers -deploys -develops -disintermediates -disseminates -drives -embraces -e-enables -empowers -enables -engages -engineers -enhances -envisioneers -evisculates -evolves -expedites -exploits -extends -fabricates -facilitates -fashions -formulates -fosters -generates -grows -harnesses -impacts -implements -incentivizes -incepts -incubates -initiates -innovates -integrates -iterates -leverages -maintains -matrixes -maximizes -meshes -monetizes -morphs -myocardinates -negotiates -networks -optimizes -onboards -orchestrates -parallel tasks -plagiarizes -pontificates -predominates -procrastinates -productivates -productizes -promotes -provides-access-to -pursues -recaptiualizes -reconceptualizes -redefines -re-engineers -reintermediates -reinvents -repurposes -restores -revolutionizes -right-shores -scales -seizes -simplifies -strategizes -streamlines -supplies -syndicates -synergizes -synthesizes -targets -transforms -transitions -underwhelms -unleashes -utilizes -visualizes -whiteboards