Skip to content

Commit

Permalink
[SEMIMODULAR] Fixes multi-bodytype characters (digitigrade, species c…
Browse files Browse the repository at this point in the history
…ustom) only having digi apply when custom could be applied (#961)

* wdad'

* this isnt even tg code what am i doing bro
  • Loading branch information
nikothedude authored and StealsThePRs committed Feb 17, 2024
1 parent 01ddf28 commit 7d00b27
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions code/modules/mob/living/carbon/human/human_update_icons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -373,15 +373,15 @@ There are several things that need to be remembered:

if((bodytype & BODYTYPE_DIGITIGRADE) && (worn_item.supports_variations_flags & CLOTHING_DIGITIGRADE_VARIATION))
var/obj/item/bodypart/leg = src.get_bodypart(BODY_ZONE_L_LEG)
if(leg.limb_id == "digitigrade")//Snowflakey and bad. But it makes it look consistent.
if(leg.limb_id == "digitigrade" || leg.bodytype & BODYTYPE_DIGITIGRADE)//Snowflakey and bad. But it makes it look consistent.
icon_file = worn_item.worn_icon_digi || DIGITIGRADE_SHOES_FILE // NOVA EDIT CHANGE
mutant_override = TRUE // NOVA EDIT ADDITION
else if(bodytype & BODYTYPE_CUSTOM)
if(!mutant_override && bodytype & BODYTYPE_CUSTOM)
var/species_icon_file = dna.species.generate_custom_worn_icon(LOADOUT_ITEM_SHOES, shoes, src)
if(species_icon_file)
icon_file = species_icon_file
mutant_override = TRUE
else if(bodytype & BODYTYPE_HIDE_SHOES)
if(bodytype & BODYTYPE_HIDE_SHOES)
return // We just don't want shoes that float if we're not displaying legs (useful for taurs, for now)
// NOVA EDIT END

Expand Down Expand Up @@ -526,7 +526,7 @@ There are several things that need to be remembered:
icon_file = worn_item.worn_icon_digi || DIGITIGRADE_SUIT_FILE // NOVA EDIT CHANGE
mutant_override = TRUE

else if(bodytype & BODYTYPE_CUSTOM)
if(!mutant_override && bodytype & BODYTYPE_CUSTOM)
var/species_icon_file = dna.species.generate_custom_worn_icon(LOADOUT_ITEM_SUIT, wear_suit, src)
if(species_icon_file)
icon_file = species_icon_file
Expand Down

0 comments on commit 7d00b27

Please sign in to comment.