cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 07:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

[SEMIMODULAR] Fixes multi-bodytype characters (digitigrade, species custom) only having digi apply when custom could be applied (#26507)

Browse Source 
* woo

* this isnt even tg code what am i doing bro
This commit is contained in:
nikothedude
2024-02-20 01:30:02 +01:00
committed by GitHub
parent c041c3fdc8
commit 5a5e94cf48
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_update_icons.dm
+4 -4
View File
@@ -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 // SKYRAT EDIT CHANGE
mutant_override = TRUE // SKYRAT 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)
// SKYRAT EDIT END
@@ -526,7 +526,7 @@ There are several things that need to be remembered:
icon_file = worn_item.worn_icon_digi || DIGITIGRADE_SUIT_FILE // SKYRAT 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