Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions code/__HELPERS/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions code/__HELPERS/names.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 0 additions & 2 deletions code/_globalvars/lists/names.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/ghost_role_spawners.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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, "<b>Drag the corpses of men and beasts to your nest. It will absorb them to create more of your kind. Glory to the Necropolis!</b>") //yogs - removed a sentence

new_spawn.grant_language(/datum/language/draconic)
Expand Down
97 changes: 0 additions & 97 deletions strings/names/lizard_nouns.txt

This file was deleted.

100 changes: 0 additions & 100 deletions strings/names/lizard_verbs.txt

This file was deleted.