diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index 13b177762b0..c5b55fe62af 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -214,8 +214,27 @@
 					if(is_stack)
 						m_amount -= metal_cost*multiplier
 						g_amount -= glass_cost*multiplier
-						var/obj/item/stack/S = new being_built.build_path(T)
-						S.amount = multiplier
+
+						for(var/obj/item/stack/S in T)
+							if(multiplier <= 0)
+								break
+							if(S.amount >= S.max_amount)
+								continue
+							var/to_transfer = S.max_amount - S.amount
+							if(to_transfer < multiplier)
+								S.amount += to_transfer
+								multiplier -= to_transfer
+								S.update_icon()
+								continue
+							else
+								S.amount += multiplier
+								multiplier = 0
+								S.update_icon()
+								break
+						if(multiplier)
+							var/obj/item/stack/N = new being_built.build_path(T)
+							N.amount = multiplier
+							N.update_icon()
 					else
 						m_amount -= metal_cost/coeff
 						g_amount -= glass_cost/coeff
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index 7a2a2a5146a..dc09dda6ebc 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -16,7 +16,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \
 	throw_speed = 3
 	throw_range = 7
 	m_amt = 1000
-	max_amount = 60
+	max_amount = 50
 	attack_verb = list("hit", "bludgeoned", "whacked")
 	hitsound = 'sound/weapons/grenadelaunch.ogg'
 
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index c0b3260c722..2b667c5a5b7 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -176,9 +176,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 				M.unEquip(src, 1)
 			qdel(src)
 			return
-		if(reagents.get_reagent_amount("fuel")) // the fuel explodes, too, but much less violently
+		if(reagents.get_reagent_amount("welding_fuel")) // the fuel explodes, too, but much less violently
 			var/datum/effect/effect/system/reagents_explosion/e = new()
-			e.set_up(round(reagents.get_reagent_amount("fuel") / 5, 1), get_turf(src), 0, 0)
+			e.set_up(round(reagents.get_reagent_amount("welding_fuel") / 5, 1), get_turf(src), 0, 0)
 			e.start()
 			if(ismob(loc))
 				var/mob/M = loc
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 98be5d71110..4f9a1034ea8 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -166,7 +166,7 @@
 /obj/item/weapon/weldingtool/New()
 	..()
 	create_reagents(max_fuel)
-	reagents.add_reagent("fuel", max_fuel)
+	reagents.add_reagent("welding_fuel", max_fuel)
 	update_icon()
 	return
 
@@ -274,7 +274,7 @@
 
 //Returns the amount of fuel in the welder
 /obj/item/weapon/weldingtool/proc/get_fuel()
-	return reagents.get_reagent_amount("fuel")
+	return reagents.get_reagent_amount("welding_fuel")
 
 
 //Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use()
@@ -282,7 +282,7 @@
 	if(!welding || !check_fuel())
 		return 0
 	if(get_fuel() >= amount)
-		reagents.remove_reagent("fuel", amount)
+		reagents.remove_reagent("welding_fuel", amount)
 		check_fuel()
 		if(M)
 			M.flash_eyes(2)
@@ -418,7 +418,7 @@
 /obj/item/weapon/weldingtool/experimental/proc/fuel_gen()
 	if(!last_gen)
 		last_gen = 1
-		reagents.add_reagent("fuel",1)
+		reagents.add_reagent("welding_fuel",1)
 		spawn(10)
 			last_gen = 0
 
diff --git a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm
index f9d2a23a272..4d307f9d636 100644
--- a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm
@@ -431,7 +431,7 @@
 				icon_state = "glass_brown"
 				name = "Glass of bilk"
 				desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
-			if("fuel")
+			if("welding_fuel")
 				icon_state = "dr_gibb_glass"
 				name = "Glass of welder fuel"
 				desc = "Unless you're an industrial tool, this is probably not safe for consumption."
diff --git a/code/modules/food&drinks/recipes/drinks_recipes.dm b/code/modules/food&drinks/recipes/drinks_recipes.dm
index 36b21ba2d4b..c981d5ebb00 100644
--- a/code/modules/food&drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food&drinks/recipes/drinks_recipes.dm
@@ -206,7 +206,7 @@
 	name = "Hooch"
 	id = "hooch"
 	result = "hooch"
