Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit f0c48c8

Browse files
guh (#22784)
1 parent 5ea0012 commit f0c48c8

File tree

6 files changed

+9
-7
lines changed

6 files changed

+9
-7
lines changed

code/modules/clothing/clothing.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,9 @@ SEE_PIXELS// if an object is located on an unlit area, but some of its pixels ar
337337
BLIND // can't see anything
338338
*/
339339

340-
/proc/generate_female_clothing(index, t_color, icon, type) //In a shellnut, blends the uniform sprite with a pre-made sprite in uniform.dmi that's mostly white pixels with a few empty ones to trim off the pixels in the empty spots
340+
/proc/generate_female_clothing(index, t_color, icon, type = FEMALE_UNIFORM_FULL, flat = FALSE) //In a shellnut, blends the uniform sprite with a pre-made sprite in uniform.dmi that's mostly white pixels with a few empty ones to trim off the pixels in the empty spots
341341
var/icon/female_clothing_icon = icon("icon" = icon, "icon_state" = t_color) // and make the uniform the "female" shape. female_s is either the top-only one (for jumpskirts and the like) or the full one (for jumpsuits)
342-
var/icon/female_s = icon("icon" = 'icons/effects/clothing.dmi', "icon_state" = "[(type == FEMALE_UNIFORM_FULL) ? "female_full" : "female_top"]")
342+
var/icon/female_s = icon("icon" = 'icons/effects/clothing.dmi', "icon_state" = "[(type == FEMALE_UNIFORM_FULL) ? "female_full" : "female_top"]_[flat]")
343343
female_clothing_icon.Blend(female_s, ICON_MULTIPLY)
344344
female_clothing_icon = fcopy_rsc(female_clothing_icon)
345345
GLOB.female_clothing_icons[index] = female_clothing_icon //Then it saves the icon in a global list so it doesn't have to make it again

code/modules/mob/living/carbon/human/_species.dm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,8 @@ GLOBAL_LIST_EMPTY(features_by_species)
845845
if(underwear)
846846
if(HAS_TRAIT(H, TRAIT_SKINNY))
847847
standing += wear_skinny_version(underwear.icon_state, underwear.icon, BODY_LAYER) //Neat, this works
848+
else if((H.gender == FEMALE && (FEMALE in possible_genders)) && H.dna.species.is_dimorphic)
849+
standing += wear_female_version(underwear.icon_state, underwear.icon, BODY_LAYER, flat = !!(H.mob_biotypes & MOB_REPTILE)) // lizards
848850
else
849851
var/mutable_appearance/underwear_overlay = mutable_appearance(underwear.icon, underwear.icon_state, -BODY_LAYER)
850852
if(H.dna.species.id in underwear.sprite_sheets)
@@ -858,7 +860,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
858860
if(HAS_TRAIT(H, TRAIT_SKINNY)) //Check for skinny first
859861
standing += wear_skinny_version(undershirt.icon_state, undershirt.icon, BODY_LAYER)
860862
else if((H.gender == FEMALE && (FEMALE in possible_genders)) && H.dna.species.is_dimorphic)
861-
standing += wear_female_version(undershirt.icon_state, undershirt.icon, BODY_LAYER)
863+
standing += wear_female_version(undershirt.icon_state, undershirt.icon, BODY_LAYER, flat = !!(H.mob_biotypes & MOB_REPTILE)) // lizards
862864
else
863865
var/mutable_appearance/undershirt_overlay = mutable_appearance(undershirt.icon, undershirt.icon_state, -BODY_LAYER)
864866
if(H.dna.species.id in undershirt.sprite_sheets)

code/modules/mob/living/carbon/human/update_icons.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -614,11 +614,11 @@ There are several things that need to be remembered:
614614
overlays_standing[BACK_LAYER] = back_overlay
615615
apply_overlay(BACK_LAYER)
616616

617-
/proc/wear_female_version(t_color, icon, layer, type, greyscale_colors)
618-
var/index = "[t_color]-[greyscale_colors]"
617+
/proc/wear_female_version(t_color, icon, layer, type, greyscale_colors, flat)
618+
var/index = "[t_color]-[greyscale_colors]-[flat]"
619619
var/icon/female_clothing_icon = GLOB.female_clothing_icons[index]
620620
if(!female_clothing_icon) //Create standing/laying icons if they don't exist
621-
generate_female_clothing(index, t_color, icon, type)
621+
generate_female_clothing(index, t_color, icon, type, flat)
622622
return mutable_appearance(GLOB.female_clothing_icons[index], layer = -layer) //Grab the standing/laying icons once/if they do exist
623623

624624
/proc/wear_skinny_version(t_color, icon, layer, type, greyscale_colors)
@@ -726,7 +726,7 @@ generate/load female uniform sprites matching all previously decided variables
726726
if(HAS_TRAIT(H, TRAIT_SKINNY) && (H.underwear == "Nude"))
727727
standing = wear_skinny_version(t_state, file2use, layer2use, femaleuniform, greyscale_colors)
728728
else
729-
standing = wear_female_version(t_state, file2use, layer2use, femaleuniform, greyscale_colors)
729+
standing = wear_female_version(t_state, file2use, layer2use, femaleuniform, greyscale_colors, !!(H.mob_biotypes & MOB_REPTILE)) // lizards
730730
if(!standing)
731731
standing = mutable_appearance(file2use, t_state, -layer2use)
732732

icons/effects/clothing.dmi

129 Bytes
Binary file not shown.
-27 Bytes
Binary file not shown.

icons/mob/mutant_bodyparts.dmi

93 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)