diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm
index 51adfcd5a4c..ca627bbdc8c 100644
--- a/code/game/objects/items/weapons/storage/toolbox.dm
+++ b/code/game/objects/items/weapons/storage/toolbox.dm
@@ -29,6 +29,7 @@
 	New()
 		..()
 		new /obj/item/weapon/crowbar/red(src)
+		new /obj/item/weapon/weldingtool/mini(src)
 		new /obj/item/weapon/extinguisher/mini(src)
 		if(prob(50))
 			new /obj/item/device/flashlight(src)
@@ -85,7 +86,7 @@
 		..()
 		new /obj/item/weapon/screwdriver(src)
 		new /obj/item/weapon/wrench(src)
-		new /obj/item/weapon/weldingtool(src)
+		new /obj/item/weapon/weldingtool/largetank(src)
 		new /obj/item/weapon/crowbar(src)
 		new /obj/item/weapon/wirecutters(src)
 		new /obj/item/device/multitool(src)
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index fd0c3ee0550..32fa0e711e4 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -388,7 +388,6 @@
 					user.disabilities &= ~NEARSIGHTED
 	return
 	
-
 /obj/item/weapon/weldingtool/proc/flamethrower_screwdriver(obj/item/I, mob/user)
 	if(welding)
 		user << "<span class='warning'>Turn it off first!</span>"
@@ -423,6 +422,11 @@
 	max_fuel = 40
 	materials = list(MAT_METAL=70, MAT_GLASS=60)
 	origin_tech = "engineering=2"
+
+/obj/item/weapon/weldingtool/largetank/cyborg
+
+/obj/item/weapon/weldingtool/largetank/flamethrower_screwdriver()
+	return
 	
 /obj/item/weapon/weldingtool/mini
 	name = "emergency welding tool"
@@ -432,6 +436,9 @@
 	w_class = 1
 	materials = list(MAT_METAL=30, MAT_GLASS=10)
 
+/obj/item/weapon/weldingtool/mini/flamethrower_screwdriver()
+	return	
+	
 /obj/item/weapon/weldingtool/hugetank
 	name = "Upgraded Welding Tool"
 	desc = "An upgraded welder based of the industrial welder."
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 035c199a521..9ba128a8b23 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -171,7 +171,7 @@
 	src.modules += new /obj/item/borg/sight/meson(src)
 	src.modules += new /obj/item/weapon/rcd/borg(src)
 	src.modules += new /obj/item/weapon/extinguisher(src)
-	src.modules += new /obj/item/weapon/weldingtool/largetank(src)
+	src.modules += new /obj/item/weapon/weldingtool/largetank/cyborg(src)
 	src.modules += new /obj/item/weapon/screwdriver(src)
 	src.modules += new /obj/item/weapon/wrench(src)
 	src.modules += new /obj/item/weapon/crowbar(src)
@@ -412,7 +412,7 @@
 		)
 
 /obj/item/weapon/robot_module/drone/New()
-	src.modules += new /obj/item/weapon/weldingtool(src)
+	src.modules += new /obj/item/weapon/weldingtool/largetank/cyborg(src)
 	src.modules += new /obj/item/weapon/screwdriver(src)
 	src.modules += new /obj/item/weapon/wrench(src)
 	src.modules += new /obj/item/weapon/crowbar(src)
diff --git a/code/modules/research/designs/equipment_designs.dm b/code/modules/research/designs/equipment_designs.dm
index 9cdefac2cb6..330098a2383 100644
--- a/code/modules/research/designs/equipment_designs.dm
+++ b/code/modules/research/designs/equipment_designs.dm
@@ -1,6 +1,16 @@
 /////////////////////////////////////////
 /////////////////Equipment///////////////
 /////////////////////////////////////////
+/datum/design/exwelder
+	name = "Experimental Welding Tool"
+	desc = "An experimental welder capable of self-fuel generation."
+	id = "exwelder"
+	req_tech = list("materials" = 4, "engineering" = 4, "bluespace" = 3, "plasmatech" = 3)
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 1000, MAT_GLASS = 500, MAT_PLASMA = 1500, MAT_URANIUM = 200)
+	build_path = /obj/item/weapon/weldingtool/experimental
+	category = list("Equipment")
+	
 /datum/design/health_hud
 	name = "Health Scanner HUD"
 	desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."