From f377043351369619ef3f97570b5b10bb024a84cb Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 19 Mar 2023 05:59:51 +0100 Subject: [PATCH] [MIRROR] Fixes "melty humans" [MDB IGNORE] (#19969) * Fixes "melty humans" (#74076) ## About The Pull Request Fixes #73154 Includes human height in icon render key. The logic here is that if two mobs share the same icon render key they probably grab the same icon and thus a tall person would grab a "short person icon". ## Why It's Good For The Game Melty bad ## Changelog :cl: Melbert fix: Fixes rare human arm melting condition /:cl: * Fixes "melty humans" --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- code/modules/mob/living/carbon/carbon_update_icons.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm index 5a67f4b12ea..479b3f46bdc 100644 --- a/code/modules/mob/living/carbon/carbon_update_icons.dm +++ b/code/modules/mob/living/carbon/carbon_update_icons.dm @@ -560,7 +560,9 @@ if(!overlay.can_draw_on_bodypart(owner)) continue . += "-[jointext(overlay.generate_icon_cache(), "-")]" - + if(ishuman(owner)) + var/mob/living/carbon/human/human_owner = owner + . += "-[human_owner.get_mob_height()]" return . ///Generates a cache key specifically for husks @@ -570,6 +572,9 @@ . += "[husk_type]" . += "-husk" . += "-[body_zone]" + if(ishuman(owner)) + var/mob/living/carbon/human/human_owner = owner + . += "-[human_owner.get_mob_height()]" return . /obj/item/bodypart/head/generate_icon_key()