diff --git a/baystation12.dme b/baystation12.dme
index 3285a6fcb61..67d8ca6c6a2 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -326,7 +326,6 @@
 #include "code\game\machinery\bots\bots.dm"
 #include "code\game\machinery\bots\cleanbot.dm"
 #include "code\game\machinery\bots\ed209bot.dm"
-#include "code\game\machinery\bots\farmbot.dm"
 #include "code\game\machinery\bots\floorbot.dm"
 #include "code\game\machinery\bots\medbot.dm"
 #include "code\game\machinery\bots\mulebot.dm"
diff --git a/code/game/machinery/bots/farmbot.dm b/code/game/machinery/bots/farmbot.dm
index fe110939a09..b6f81984637 100644
--- a/code/game/machinery/bots/farmbot.dm
+++ b/code/game/machinery/bots/farmbot.dm
@@ -540,10 +540,9 @@
 	var/obj/item/weapon/farmbot_arm_assembly/A = new /obj/item/weapon/farmbot_arm_assembly
 
 	A.loc = src.loc
-	A.layer = 20
 	user << "You add the robot arm to the [src]"
 	src.loc = A //Place the water tank into the assembly, it will be needed for the finished bot
-
+	user.u_equip(S)
 	del(S)
 
 /obj/item/weapon/farmbot_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -552,18 +551,21 @@
 		src.build_step++
 		user << "You add the plant analyzer to [src]!"
 		src.name = "farmbot assembly"
+		user.u_equip(W)
 		del(W)
 
 	else if(( istype(W, /obj/item/weapon/reagent_containers/glass/bucket)) && (src.build_step == 1))
 		src.build_step++
 		user << "You add a bucket to [src]!"
 		src.name = "farmbot assembly with bucket"
+		user.u_equip(W)
 		del(W)
 
 	else if(( istype(W, /obj/item/weapon/minihoe)) && (src.build_step == 2))
 		src.build_step++
 		user << "You add a minihoe to [src]!"
 		src.name = "farmbot assembly with bucket and minihoe"
+		user.u_equip(W)
 		del(W)
 
 	else if((isprox(W)) && (src.build_step == 3))
@@ -575,6 +577,7 @@
 			S.tank = wTank
 		S.loc = get_turf(src)
 		S.name = src.created_name
+		user.u_equip(W)
 		del(W)
 		del(src)
 
@@ -587,3 +590,6 @@
 			return
 
 		src.created_name = t
+
+/obj/item/weapon/farmbot_arm_assembly/attack_hand(mob/user as mob)
+	return //it's a converted watertank, no you cannot pick it up and put it in your backpack
\ No newline at end of file