From bb86c015eb7c4e4f7d5da3b9b5e062233b570d7e Mon Sep 17 00:00:00 2001 From: Timberpoes Date: Sat, 30 Oct 2021 02:53:07 +0100 Subject: [PATCH] Nerfs felipires and dullanids. (#62432) Vampires and Dullahans have tail and ear mutant_parts defined but set to "None". Because they're defined at all, the new prefs menu gives preference entries for them. The /mob/living/carbon/human/dummy/consistent used to set these up has Cat ears and Cat tails defined in its DNA features. Vampires and Dullahans inherit this dummy setting on the prefs menu, and thus can select cat ears and cat tails on the prefs menu. Fixes /mob/living/carbon/human/dummy/consistent to not define cat ears and tails. Fixes the Vampire and Dullahan species to define mutant bodyparts the same as humans, removing their ear and tail entries. --- code/modules/mob/living/carbon/human/dummy.dm | 4 ++-- .../modules/mob/living/carbon/human/species_types/dullahan.dm | 2 +- code/modules/mob/living/carbon/human/species_types/vampire.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm index 8fa2bd93e9c..153712eba9a 100644 --- a/code/modules/mob/living/carbon/human/dummy.dm +++ b/code/modules/mob/living/carbon/human/dummy.dm @@ -36,7 +36,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) create_dna(src) dna.initialize_dna(skip_index = TRUE) dna.features["body_markings"] = "None" - dna.features["ears"] = "Cat" + dna.features["ears"] = "None" dna.features["ethcolor"] = COLOR_WHITE dna.features["frills"] = "None" dna.features["horns"] = "None" @@ -46,7 +46,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) dna.features["moth_wings"] = "Plain" dna.features["snout"] = "Round" dna.features["spines"] = "None" - dna.features["tail_human"] = "Cat" + dna.features["tail_human"] = "None" dna.features["tail_lizard"] = "Smooth" //Inefficient pooling/caching way. diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index 52db68a3da9..039b9c91cba 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -10,7 +10,7 @@ TRAIT_NOBREATH, ) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID - mutant_bodyparts = list("tail_human" = "None", "ears" = "None", "wings" = "None") + mutant_bodyparts = list("wings" = "None") use_skintones = TRUE mutantbrain = /obj/item/organ/brain/dullahan mutanteyes = /obj/item/organ/eyes/dullahan diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index 64156f9d5c1..e5e779c5376 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -10,7 +10,7 @@ TRAIT_NOBREATH, ) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID - mutant_bodyparts = list("tail_human" = "None", "ears" = "None", "wings" = "None") + mutant_bodyparts = list("wings" = "None") changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | ERT_SPAWN exotic_bloodtype = "U" use_skintones = TRUE