From 1df14daf98afff6f651f7b9244c56fdb6ae52b23 Mon Sep 17 00:00:00 2001 From: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com> Date: Thu, 18 Apr 2024 15:36:17 -0500 Subject: [PATCH] stops master from failing lol (#2918) ## About The Pull Request empty picklist was causing ALL of my prs to fail #2861 forgot to remove mothlist outpost random name ## Why It's Good For The Game ## Changelog :cl: fix: epty list /:cl: --- code/_globalvars/lists/names.dm | 2 -- code/modules/overmap/objects/outpost/outpost.dm | 10 ++++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm index ff452072fbec..ee9bc5bb429a 100644 --- a/code/_globalvars/lists/names.dm +++ b/code/_globalvars/lists/names.dm @@ -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")) diff --git a/code/modules/overmap/objects/outpost/outpost.dm b/code/modules/overmap/objects/outpost/outpost.dm index 0e4c385651ee..01a100022cbf 100644 --- a/code/modules/overmap/objects/outpost/outpost.dm +++ b/code/modules/overmap/objects/outpost/outpost.dm @@ -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)]"