From 985fdcd22de04a53a290a21aeac516c7fbe05f0c Mon Sep 17 00:00:00 2001 From: LetterJay Date: Fri, 27 Oct 2017 23:56:37 -0500 Subject: [PATCH] Update clown_items.dm --- code/game/objects/items/clown_items.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index 8010aa2fa3..c9468cb79f 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -58,12 +58,8 @@ return //I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing. //So this is a workaround. This also makes more sense from an IC standpoint. ~Carn -<<<<<<< HEAD - if(user.client && (target in user.client.screen)) -======= target.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM) if(user.client && ((target in user.client.screen) && !user.is_holding(target))) ->>>>>>> 5dde2e3... Merge pull request #31864 from ninjanomnom/thermite to_chat(user, "You need to take that [target.name] off before cleaning it!") else if(istype(target, /obj/effect/decal/cleanable)) user.visible_message("[user] begins to scrub \the [target.name] out with [src].", "You begin to scrub \the [target.name] out with [src]...")