From 5f6f54429d8a5cc9e34a4c4e547d4269ee94972d Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Tue, 11 Aug 2020 05:27:27 +0100
Subject: [PATCH] Fixed wood drop oversight

---
 code/game/objects/structures/dresser.dm       | 10 ++++++----
 code/game/objects/structures/loom.dm          | 12 ++++++++----
 code/modules/hydroponics/beekeeping/beebox.dm | 10 ++++++----
 code/modules/hydroponics/fermenting_barrel.dm | 10 ++++++++--
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm
index d4d0e92e546..0dafbb53ee3 100644
--- a/code/game/objects/structures/dresser.dm
+++ b/code/game/objects/structures/dresser.dm
@@ -61,8 +61,7 @@
 	TOOL_ATTEMPT_DISMANTLE_MESSAGE
 	if(I.use_tool(src, user, 50, volume = I.tool_volume))
 		TOOL_DISMANTLE_SUCCESS_MESSAGE
-		new /obj/item/stack/sheet/wood(loc, 30)
-		qdel(src)
+		deconstruct(disassembled = TRUE)
 
 /obj/structure/dresser/wrench_act(mob/user, obj/item/I)
 	. = TRUE
@@ -78,6 +77,9 @@
 		WRENCH_ANCHOR_MESSAGE
 		anchored = TRUE
 
-/obj/structure/dresser/deconstruct(disassembled = TRUE)
-	new /obj/item/stack/sheet/wood(drop_location(), 30)
+obj/structure/dresser/deconstruct(disassembled = FALSE)
+	var/mat_drop = 15
+	if(disassembled)
+		mat_drop = 30
+	new /obj/item/stack/sheet/wood(drop_location(), mat_drop)
 	qdel(src)
diff --git a/code/game/objects/structures/loom.dm b/code/game/objects/structures/loom.dm
index 6fe1cf9f035..a1764310eec 100644
--- a/code/game/objects/structures/loom.dm
+++ b/code/game/objects/structures/loom.dm
@@ -11,8 +11,6 @@
 	anchored = TRUE
 
 /obj/structure/loom/attackby(obj/item/I, mob/user)
-	if(default_unfasten_wrench(user, I, 5))
-		return
 	if(weave(I, user))
 		return
 	return ..()
@@ -24,8 +22,7 @@
 	TOOL_ATTEMPT_DISMANTLE_MESSAGE
 	if(I.use_tool(src, user, 50, volume = I.tool_volume))
 		TOOL_DISMANTLE_SUCCESS_MESSAGE
-		new /obj/item/stack/sheet/wood(loc, 10)
-		qdel(src)
+		deconstruct(disassembled = TRUE)
 
 /obj/structure/loom/wrench_act(mob/user, obj/item/I)
 	. = TRUE
@@ -41,6 +38,13 @@
 		WRENCH_ANCHOR_MESSAGE
 		anchored = TRUE
 
+/obj/structure/loom/deconstruct(disassembled = FALSE)
+	var/mat_drop = 5
+	if(disassembled)
+		mat_drop = 10
+	new /obj/item/stack/sheet/wood(drop_location(), mat_drop)
+	qdel(src)
+
 ///Handles the weaving.
 /obj/structure/loom/proc/weave(obj/item/stack/sheet/cotton/W, mob/user)
 	if(!istype(W))
diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index 6f1d28fa887..931587dd965 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -205,8 +205,7 @@
 	TOOL_ATTEMPT_DISMANTLE_MESSAGE
 	if(I.use_tool(src, user, 50, volume = I.tool_volume))
 		TOOL_DISMANTLE_SUCCESS_MESSAGE
-		new /obj/item/stack/sheet/wood(loc, 40)
-		qdel(src)
+		deconstruct(disassembled = TRUE)
 
 /obj/structure/beebox/wrench_act(mob/user, obj/item/I)
 	. = TRUE
@@ -271,8 +270,11 @@
 					visible_message("<span class='notice'>[user] removes the queen from the apiary.</span>")
 					queen_bee = null
 
-/obj/structure/beebox/deconstruct(disassembled = TRUE)
-	new /obj/item/stack/sheet/wood(loc, 20)
+/obj/structure/beebox/deconstruct(disassembled = FALSE)
+	var/mat_drop = 20
+	if(disassembled)
+		mat_drop = 40
+	new /obj/item/stack/sheet/wood(loc, mat_drop)
 	for(var/mob/living/simple_animal/hostile/poison/bees/B in bees)
 		if(B.loc == src)
 			B.forceMove(drop_location())
diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm
index d2a7f79cc2d..cb400709448 100644
--- a/code/modules/hydroponics/fermenting_barrel.dm
+++ b/code/modules/hydroponics/fermenting_barrel.dm
@@ -72,8 +72,7 @@
 	TOOL_ATTEMPT_DISMANTLE_MESSAGE
 	if(I.use_tool(src, user, 50, volume = I.tool_volume))
 		TOOL_DISMANTLE_SUCCESS_MESSAGE
-		new /obj/item/stack/sheet/wood(loc, 30)
-		qdel(src)
+		deconstruct(disassembled = TRUE)
 
 /obj/structure/fermenting_barrel/wrench_act(mob/living/user, obj/item/I)
 	. = TRUE
@@ -89,6 +88,13 @@
 		WRENCH_ANCHOR_MESSAGE
 		anchored = TRUE
 
+/obj/structure/fermenting_barrel/deconstruct(disassembled = FALSE)
+	var/mat_drop = 15
+	if(disassembled)
+		mat_drop = 30
+	new /obj/item/stack/sheet/wood(drop_location(), mat_drop)
+	qdel(src)
+
 /obj/structure/fermenting_barrel/update_icon()
 	if(open)
 		icon_state = "barrel_open"