From 00159053f4dd62fa372849db9c17b4f6c17c8b8f Mon Sep 17 00:00:00 2001 From: goober3 <118859017+goober3@users.noreply.github.com> Date: Sat, 23 Mar 2024 21:54:20 +0000 Subject: [PATCH] removes mothperson namegen --- code/__HELPERS/mobs.dm | 7 -- code/__HELPERS/names.dm | 3 - .../carbon/human/species_types/mothmen.dm | 11 -- strings/names/moth_first.txt | 100 ------------------ strings/names/moth_last.txt | 57 ---------- 5 files changed, 178 deletions(-) delete mode 100644 strings/names/moth_first.txt delete mode 100644 strings/names/moth_last.txt diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index fdeadc13b61a..ee38951bfc83 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -171,13 +171,6 @@ if(!findname(.)) break -/proc/random_unique_moth_name(attempts_to_find_unique_name=10) - for(var/i in 1 to attempts_to_find_unique_name) - . = capitalize(pick(GLOB.moth_first)) + " " + capitalize(pick(GLOB.moth_last)) - - if(!findname(.)) - break - /proc/random_unique_squid_name(attempts_to_find_unique_name=10) for(var/i in 1 to attempts_to_find_unique_name) . = capitalize(squid_name()) diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index e34b48a357e2..afc5fecaa035 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -7,9 +7,6 @@ /proc/plasmaman_name() return "[pick(GLOB.plasmaman_names)] \Roman[rand(1,99)]" -/proc/moth_name() - return "[pick(GLOB.moth_first)] [pick(GLOB.moth_last)]" - /proc/squid_name() return "[pick(GLOB.squid_names)][pick("-", "", " ")][capitalize(pick(GLOB.squid_names) + pick(GLOB.squid_names))]" diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm index 02ddf79f6bc4..aed057083efb 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -36,17 +36,6 @@ var/mob/living/carbon/human/H = C handle_mutant_bodyparts(H) -/datum/species/moth/random_name(gender,unique,lastname) - if(unique) - return random_unique_moth_name() - - var/randname = moth_name() - - if(lastname) - randname += " [lastname]" - - return randname - /datum/species/handle_fire(mob/living/carbon/human/H, no_protection = FALSE) . = ..() if(.) //if the mob is immune to fire, don't burn wings off. diff --git a/strings/names/moth_first.txt b/strings/names/moth_first.txt deleted file mode 100644 index cfd8a8675f91..000000000000 --- a/strings/names/moth_first.txt +++ /dev/null @@ -1,100 +0,0 @@ -Acantharctia -Acco -Acherontia -Actias -Aemilia -Aethria -Antheraea -Aphomia -Argema -Ascalapha -Asota -Athrypsiastis -Attacus -Autochloris -Axylia -Bombyx -Callosamia -Callhistia -Capricornia -Catocala -Cheliosea -Chloroclystis -Cochylimorpha -Cryphia -Cryptophasa -Cucullia -Cydia -Diarsia -Diaphora -Dolichohedya -Dyspyralis -Eacles -Eclipsea -Electresia -Elysius -Enarmonia -Eriomastyx -Epiphyas -Eugnorisma -Eupithecia -Euplexia -Eurosia -Falcatula -Fangarctia -Fulcrifera -Glyphidoptera -Gracillina -Gravitarmata -Haemanota -Halysidota -Helicoverpa -Heliomata -Hyalophora -Hypomartyria -Icelita -Isanthrene -Isochorista -Izatha -Kodiosoma -Lacida -Leguminivora -Leucoptera -Lymantria -Macrobathra -Maruca -Mecodina -Megalonycta -Metacrisia -Mythimna -Naenia -Naenia -Neuroxena -Nodaria -Nymphicula -Obscurior -Ochropleura -Opodiphthera -Ostrinia -Pacificulla -Philomusaea -Phragmataecia -Plodia -Plutella -Rachiplusia -Sarobela -Selenarctia -Shiragasane -Sphingidae -Socioplana -Spodoptera -Syllomatia -Thaumetopoea -Timandra -Toxoproctis -Uranophora -Vestura -Vietteria -Xanthorhoe -Xestia -Zomaria diff --git a/strings/names/moth_last.txt b/strings/names/moth_last.txt deleted file mode 100644 index 4d6ec130c41e..000000000000 --- a/strings/names/moth_last.txt +++ /dev/null @@ -1,57 +0,0 @@ -Accurata -Adultera -Albipuncta -Albostriata -Albovenosa -Argentea -Bicolorata -Bifasciata -Cameroni -Chiangmai -Combinata -Convecta -Cuneilinea -Curvata -Dentata -Empyrea -Eucrossa -Ferrilinea -Fraterna -Goniosigma -Hamifera -Hirashimai -Hypophaea -Ignita -Impura -Insularis -Infrargyrea -Intermediata -Intolerabilis -Laevusta -Languida -Liebherri -Lineatipes -Lucida -Maxima -Mediana -Modesta -Monticola -Naumanni -Nepalina -Obscura -Osseogrisea -Pastellina -Phlebitis -Pyrausta -Radiata -Riparia -Rufulosa -Semicana -Separata -Siamensis -Simplex -Toumodi -Undicilia -Uruma -Vittata -Yuennana