From 65a73bcefa6374507418e497246df555cf5c3c49 Mon Sep 17 00:00:00 2001 From: Armhulen Date: Tue, 3 Oct 2017 16:40:53 -0700 Subject: [PATCH 1/2] Gives nightmares a random shadowling name (#31188) * fuck you ruined my !ONE COMMIT PR! * !ONE COMMIT PR! --- code/_globalvars/lists/names.dm | 1 + .../living/carbon/human/species_types/shadowpeople.dm | 8 ++++---- strings/names/nightmare.txt | 10 ++++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 strings/names/nightmare.txt diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm index 522ff84ff0..d855c7f141 100644 --- a/code/_globalvars/lists/names.dm +++ b/code/_globalvars/lists/names.dm @@ -15,6 +15,7 @@ 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(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")) GLOBAL_LIST_INIT(verbs, world.file2list("strings/names/verbs.txt")) diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm index 5c635fb870..de61ef7220 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -47,11 +47,11 @@ to_chat(C, "[info_text]") - C.real_name = "Nightmare" - C.name = "Nightmare" + C.real_name = "[pick(GLOB.nightmare_names)]" + C.name = C.real_name if(C.mind) - C.mind.name = "Nightmare" - C.dna.real_name = "Nightmare" + C.mind.name = C.real_name + C.dna.real_name = C.real_name /datum/species/shadow/nightmare/on_species_loss(mob/living/carbon/C) . = ..() diff --git a/strings/names/nightmare.txt b/strings/names/nightmare.txt new file mode 100644 index 0000000000..b8798b734d --- /dev/null +++ b/strings/names/nightmare.txt @@ -0,0 +1,10 @@ +U'ruan +Y`shej +Nex +Hel-uae +Noaey'gief +Mii`mahza +Amerziox +Gyrg-mylin +Kanet'pruunance +Vigistaezian \ No newline at end of file