From bca6f6cd510d8cba5d2d246ceda36e2d9311fc81 Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Fri, 19 Apr 2024 10:24:49 +0300 Subject: [PATCH] [SEMI-MODULAR] Fixes taur clothing rendering and allows taur-specific sprites to be rendered (#1982) (#2963) * gfrhj * lets try this * Update code/modules/mob/living/carbon/human/human_update_icons.dm * Update code/modules/mob/living/carbon/human/human_update_icons.dm --------- Co-authored-by: nikothedude <59709059+nikothedude@users.noreply.github.com> Co-authored-by: SomeRandomOwl <2568378+SomeRandomOwl@users.noreply.github.com> Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> --- .../living/carbon/human/human_update_icons.dm | 23 ++++++++++++++++--- .../lewd_clothing/latex_straight_jacket.dm | 4 ++-- 2 files changed, 22 insertions(+), 5 deletions(-) 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 5f1f5888a74..1290418bcf1 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -819,6 +819,20 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // NOVA EDI mutant_styles = NONE, // NOVA EDIT ADD - Further outfit modification for outfits (added `mutant_styles` argument) ) + // NOVA EDIT ADDITION START - Taur-friendly uniforms and suits + var/using_taur_variant = FALSE + if (isnull(override_file)) + if (mutant_styles & STYLE_TAUR_ALL) + if ((mutant_styles & STYLE_TAUR_SNAKE) && worn_icon_taur_snake) + override_file = worn_icon_taur_snake + using_taur_variant = TRUE + else if ((mutant_styles & STYLE_TAUR_PAW) && worn_icon_taur_paw) + override_file = worn_icon_taur_paw + using_taur_variant = TRUE + else if ((mutant_styles & STYLE_TAUR_HOOF) && worn_icon_taur_hoof) + override_file = worn_icon_taur_hoof + using_taur_variant = TRUE + // NOVA EDIT END //Find a valid icon_state from variables+arguments var/t_state if(override_state) @@ -841,9 +855,12 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // NOVA EDI if(!standing) standing = mutable_appearance(file2use, t_state, -layer2use) // NOVA EDIT ADDITION START - Taur-friendly uniforms and suits - if(mutant_styles & STYLE_TAUR_ALL) - standing = wear_taur_version(standing.icon_state, standing.icon, layer2use, female_uniform, greyscale_colors) - // NOVA EDIT END + if (mutant_styles & STYLE_TAUR_ALL) + if (!using_taur_variant) + standing = wear_taur_version(standing.icon_state, standing.icon, layer2use, female_uniform, greyscale_colors) + else + standing.pixel_x -= 16 // it doesnt look right otherwise + // NOVA EDIT ADDITION END //Get the overlays for this item when it's being worn //eg: ammo counters, primed grenade flashes, etc. diff --git a/modular_nova/modules/modular_items/lewd_items/code/lewd_clothing/latex_straight_jacket.dm b/modular_nova/modules/modular_items/lewd_items/code/lewd_clothing/latex_straight_jacket.dm index 0533b111c78..f34a8233b09 100644 --- a/modular_nova/modules/modular_items/lewd_items/code/lewd_clothing/latex_straight_jacket.dm +++ b/modular_nova/modules/modular_items/lewd_items/code/lewd_clothing/latex_straight_jacket.dm @@ -12,7 +12,7 @@ lefthand_file = 'modular_nova/modules/modular_items/lewd_items/icons/mob/lewd_inhands/lewd_inhand_left.dmi' righthand_file = 'modular_nova/modules/modular_items/lewd_items/icons/mob/lewd_inhands/lewd_inhand_right.dmi' body_parts_covered = CHEST | GROIN | LEGS | ARMS | HANDS - flags_inv = HIDEGLOVES | HIDESHOES | HIDEJUMPSUIT + flags_inv = HIDEGLOVES | HIDESHOES | HIDEJUMPSUIT | HIDETAIL clothing_flags = DANGEROUS_OBJECT equip_delay_self = NONE strip_delay = 12 SECONDS @@ -42,7 +42,7 @@ lefthand_file = 'modular_nova/modules/modular_items/lewd_items/icons/mob/lewd_inhands/lewd_inhand_left.dmi' righthand_file = 'modular_nova/modules/modular_items/lewd_items/icons/mob/lewd_inhands/lewd_inhand_right.dmi' body_parts_covered = CHEST | GROIN | LEGS | ARMS | HANDS - flags_inv = HIDEGLOVES | HIDESHOES | HIDEJUMPSUIT + flags_inv = HIDEGLOVES | HIDESHOES | HIDEJUMPSUIT | HIDETAIL clothing_flags = DANGEROUS_OBJECT equip_delay_self = NONE strip_delay = 12 SECONDS