From 620a8d49a49e071ec98e256ef469214565957ff9 Mon Sep 17 00:00:00 2001
From: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
Date: Tue, 12 Apr 2022 10:52:01 -0400
Subject: [PATCH] Fix Experimentor deconstruction, and standardizes into tool
 procs (#17593)

* Update experimentor.dm

* Should have been sane

* Forgot that
---
 code/modules/research/experimentor.dm | 28 +++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index a89a70d6e6a..ee5f33d1e6e 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -115,19 +115,9 @@
 	if(shocked)
 		shock(user,50)
 
-	if(default_deconstruction_screwdriver(user, "h_lathe_maint", "h_lathe", O))
-		if(linked_console)
-			linked_console.linked_destroy = null
-			linked_console = null
-		return
-
 	if(exchange_parts(user, O))
 		return
 
-	if(panel_open && istype(O, /obj/item/crowbar))
-		default_deconstruction_crowbar(user, O)
-		return
-
 	if(!checkCircumstances(O))
 		to_chat(user, "<span class='warning'>[O] is not yet valid for [src] and must be completed!</span>")
 		return
@@ -157,9 +147,23 @@
 
 	return
 
-/obj/machinery/r_n_d/experimentor/default_deconstruction_crowbar(user, obj/item/O)
+/obj/machinery/r_n_d/experimentor/crowbar_act(mob/user, obj/item/I)
+	if(!panel_open)
+		return
+	. = TRUE
+	if(!I.use_tool(src, user, 0, volume = I.tool_volume))
+		return
 	ejectItem()
-	..(O)
+	default_deconstruction_crowbar(user, I)
+
+/obj/machinery/r_n_d/experimentor/screwdriver_act(mob/user, obj/item/I)
+	. = TRUE
+	if(!I.use_tool(src, user, 0, volume = I.tool_volume))
+		return
+	default_deconstruction_screwdriver(user, "h_lathe_maint", "h_lathe", I)
+	if(linked_console)
+		linked_console.linked_destroy = null
+		linked_console = null
 
 /obj/machinery/r_n_d/experimentor/attack_hand(mob/user)
 	user.set_machine(src)