From 9f6e4df7eb7c1c83a9ef410a349aa8fcc4af94c3 Mon Sep 17 00:00:00 2001 From: Cameron Lennox Date: Sat, 31 Aug 2019 14:41:24 -0400 Subject: [PATCH] Fixed an issue where boot/shoe overlays would magically be cleaned by putting in a knife and stepping on blood. --- code/game/objects/effects/decals/Cleanable/humans.dm | 3 +-- code/modules/clothing/clothing.dm | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 3b1584ca194..8b8bba5a9dd 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -53,7 +53,7 @@ var/global/list/image/splatter_cache=list() blood_DNA |= B.blood_DNA.Copy() qdel(B) drytime = world.time + DRYING_TIME * (amount+1) - START_PROCESSING(SSobj, src) + START_PROCESSING(SSobj, src) /obj/effect/decal/cleanable/blood/process() if(world.time > drytime) @@ -93,7 +93,6 @@ var/global/list/image/splatter_cache=list() S.overlays += S.blood_overlay if(S.blood_overlay && S.blood_overlay.color != basecolor) S.blood_overlay.color = basecolor - S.overlays.Cut() S.overlays += S.blood_overlay S.blood_DNA |= blood_DNA.Copy() perp.update_inv_shoes() diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 3f7a6598084..4cc526df6ce 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -513,6 +513,7 @@ if(usr.put_in_hands(holding)) usr.visible_message("\The [usr] pulls a knife out of their boot!") holding = null + overlays -= image(icon, "[icon_state]_knife") else usr << "Your need an empty, unbroken hand to do that." holding.forceMove(src) @@ -557,7 +558,6 @@ update_icon() /obj/item/clothing/shoes/update_icon() - overlays.Cut() if(holding) overlays += image(icon, "[icon_state]_knife") if(ismob(usr))