shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6260 from Citadel-Station-13/upstream-merge-36927

Browse Source 
[MIRROR] Adds more moth names to prevent duplicate random names
This commit is contained in:
deathride58
2018-04-04 21:13:23 +00:00
committed by GitHub
parent 8ad42c519a b603b48f21
commit c702e9b097
6 changed files with 162 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/mobs.dm
+2 -2
View File
@@ -218,8 +218,8 @@
/proc/random_unique_moth_name(attempts_to_find_unique_name=10)
for(var/i in 1 to attempts_to_find_unique_name)
. = capitalize(moth_name())
. = capitalize(pick(GLOB.moth_first)) + " " + capitalize(pick(GLOB.moth_last))
if(!findname(.))
break
code/__HELPERS/names.dm
+1 -1
View File
@@ -8,7 +8,7 @@
return "[pick(GLOB.plasmaman_names)] \Roman[rand(1,99)]"
/proc/moth_name()
return "[pick(GLOB.moth_names)]"
return "[pick(GLOB.moth_first)] [pick(GLOB.moth_last)]"
/proc/church_name()
var/static/church_name
code/_globalvars/lists/names.dm
+2 -1
View File
@@ -13,7 +13,8 @@ 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"))
GLOBAL_LIST_INIT(golem_names, world.file2list("strings/names/golem.txt"))
GLOBAL_LIST_INIT(moth_names, world.file2list("strings/names/moth.txt"))
GLOBAL_LIST_INIT(moth_first, world.file2list("strings/names/moth_first.txt"))
GLOBAL_LIST_INIT(moth_last, world.file2list("strings/names/moth_last.txt"))
GLOBAL_LIST_INIT(plasmaman_names, world.file2list("strings/names/plasmaman.txt"))
GLOBAL_LIST_INIT(posibrain_names, world.file2list("strings/names/posibrain.txt"))
GLOBAL_LIST_INIT(nightmare_names, world.file2list("strings/names/nightmare.txt"))