From e3073bbb5d39eae6922e2490e72a6837a60fe98c Mon Sep 17 00:00:00 2001 From: Cameron Lennox Date: Tue, 3 Sep 2019 01:34:54 -0400 Subject: [PATCH] Fixes the washing bug with boots --- code/game/atoms.dm | 3 ++- code/game/objects/items.dm | 7 +++---- code/modules/clothing/clothing.dm | 9 +++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 6929943de2..631ed4df19 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -388,7 +388,8 @@ blood_DNA = list() was_bloodied = 1 - blood_color = "#A10808" + if(!blood_color) + blood_color = "#A10808" if(istype(M)) if (!istype(M.dna, /datum/dna)) M.dna = new /datum/dna(null) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 4e39439c12..fdfaa22296 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -581,10 +581,9 @@ var/list/global/slot_flags_enumeration = list( if( !blood_overlay ) generate_blood_overlay() - //apply the blood-splatter overlay if it isn't already in there - if(!blood_DNA.len) - blood_overlay.color = blood_color - overlays += blood_overlay + //Make the blood_overlay have the proper color then apply it. + blood_overlay.color = blood_color + overlays += blood_overlay //if this blood isn't already in the list, add it if(istype(M)) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 4cc526df6c..7462dc1e6d 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -558,8 +558,17 @@ update_icon() /obj/item/clothing/shoes/update_icon() + overlays.Cut() //This removes all the overlays on the sprite and then goes down a checklist adding them as required. + if(blood_DNA) + add_blood() if(holding) overlays += image(icon, "[icon_state]_knife") + if(contaminated) + overlays += contamination_overlay + //VOREStation Edit Start + if(gurgled) + decontaminate() + gurgle_contaminate() if(ismob(usr)) var/mob/M = usr M.update_inv_shoes()