From d14df868cdc376303ad857c02fa7d33afcaeadc0 Mon Sep 17 00:00:00 2001 From: pigeons Date: Wed, 11 Apr 2018 08:30:35 -0400 Subject: [PATCH] Fixes overlay update for washing bloody hands (#37094) --- code/modules/mob/living/carbon/human/human.dm | 1 - code/modules/mob/living/carbon/human/update_icons.dm | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 73b9a01780..6c63c32904 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -709,7 +709,6 @@ if(bloody_hands) bloody_hands = 0 update_inv_gloves() - update_icons() //apply the now updated overlays to the mob /mob/living/carbon/human/wash_cream() if(creamed) //clean both to prevent a rare bug diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index b0d01d05c1..75a2e5625d 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -175,8 +175,7 @@ There are several things that need to be remembered: var/obj/screen/inventory/inv = hud_used.inv_slots[slot_gloves] inv.update_icon() - GET_COMPONENT(FR, /datum/component/forensics) - if(!gloves && FR && length(FR.blood_DNA)) + if(!gloves && bloody_hands) var/mutable_appearance/bloody_overlay = mutable_appearance('icons/effects/blood.dmi', "bloodyhands", -GLOVES_LAYER) if(get_num_arms() < 2) if(has_left_hand()) @@ -680,4 +679,4 @@ generate/load female uniform sprites matching all previously decided variables dna.species.handle_hair(src) update_inv_head() - update_inv_wear_mask() \ No newline at end of file + update_inv_wear_mask()