-	required_reagents = list ("ethanol" = 2, "fuel" = 1)
+	required_reagents = list ("ethanol" = 2, "welding_fuel" = 1)
 	required_catalysts = list("enzyme" = 1)
 	result_amount = 3
 
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index 062538a3f8b..1ef7aa5689e 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -1372,7 +1372,7 @@
 		if(prob(20))
 			mutations.Remove(pick(temp_mut_list))
 		temp_mut_list.Cut()
-	if(S.has_reagent("fuel", 5))
+	if(S.has_reagent("welding_fuel", 5))
 		for(var/datum/spacevine_mutation/SM in mutations)
 			if(SM.quality == POSITIVE)
 				temp_mut_list += SM
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index 4fd76334aab..e41fd5639eb 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -21,7 +21,7 @@
 	var/uiname = "Chem Dispenser 5000"
 	var/list/dispensable_reagents = list("hydrogen","lithium","carbon","nitrogen","oxygen","fluorine",
 	"sodium","aluminium","silicon","phosphorus","sulfur","chlorine","potassium","iron",
-	"copper","mercury","radium","water","ethanol","sugar","sacid","fuel","silver","iodine","bromine","stable_plasma")
+	"copper","mercury","radium","water","ethanol","sugar","sacid","welding_fuel","silver","iodine","bromine","stable_plasma")
 
 /obj/machinery/chem_dispenser/proc/recharge()
 	if(stat & (BROKEN|NOPOWER)) return
@@ -192,7 +192,7 @@
 	dispensable_reagents = list()
 	var/list/special_reagents = list(list("hydrogen", "oxygen", "silicon", "phosphorus", "sulfur", "carbon", "nitrogen", "water"),
 						 		list("lithium", "sugar", "sacid", "copper", "mercury", "sodium","iodine","bromine"),
-								list("ethanol", "chlorine", "potassium", "aluminium", "radium", "fluorine", "iron", "fuel","silver","stable_plasma"))
+								list("ethanol", "chlorine", "potassium", "aluminium", "radium", "fluorine", "iron", "welding_fuel","silver","stable_plasma"))
 
 /obj/machinery/chem_dispenser/constructable/New()
 	..()
diff --git a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm
index c4919676d61..efbae69d76d 100644
--- a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm
@@ -518,7 +518,7 @@ datum/reagent/silicon
 
 datum/reagent/fuel
 	name = "Welding fuel"
-	id = "fuel"
+	id = "welding_fuel"
 	description = "Required for welders. Flamable."
 	color = "#660000" // rgb: 102, 0, 0
 
diff --git a/code/modules/reagents/Chemistry-Recipes/Drugs.dm b/code/modules/reagents/Chemistry-Recipes/Drugs.dm
index 6916187a7eb..5d2c6cf3bc7 100644
--- a/code/modules/reagents/Chemistry-Recipes/Drugs.dm
+++ b/code/modules/reagents/Chemistry-Recipes/Drugs.dm
@@ -9,7 +9,7 @@
 	name = "Crank"
 	id = "crank"
 	result = "crank"
-	required_reagents = list("diphenhydramine" = 1, "ammonia" = 1, "lithium" = 1, "sacid" = 1, "fuel" = 1)
+	required_reagents = list("diphenhydramine" = 1, "ammonia" = 1, "lithium" = 1, "sacid" = 1, "welding_fuel" = 1)
 	result_amount = 5
 	mix_message = "The mixture violently reacts, leaving behind a few crystalline shards."
 	required_temp = 390
@@ -19,7 +19,7 @@
 	name = "Krokodil"
 	id = "krokodil"
 	result = "krokodil"
