From 9efddbe580012b2fd718dc4fe07138f161c85f9d Mon Sep 17 00:00:00 2001
From: BlackMajor <henrydyer6@hotmail.com>
Date: Wed, 6 Nov 2019 12:47:21 +1300
Subject: [PATCH 1/3] thank you dark souls

---
 code/modules/mob/living/simple_animal/bot/construction.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm
index a72b71be85..ff135d19d1 100644
--- a/code/modules/mob/living/simple_animal/bot/construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/construction.dm
@@ -184,6 +184,8 @@
 			if(istype(W, /obj/item/screwdriver))
 				to_chat(user, "<span class='notice'>You start attaching the gun to the frame...</span>")
 				if(W.use_tool(src, user, 40, volume=100))
+					if(9)
+						return
 					name = "armed [name]"
 					to_chat(user, "<span class='notice'>Taser gun attached.</span>")
 					build_step++

From 960de09a96298fa78a6470f7dc39ce76e0cf777f Mon Sep 17 00:00:00 2001
From: BlackMajor <henrydyer6@hotmail.com>
Date: Wed, 6 Nov 2019 12:49:50 +1300
Subject: [PATCH 2/3] Oh there's even more

---
 code/modules/mob/living/simple_animal/bot/construction.dm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm
index ff135d19d1..f92dda8b87 100644
--- a/code/modules/mob/living/simple_animal/bot/construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/construction.dm
@@ -102,6 +102,8 @@
 		if(ASSEMBLY_FOURTH_STEP)
 			if(istype(W, /obj/item/weldingtool))
 				if(W.use_tool(src, user, 0, volume=40))
+					if(ASSEMBLY_FIFTH_STEP)
+						return
 					name = "shielded frame assembly"
 					to_chat(user, "<span class='notice'>You weld the vest to [src].</span>")
 					build_step++
@@ -148,6 +150,8 @@
 					return
 				to_chat(user, "<span class='notice'>You start to wire [src]...</span>")
 				if(do_after(user, 40, target = src))
+					if(7)
+						return
 					if(coil.get_amount() >= 1 && build_step == 6)
 						coil.use(1)
 						to_chat(user, "<span class='notice'>You wire [src].</span>")

From 026f9758b9c4d9f20c3ca759604397b0f161dab7 Mon Sep 17 00:00:00 2001
From: BlackMajor <henrydyer6@hotmail.com>
Date: Wed, 6 Nov 2019 12:55:25 +1300
Subject: [PATCH 3/3] Actually wait that's way simpler

---
 .../mob/living/simple_animal/bot/construction.dm       | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm
index f92dda8b87..77df764b43 100644
--- a/code/modules/mob/living/simple_animal/bot/construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/construction.dm
@@ -101,9 +101,7 @@
 
 		if(ASSEMBLY_FOURTH_STEP)
 			if(istype(W, /obj/item/weldingtool))
-				if(W.use_tool(src, user, 0, volume=40))
-					if(ASSEMBLY_FIFTH_STEP)
-						return
+				if(W.use_tool(src, user, 0, volume=40) && build_step == 4)
 					name = "shielded frame assembly"
 					to_chat(user, "<span class='notice'>You weld the vest to [src].</span>")
 					build_step++
@@ -150,8 +148,6 @@
 					return
 				to_chat(user, "<span class='notice'>You start to wire [src]...</span>")
 				if(do_after(user, 40, target = src))
-					if(7)
-						return
 					if(coil.get_amount() >= 1 && build_step == 6)
 						coil.use(1)
 						to_chat(user, "<span class='notice'>You wire [src].</span>")
@@ -187,9 +183,7 @@
 		if(8)
 			if(istype(W, /obj/item/screwdriver))
 				to_chat(user, "<span class='notice'>You start attaching the gun to the frame...</span>")
-				if(W.use_tool(src, user, 40, volume=100))
-					if(9)
-						return
+				if(W.use_tool(src, user, 40, volume=100) && build_step == 8)
 					name = "armed [name]"
 					to_chat(user, "<span class='notice'>Taser gun attached.</span>")
 					build_step++