From 8b55cd99650f56c9d251b8527cf11d0a44141427 Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Tue, 11 Aug 2020 10:10:19 +0100
Subject: [PATCH] Review tweaks

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

diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm
index aa53a18f0c0..0c0a7f5e4dd 100644
--- a/code/game/objects/structures/dresser.dm
+++ b/code/game/objects/structures/dresser.dm
@@ -65,8 +65,6 @@
 
 /obj/structure/dresser/wrench_act(mob/user, obj/item/I)
 	. = TRUE
-	if(!I.tool_use_check(user, 0))
-		return
 	default_unfasten_wrench(user, I, time = 20)
 
 obj/structure/dresser/deconstruct(disassembled = FALSE)
@@ -74,4 +72,4 @@ obj/structure/dresser/deconstruct(disassembled = FALSE)
 	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 d8b54e27b9b..4742a2c3c0c 100644
--- a/code/game/objects/structures/loom.dm
+++ b/code/game/objects/structures/loom.dm
@@ -26,8 +26,6 @@
 
 /obj/structure/loom/wrench_act(mob/user, obj/item/I)
 	. = TRUE
-	if(!I.tool_use_check(user, 0))
-		return
 	default_unfasten_wrench(user, I, time = 20)
 
 /obj/structure/loom/deconstruct(disassembled = FALSE)
@@ -35,7 +33,7 @@
 	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)
diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index 931587dd965..5a73313601a 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -209,8 +209,6 @@
 
 /obj/structure/beebox/wrench_act(mob/user, obj/item/I)
 	. = TRUE
-	if(!I.tool_use_check(user, 0))
-		return
 	default_unfasten_wrench(user, I, time = 20)
 
 /obj/structure/beebox/attack_hand(mob/user)
@@ -281,7 +279,7 @@
 	for(var/obj/item/honey_frame/HF in honey_frames)
 		HF.forceMove(drop_location())
 		honey_frames -= HF
-	qdel(src)
+	..()
 
 /obj/structure/beebox/unwrenched
 	anchored = FALSE
diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm
index 5b347d1be54..5031ac71373 100644
--- a/code/modules/hydroponics/fermenting_barrel.dm
+++ b/code/modules/hydroponics/fermenting_barrel.dm
@@ -76,8 +76,6 @@
 
 /obj/structure/fermenting_barrel/wrench_act(mob/living/user, obj/item/I)
 	. = TRUE
-	if(!I.tool_use_check(user, 0))
-		return
 	default_unfasten_wrench(user, I, time = 20)
 
 /obj/structure/fermenting_barrel/deconstruct(disassembled = FALSE)
@@ -85,7 +83,7 @@
 	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)