Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] [SEMI-MODULAR] Fixes taur clothing rendering and allows taur-specific sprites to be rendered #2963

Merged
merged 1 commit into from
Apr 19, 2024
Merged

[MIRROR] [SEMI-MODULAR] Fixes taur clothing rendering and allows taur-specific sprites to be rendered #2963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions code/modules/mob/living/carbon/human/human_update_icons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions modular_nova/modules/modular_items/lewd_items/code/lewd_clothing/latex_straight_jacket.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading