diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index b0f77e3b4965..4587c8fc7362 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -495,7 +495,15 @@ BLIND // can't see anything /proc/generate_female_clothing(index, t_color, icon, type, flat = FALSE) //MONKESTATION EDIT - Dimorphic lizards var/icon/female_clothing_icon = icon("icon"=icon, "icon_state"=t_color) - var/female_icon_state = "female[(type == FEMALE_UNIFORM_FULL) ? "_full" : ((!type || type & FEMALE_UNIFORM_TOP_ONLY) ? "_top" : "")][((type & FEMALE_UNIFORM_NO_BREASTS) || flat) ? "_no_breasts" : ""]" //MONKESTATION EDIT - Dimorphic lizards + var/female_icon_state = "female" + + if(type & FEMALE_UNIFORM_FULL) //MONKESTATION EDIT - Dimorphic lizards + female_icon_state += "_full" + else if((!type || (type & FEMALE_UNIFORM_TOP_ONLY))) + female_icon_state += "_top" + if(type & FEMALE_UNIFORM_NO_BREASTS || flat) + female_icon_state += "_no_breasts" + var/icon/female_cropping_mask = icon("icon" = 'icons/mob/clothing/under/masking_helpers.dmi', "icon_state" = female_icon_state) female_clothing_icon.Blend(female_cropping_mask, ICON_MULTIPLY) female_clothing_icon = fcopy_rsc(female_clothing_icon) 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 ebe4e661a6e5..a42c315ede90 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -108,8 +108,8 @@ There are several things that need to be remembered: var/species_icon_file = dna.species.generate_custom_worn_icon(LOADOUT_ITEM_UNIFORM, uniform) if(species_icon_file) icon_file = species_icon_file - //Female sprites have lower priority than digitigrade sprites - else if(dna.species.visual_gender & dna.species.sexes && (dna.species.bodytype & BODYTYPE_HUMANOID) && physique == FEMALE && !(uniform.female_sprite_flags & NO_FEMALE_UNIFORM)) //Agggggggghhhhh + //Female sprites have lower priority than digitigrade sprites - MONKESTATION EDIT - ALL WOMEN DESERVE REPRESENTATION + if(dna.species.visual_gender & dna.species.sexes && (dna.species.bodytype & BODYTYPE_HUMANOID) && physique == FEMALE && !(uniform.female_sprite_flags & NO_FEMALE_UNIFORM)) //Agggggggghhhhh woman = TRUE if(!icon_exists(icon_file, RESOLVE_ICON_STATE(uniform)))