From 9397bf71cac5ac494c1afcd6e0144b0231aa8cfd Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sun, 22 Dec 2024 01:22:18 +0100 Subject: [PATCH] beanbag chairs deconstructible with wirecutters, all other chairs deconstructible with wrench --- code/game/objects/structures/beds_chairs/chair.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 40613aa96b..8debdaa03f 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -77,7 +77,12 @@ qdel(src) /obj/structure/chair/attackby(obj/item/W, mob/user, params) - if(W.tool_behaviour == TOOL_WRENCH && !(flags_1 & NODECONSTRUCT_1)) + // GS13 EDIT - replaced wrench check with a check based on material and tool - chairs made from any material other + // than cloth will function the same as before, but chairs made from cloth will be destructible using a wirecutter + var/wrench_deconstruct = W.tool_behaviour == TOOL_WRENCH && buildstacktype != /obj/item/stack/sheet/cloth + var/wirecutter_deconstruct = W.tool_behaviour == TOOL_WIRECUTTER && buildstacktype == /obj/item/stack/sheet/cloth + if((wrench_deconstruct || wirecutter_deconstruct) && !(flags_1 & NODECONSTRUCT_1)) + // GS13 END EDIT W.play_tool_sound(src) deconstruct() else if(istype(W, /obj/item/assembly/shock_kit))