From 79b68e0696c11955a9f5b29d94a4c8e65b68ccfd Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Tue, 11 Aug 2020 05:34:53 +0100
Subject: [PATCH] Better wrenching code

Probably
---
 code/game/objects/structures/dresser.dm       | 12 ++----------
 code/game/objects/structures/loom.dm          | 12 ++----------
 code/modules/hydroponics/fermenting_barrel.dm | 12 ++----------
 3 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm
index 0dafbb53ee3..aa53a18f0c0 100644
--- a/code/game/objects/structures/dresser.dm
+++ b/code/game/objects/structures/dresser.dm
@@ -65,17 +65,9 @@
 
 /obj/structure/dresser/wrench_act(mob/user, obj/item/I)
 	. = TRUE
-	if(!I.use_tool(src, user, 0, volume = I.tool_volume))
+	if(!I.tool_use_check(user, 0))
 		return
-	if(anchored)
-		WRENCH_UNANCHOR_MESSAGE
-		anchored = FALSE
-	else
-		if(!isfloorturf(loc))
-			to_chat(user, "<span class='warning'>A floor must be present to secure [src]!</span>")
-			return
-		WRENCH_ANCHOR_MESSAGE
-		anchored = TRUE
+	default_unfasten_wrench(user, I, time = 20)
 
 obj/structure/dresser/deconstruct(disassembled = FALSE)
 	var/mat_drop = 15
diff --git a/code/game/objects/structures/loom.dm b/code/game/objects/structures/loom.dm
index a1764310eec..d8b54e27b9b 100644
--- a/code/game/objects/structures/loom.dm
+++ b/code/game/objects/structures/loom.dm
@@ -26,17 +26,9 @@
 
 /obj/structure/loom/wrench_act(mob/user, obj/item/I)
 	. = TRUE
-	if(!I.use_tool(src, user, 0, volume = I.tool_volume))
+	if(!I.tool_use_check(user, 0))
 		return
-	if(anchored)
-		WRENCH_UNANCHOR_MESSAGE
-		anchored = FALSE
-	else
-		if(!isfloorturf(loc))
-			to_chat(user, "<span class='warning'>A floor must be present to secure [src]!</span>")
-			return
-		WRENCH_ANCHOR_MESSAGE
-		anchored = TRUE
+	default_unfasten_wrench(user, I, time = 20)
 
 /obj/structure/loom/deconstruct(disassembled = FALSE)
 	var/mat_drop = 5
diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm
index cb400709448..5b347d1be54 100644
--- a/code/modules/hydroponics/fermenting_barrel.dm
+++ b/code/modules/hydroponics/fermenting_barrel.dm
@@ -76,17 +76,9 @@
 
 /obj/structure/fermenting_barrel/wrench_act(mob/living/user, obj/item/I)
 	. = TRUE
-	if(!I.use_tool(src, user, 0, volume = I.tool_volume))
+	if(!I.tool_use_check(user, 0))
 		return
-	if(anchored)
-		WRENCH_UNANCHOR_MESSAGE
-		anchored = FALSE
-	else
-		if(!isfloorturf(loc))
-			to_chat(user, "<span class='warning'>A floor must be present to secure [src]!</span>")
-			return
-		WRENCH_ANCHOR_MESSAGE
-		anchored = TRUE
+	default_unfasten_wrench(user, I, time = 20)
 
 /obj/structure/fermenting_barrel/deconstruct(disassembled = FALSE)
 	var/mat_drop = 15