-	required_reagents = list("diphenhydramine" = 1, "morphine" = 1, "cleaner" = 1, "potassium" = 1, "phosphorus" = 1, "fuel" = 1)
+	required_reagents = list("diphenhydramine" = 1, "morphine" = 1, "cleaner" = 1, "potassium" = 1, "phosphorus" = 1, "welding_fuel" = 1)
 	result_amount = 6
 	mix_message = "The mixture dries into a pale blue powder."
 	required_temp = 380
diff --git a/code/modules/reagents/Chemistry-Recipes/Medicine.dm b/code/modules/reagents/Chemistry-Recipes/Medicine.dm
index a73477d8629..357eac96a5e 100644
--- a/code/modules/reagents/Chemistry-Recipes/Medicine.dm
+++ b/code/modules/reagents/Chemistry-Recipes/Medicine.dm
@@ -92,7 +92,7 @@
 	name = "Pentetic Acid"
 	id = "pen_acid"
 	result = "pen_acid"
-	required_reagents = list("fuel" = 1, "chlorine" = 1, "ammonia" = 1, "formaldehyde" = 1, "sodium" = 1, "cyanide" = 1)
+	required_reagents = list("welding_fuel" = 1, "chlorine" = 1, "ammonia" = 1, "formaldehyde" = 1, "sodium" = 1, "cyanide" = 1)
 	result_amount = 6
 
 /datum/chemical_reaction/sal_acid
diff --git a/code/modules/reagents/Chemistry-Recipes/Others.dm b/code/modules/reagents/Chemistry-Recipes/Others.dm
index 8a44606fcbc..8b3a009d860 100644
--- a/code/modules/reagents/Chemistry-Recipes/Others.dm
+++ b/code/modules/reagents/Chemistry-Recipes/Others.dm
@@ -249,7 +249,7 @@ datum/chemical_reaction/pestkiller
 	name = "acetone"
 	id = "acetone"
 	result = "acetone"
-	required_reagents = list("oil" = 1, "fuel" = 1, "oxygen" = 1)
+	required_reagents = list("oil" = 1, "welding_fuel" = 1, "oxygen" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/carpet
@@ -264,7 +264,7 @@ datum/chemical_reaction/pestkiller
 	name = "Oil"
 	id = "oil"
 	result = "oil"
-	required_reagents = list("fuel" = 1, "carbon" = 1, "hydrogen" = 1)
+	required_reagents = list("welding_fuel" = 1, "carbon" = 1, "hydrogen" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/phenol
diff --git a/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm b/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm
index 4a3983597f8..fedbc5d0904 100644
--- a/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm
+++ b/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm
@@ -325,7 +325,7 @@
 	name = "Napalm"
 	id = "napalm"
 	result = "napalm"
-	required_reagents = list("sugar" = 1, "fuel" = 1, "ethanol" = 1 )
+	required_reagents = list("sugar" = 1, "welding_fuel" = 1, "ethanol" = 1 )
 	result_amount = 3
 
 
diff --git a/code/modules/reagents/Chemistry-Recipes/Toxins.dm b/code/modules/reagents/Chemistry-Recipes/Toxins.dm
index 95f2a28507a..5d89b3b9379 100644
--- a/code/modules/reagents/Chemistry-Recipes/Toxins.dm
+++ b/code/modules/reagents/Chemistry-Recipes/Toxins.dm
@@ -27,7 +27,7 @@
 	name = "Itching Powder"
 	id = "itching_powder"
 	result = "itching_powder"
-	required_reagents = list("fuel" = 1, "ammonia" = 1, "charcoal" = 1)
+	required_reagents = list("welding_fuel" = 1, "ammonia" = 1, "charcoal" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/facid
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index ab72b62f722..4ef5f0d72ed 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -91,7 +91,7 @@
 	amount_per_transfer_from_this = 10
 	New()
 		..()
-		reagents.add_reagent("fuel",1000)
+		reagents.add_reagent("welding_fuel",1000)
 
 
 /obj/structure/reagent_dispensers/fueltank/bullet_act(var/obj/item/projectile/Proj)
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 3eda5a4b71b..6db0ab5709a 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 7cd86c88b8b..83986fd1ae8 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 8d358692f26..b56aa44170d 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index b4f2c21b223..175cfab6122 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