From 8c3140040f6ccfc7fca3be92e2a32978e36f85a9 Mon Sep 17 00:00:00 2001 From: Bloop <13398309+vinylspiders@users.noreply.github.com> Date: Thu, 7 Mar 2024 16:51:15 -0500 Subject: [PATCH] Fixes female teshari having broken worn icons for certain jumpsuits (#1326) * Fixes female teshari having broken worn icons for certain jumpsuits * Changes this to not use sexes * Changes this to not use sexes * Update _teshari.dm --- code/modules/mob/living/carbon/human/human_update_icons.dm | 2 +- .../customization/modules/mob/living/carbon/human/species.dm | 2 ++ modular_nova/modules/teshari/code/_teshari.dm | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index 802146d8435..5f1f5888a74 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -115,7 +115,7 @@ There are several things that need to be remembered: icon_file = dna.species.generate_custom_worn_icon(LOADOUT_ITEM_UNIFORM, w_uniform, src) // Might have to refactor how this works eventually, maybe. // NOVA EDIT END //Female sprites have lower priority than digitigrade sprites - if(dna.species.sexes && (bodyshape & BODYSHAPE_HUMANOID) && physique == FEMALE && !(female_sprite_flags & NO_FEMALE_UNIFORM)) // NOVA EDIT CHANGE - ORIGINAL: else if(dna.species.sexes && (bodyshape & BODYSHAPE_HUMANOID) && physique == FEMALE && !(uniform.female_sprite_flags & NO_FEMALE_UNIFORM)) //Agggggggghhhhh + if(!dna.species.no_gender_shaping && dna.species.sexes && (bodyshape & BODYSHAPE_HUMANOID) && physique == FEMALE && !(female_sprite_flags & NO_FEMALE_UNIFORM)) // NOVA EDIT CHANGE - ORIGINAL: else if(dna.species.sexes && (bodyshape & BODYSHAPE_HUMANOID) && physique == FEMALE && !(uniform.female_sprite_flags & NO_FEMALE_UNIFORM)) //Agggggggghhhhh woman = TRUE // NOVA EDIT ADDITION START - Digi female gender shaping if(digi) diff --git a/modular_nova/modules/customization/modules/mob/living/carbon/human/species.dm b/modular_nova/modules/customization/modules/mob/living/carbon/human/species.dm index c941415cf65..44f5dc23227 100644 --- a/modular_nova/modules/customization/modules/mob/living/carbon/human/species.dm +++ b/modular_nova/modules/customization/modules/mob/living/carbon/human/species.dm @@ -5,6 +5,8 @@ GLOBAL_LIST_EMPTY(customizable_races) digitigrade_customization = DIGITIGRADE_OPTIONAL // Doing this so that the legs preference actually works for everyone. ///Self explanatory var/can_have_genitals = TRUE + /// Whether or not the gender shaping is disabled for this species + var/no_gender_shaping ///A list of actual body markings on the owner of the species. Associative lists with keys named by limbs defines, pointing to a list with names and colors for the marking to be rendered. This is also stored in the DNA var/list/list/body_markings = list() ///Override of the eyes icon file, used for Vox and maybe more in the future - The future is now, with Teshari using it too diff --git a/modular_nova/modules/teshari/code/_teshari.dm b/modular_nova/modules/teshari/code/_teshari.dm index 83dcc7b11be..27a8625b748 100644 --- a/modular_nova/modules/teshari/code/_teshari.dm +++ b/modular_nova/modules/teshari/code/_teshari.dm @@ -5,6 +5,7 @@ /datum/species/teshari name = "Teshari" id = SPECIES_TESHARI + no_gender_shaping = TRUE // Female uniform shaping breaks Teshari worn sprites, so this is disabled. This will not affect anything else in regards to gender however. eyes_icon = 'modular_nova/modules/organs/icons/teshari_eyes.dmi' inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, @@ -55,12 +56,10 @@ "legs" = list("Normal Legs", FALSE), ) - /obj/item/organ/internal/tongue/teshari liked_foodtypes = MEAT disliked_foodtypes = GROSS | GRAIN - /datum/species/teshari/random_name(gender, unique, lastname) if(unique) return random_unique_teshari_name()