From abea80f1e9edfa89266fe35951ee43248966f9b7 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Tue, 30 Jun 2020 06:58:17 -0300 Subject: [PATCH] Blood cleaning fixes (#9244) * Blood cleaning fixes * adds changelog --- code/game/objects/items.dm | 5 +++++ code/modules/mob/living/carbon/human/human.dm | 3 +++ html/changelogs/alberyk-bloodfix.yml | 7 +++++++ 3 files changed, 15 insertions(+) create mode 100644 html/changelogs/alberyk-bloodfix.yml diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 61e576bb186..1b90304cdbc 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -636,6 +636,11 @@ var/list/global/slot_flags_enumeration = list( var/obj/item/clothing/gloves/G = src G.transfer_blood = 0 + if(blood_color) + blood_color = null + + update_icon() + /obj/item/reveal_blood() if(was_bloodied && !fluorescent) fluorescent = 1 diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index db30f1ad7cf..e4203a3c6dd 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1336,6 +1336,9 @@ footprint_color = null feet_blood_DNA = null update_inv_shoes(1) + + if(blood_color) + blood_color = null return 1 /mob/living/carbon/human/get_visible_implants(var/class = 0) diff --git a/html/changelogs/alberyk-bloodfix.yml b/html/changelogs/alberyk-bloodfix.yml new file mode 100644 index 00000000000..4a517994311 --- /dev/null +++ b/html/changelogs/alberyk-bloodfix.yml @@ -0,0 +1,7 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Fixed blood overlays not going away after washing clothing." + - bugfix: "Fixed bloody hand texts not going away after washing."