From 8c27a4e092fa60de9e067783f584f79bdc2c8a64 Mon Sep 17 00:00:00 2001 From: Whitellama Date: Fri, 1 Aug 2014 17:05:54 -0700 Subject: [PATCH] Wet rag no longer makes noise or hits when wiping down windows (nor does anything with the NOBLUDGEON flag) --- code/game/objects/structures/window.dm | 1 + code/modules/DetectiveWork/footprints_and_rag.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index eb57391286d..029e7c506c1 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -173,6 +173,7 @@ /obj/structure/window/attackby(obj/item/weapon/W as obj, mob/user as mob) if(!istype(W)) return//I really wish I did not need this + if(W.flags & NOBLUDGEON) return if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2) var/obj/item/weapon/grab/G = W diff --git a/code/modules/DetectiveWork/footprints_and_rag.dm b/code/modules/DetectiveWork/footprints_and_rag.dm index fafd98c46cd..899498029d3 100644 --- a/code/modules/DetectiveWork/footprints_and_rag.dm +++ b/code/modules/DetectiveWork/footprints_and_rag.dm @@ -24,6 +24,7 @@ possible_transfer_amounts = list(5) volume = 5 can_be_placed_into = null + flags = FPRINT | TABLEPASS | OPENCONTAINER | NOBLUDGEON /obj/item/weapon/reagent_containers/glass/rag/attack_self(mob/user as mob) return