Skip to content

Commit

Permalink
stops master from failing lol (#2918)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

empty picklist was causing ALL of my prs to fail
#2861 forgot to remove mothlist outpost random name
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
fix: epty list
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
FalloutFalcon authored Apr 18, 2024
1 parent aa219ca commit 1df14da
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
2 changes: 0 additions & 2 deletions code/_globalvars/lists/names.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ GLOBAL_LIST_INIT(lizard_names_female, world.file2list("strings/names/lizard_fema
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(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(squid_names, world.file2list("strings/names/squid.txt"))
GLOBAL_LIST_INIT(posibrain_names, world.file2list("strings/names/posibrain.txt"))
Expand Down
10 changes: 4 additions & 6 deletions code/modules/overmap/objects/outpost/outpost.dm
Original file line number Diff line number Diff line change
Expand Up @@ -121,16 +121,14 @@
// fun fact: "Hutton" is in last_names
person_name = pick(GLOB.last_names)
else
switch(rand(1, 5))
switch(rand(1, 4))
if(1)
person_name = pick(GLOB.moth_last)
if(2)
person_name = pick(prob(50) ? GLOB.lizard_names_male : GLOB.lizard_names_female)
if(3)
if(2)
person_name = pick(GLOB.spider_last)
if(4)
if(3)
person_name = kepori_name()
if(5)
if(4)
person_name = vox_name()

return "[person_name] [pick(GLOB.station_suffixes)]"
Expand Down

0 comments on commit 1df14da

Please sign in to comment.