diff --git a/code/game/objects/items/tools/welder.dm b/code/game/objects/items/tools/welder.dm
index 639fcc722ee..4877c061ae0 100644
--- a/code/game/objects/items/tools/welder.dm
+++ b/code/game/objects/items/tools/welder.dm
@@ -38,11 +38,14 @@
 	var/low_fuel_changes_icon = TRUE
 	/// How often does the tool flash the user's eyes?
 	var/progress_flash_divisor = 1 SECONDS
+	/// If FALSE, welding tools wont appear prefilled by default
+	var/prefilled = TRUE
 
 /obj/item/weldingtool/Initialize(mapload)
 	. = ..()
 	create_reagents(maximum_fuel)
-	reagents.add_reagent("fuel", maximum_fuel)
+	if(prefilled)
+		reagents.add_reagent("fuel", maximum_fuel)
 	update_icon()
 	RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
 	RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
@@ -248,6 +251,9 @@
 /obj/item/weldingtool/get_heat()
 	return tool_enabled * 2500
 
+/obj/item/weldingtool/empty
+	prefilled = FALSE
+
 /obj/item/weldingtool/largetank
 	name = "industrial welding tool"
 	desc = "A heavier welding tool with an expanded fuel reservoir. Otherwise identical to a normal welder."
@@ -257,6 +263,9 @@
 	materials = list(MAT_METAL = 400, MAT_GLASS = 300)
 	origin_tech = "engineering=2;plasmatech=2"
 
+/obj/item/weldingtool/largetank/empty
+	prefilled = FALSE
+
 /obj/item/weldingtool/largetank/cyborg
 	name = "integrated welding tool"
 	desc = "An integrated industrial welding tool used by construction and engineering robots. "
@@ -299,6 +308,9 @@
 	materials = list(MAT_METAL = 200, MAT_GLASS = 50)
 	low_fuel_changes_icon = FALSE
 
+/obj/item/weldingtool/mini/empty
+	prefilled = FALSE
+
 /obj/item/weldingtool/hugetank
 	name = "upgraded welding tool"
 	desc = "A large industrial welding tool with an even further upgraded fuel reservoir."
@@ -309,6 +321,9 @@
 	materials = list(MAT_METAL=70, MAT_GLASS=120)
 	origin_tech = "engineering=3;plasmatech=2"
 
+/obj/item/weldingtool/hugetank/empty
+	prefilled = FALSE
+
 /obj/item/weldingtool/experimental
 	name = "experimental welding tool"
 	desc = "A prototype welding tool which uses an experimental fuel breeder to create a near-infinite reserve of fuel. The unusual fuel mixture also means that the flame is less intense on the eyes."
diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index c2cc74c0ed6..3859e94b36a 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -26,8 +26,13 @@
 	var/precision = FALSE
 	/// Sets the `cooling_temperature` of the water reagent datum inside of the extinguisher when it is refilled.
 	var/cooling_power = 2
+	/// If FALSE, extinguishers wont appear prefilled by default
+	var/prefilled = TRUE
 	COOLDOWN_DECLARE(last_use)
 
+/obj/item/extinguisher/empty
+	prefilled = FALSE
+
 /obj/item/extinguisher/atmospherics
 	name = "atmospheric fire extinguisher"
 	desc = "An extinguisher coated in yellow paint that is pre-filled with firefighting foam."
@@ -39,6 +44,9 @@
 	reagent_id = "firefighting_foam"
 	reagent_capacity = 65
 
+/obj/item/extinguisher/atmospherics/empty
+	prefilled = FALSE
+
 /obj/item/extinguisher/mini
 	name = "pocket fire extinguisher"
 	desc = "A light and compact fibreglass-framed model fire extinguisher."
@@ -54,6 +62,9 @@
 	reagent_capacity = 30
 	dog_fashion = null
 
+/obj/item/extinguisher/mini/empty
+	prefilled = FALSE
+
 /obj/item/extinguisher/mini/cyborg
 	name = "integrated fire extinguisher"
 	desc = "A miniature fire extinguisher designed to store firefighting foam."
@@ -69,6 +80,9 @@
 
 /obj/item/extinguisher/Initialize(mapload)
 	. = ..()
+	if(!prefilled)
+		create_reagents(reagent_capacity)
+		reagents.add_reagent(reagent_id, 0)
 	if(!reagents)
 		create_reagents(reagent_capacity)
 		reagents.add_reagent(reagent_id, reagent_capacity)
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 4b434559c68..59c766c4870 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -31,7 +31,7 @@
 	id = "extinguisher"
 	build_type = AUTOLATHE
 	materials = list(MAT_METAL = 200)
-	build_path = /obj/item/extinguisher
+	build_path = /obj/item/extinguisher/empty
 	category = list("initial","Tools")
 
 /datum/design/multitool
@@ -63,7 +63,7 @@
 	id = "welding_tool"
 	build_type = AUTOLATHE
 	materials = list(MAT_METAL = 400, MAT_GLASS = 100)
-	build_path = /obj/item/weldingtool
+	build_path = /obj/item/weldingtool/empty
 	category = list("initial","Tools")
 
 /datum/design/mini_weldingtool
@@ -71,7 +71,7 @@
 	id = "mini_welding_tool"
 	build_type = AUTOLATHE
 	materials = list(MAT_METAL = 200, MAT_GLASS = 50)
-	build_path = /obj/item/weldingtool/mini
+	build_path = /obj/item/weldingtool/mini/empty
 	category = list("initial","Tools")
 
 /datum/design/screwdriver
@@ -781,7 +781,7 @@
 	id = "large_welding_tool"
 	build_type = AUTOLATHE
 	materials = list(MAT_METAL = 400, MAT_GLASS = 300)
-	build_path = /obj/item/weldingtool/largetank
+	build_path = /obj/item/weldingtool/largetank/empty
 	category = list("initial", "Tools")
 
 /datum/design/rcd