Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Fixes female teshari having broken worn icons for certain jumpsuits #2309

Merged
merged 1 commit into from
Mar 8, 2024
Merged

[MIRROR] Fixes female teshari having broken worn icons for certain jumpsuits #2309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/human_update_icons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions modular_nova/modules/customization/modules/mob/living/carbon/human/species.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions modular_nova/modules/teshari/code/_teshari.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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()
Expand Down
Loading