From adab2c06e018bfe3dc7a48b7e900a3e5d76e385b Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Fri, 8 Jul 2016 02:49:15 +0100 Subject: [PATCH 1/3] Fixes Comfy Chair Deconstruction - Deconstructing Comfy Chairs now yields 2 metal sheets --- .../objects/structures/stool_bed_chair_nest/chairs.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 621f3a9d78e..f3fe67f9874 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -140,6 +140,15 @@ anchored = 0 movable = 1 +/obj/structure/stool/bed/chair/comfy/attackby(obj/item/weapon/W as obj, mob/user as mob, params) + if(istype(W, /obj/item/weapon/wrench)) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) + new /obj/item/stack/sheet/metal(get_turf(src)) + new /obj/item/stack/sheet/metal(get_turf(src)) + qdel(src) + else + ..() + /obj/structure/stool/bed/chair/office/Bump(atom/A) ..() if(!buckled_mob) return From 0b94dc3a542cd92d9dadef47435a3800751ebfda Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Fri, 8 Jul 2016 03:03:37 +0100 Subject: [PATCH 2/3] Fied Tiger's recommendations - Removed needles src. Again. - Replaced istype(W, /obj/item/weapon/wrench) with iswrench(W) --- code/game/objects/structures/stool_bed_chair_nest/chairs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index f3fe67f9874..b9aa8d21fc2 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -141,8 +141,8 @@ movable = 1 /obj/structure/stool/bed/chair/comfy/attackby(obj/item/weapon/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/weapon/wrench)) - playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) + if(iswrench(W)) + playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) new /obj/item/stack/sheet/metal(get_turf(src)) new /obj/item/stack/sheet/metal(get_turf(src)) qdel(src) From e0118efead2cc72ac703509aaa5faf1bd506b2f4 Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Fri, 8 Jul 2016 12:03:38 +0100 Subject: [PATCH 3/3] Fixed Fox's suggestion - Removed needless code --- code/game/objects/structures/stool_bed_chair_nest/chairs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index b9aa8d21fc2..c62df2f6cca 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -140,7 +140,7 @@ anchored = 0 movable = 1 -/obj/structure/stool/bed/chair/comfy/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/stool/bed/chair/comfy/attackby(obj/item/weapon/W, mob/user, params) if(iswrench(W)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) new /obj/item/stack/sheet/metal(get_turf(src))