From e76af744d9632574e48d732e3c1fb51668ef9d67 Mon Sep 17 00:00:00 2001
From: Roxy <94389951+SapphoQueer@users.noreply.github.com>
Date: Sun, 22 Feb 2026 21:02:21 +0100
Subject: [PATCH] Fixes the weird taur bug that makes clothing be weird
 sometimes (#5273)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Sometimes, taur clothing didn't display the actually work sprite. This
was most prominent with things like gear harnesses and the like. This
should fix it.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game
Bug Bad Fix Good
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Proof Of Testing

this is with the gear harness on and it's not displaying what i wore
prior so??? i think it works?? I can't repro it anymore if anything.
<img width="201" height="170" alt="afbeelding"
src="https://github.com/user-attachments/assets/b8b4349e-1fac-4a20-8116-590851823ec9"
/>

<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->
<details>
<summary>Screenshots/Videos</summary>

</details>

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and its effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
fix: Taur legs no longer messes with your clothing's rendering.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
---
 code/modules/mob/living/carbon/human/human_update_icons.dm    | 4 +++-
 modular_skyrat/master_files/code/modules/clothing/clothing.dm | 4 ++--
 2 files changed, 5 insertions(+), 3 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 497f3a22174..0fe722c4735 100644
--- a/code/modules/mob/living/carbon/human/human_update_icons.dm
+++ b/code/modules/mob/living/carbon/human/human_update_icons.dm
@@ -1123,12 +1123,14 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E
 	if (mutant_styles & STYLE_TAUR_ALL)
 		if (!using_taur_variant)
 			var/cropping_state = DEFAULT_TAUR_CLIPPING_MASK
+			var/taur_cache_key = "[t_state]-[file2use]-[female_uniform]-[is_digi]-[type]-[greyscale_colors]-[cropping_state]"
 			if (ishuman(loc))
 				var/mob/living/carbon/human/humie = loc
 				var/obj/item/organ/taur_body/taur = humie.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR)
 				cropping_state = (taur ? taur.clothing_cropping_state : DEFAULT_TAUR_CLIPPING_MASK)
+				taur_cache_key = "[t_state]-[file2use]-[female_uniform]-[is_digi]-[type]-[greyscale_colors]-[cropping_state]"
 
-			draw_target = wear_taur_version(draw_target.icon_state, draw_target.icon, layer2use, female_uniform, greyscale_colors, cropping_state)
+			draw_target = wear_taur_version(draw_target.icon_state, draw_target.icon, layer2use, female_uniform, greyscale_colors, cropping_state, taur_cache_key)
 		else
 			draw_target.pixel_w -= 16 // it doesnt look right otherwise
 	// SKYRAT EDIT ADDITION END
diff --git a/modular_skyrat/master_files/code/modules/clothing/clothing.dm b/modular_skyrat/master_files/code/modules/clothing/clothing.dm
index 3f37f1f8acb..64f42f44463 100644
--- a/modular_skyrat/master_files/code/modules/clothing/clothing.dm
+++ b/modular_skyrat/master_files/code/modules/clothing/clothing.dm
@@ -53,10 +53,10 @@ GLOBAL_LIST_EMPTY(taur_clothing_icons)
  *
  * Returns a taur-compatible mutable_appearance!
  */
-/proc/wear_taur_version(icon_state, icon/icon_to_process, layer, female_type, greyscale_colors, cropping_state)
+/proc/wear_taur_version(icon_state, icon/icon_to_process, layer, female_type, greyscale_colors, cropping_state, cache_key = null)
 	RETURN_TYPE(/mutable_appearance)
 
-	var/index = "[icon_state]-[greyscale_colors]-[female_type]-[cropping_state]"
+	var/index = cache_key || "[icon_state]-[greyscale_colors]-[female_type]-[cropping_state]"
 	var/icon/taur_clothing_icon = GLOB.taur_clothing_icons[index]
 	if(!taur_clothing_icon) 	//Create standing/laying icons if they don't exist
 		generate_taur_clothing(index, icon_to_process, icon_state, cropping_state)