diff --git a/code/modules/cm_marines/equipment/guncases.dm b/code/modules/cm_marines/equipment/guncases.dm
index 6b2c99553b..9a21d0317b 100644
--- a/code/modules/cm_marines/equipment/guncases.dm
+++ b/code/modules/cm_marines/equipment/guncases.dm
@@ -142,14 +142,23 @@
 /obj/item/storage/box/guncase/flamer
 	name = "\improper M240 incinerator case"
 	desc = "A gun case containing the M240A1 incinerator unit. It does come loaded, but you'll still have to find extra tanks as you go."
-	storage_slots = 3
+	storage_slots = 4
 	can_hold = list(/obj/item/weapon/gun/flamer, /obj/item/ammo_magazine/flamer_tank, /obj/item/attachable/attached_gun/extinguisher)
 
 /obj/item/storage/box/guncase/flamer/fill_preset_inventory()
 	new /obj/item/weapon/gun/flamer(src)
 	new /obj/item/ammo_magazine/flamer_tank(src)
+	new /obj/item/ammo_magazine/flamer_tank(src)
 	new /obj/item/attachable/attached_gun/extinguisher(src)
 
+/obj/item/storage/box/guncase/flamer/special
+	storage_slots = 3
+
+/obj/item/storage/box/guncase/flamer/special/fill_preset_inventory()
+	new /obj/item/weapon/gun/flamer(src)
+	new /obj/item/ammo_magazine/flamer_tank(src)
+	new /obj/item/attachable/attached_gun/extinguisher/pyro(src)
+
 //------------
 /obj/item/storage/box/guncase/m56d
 	name = "\improper M56D heavy machine gun case"
diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm
index 9225f4301d..a3a68efc71 100644
--- a/maps/map_files/golden_arrow/golden_arrow.dmm
+++ b/maps/map_files/golden_arrow/golden_arrow.dmm
@@ -4789,7 +4789,7 @@
 /area/golden_arrow/prep_hallway)
 "CC" = (
 /obj/structure/surface/table/almayer,
-/obj/item/storage/box/guncase/flamer,
+/obj/item/storage/box/guncase/flamer/special,
 /obj/item/explosive/grenade/smokebomb{
 	pixel_y = 14;
 	pixel_x = -5
@@ -5031,7 +5031,7 @@
 /area/golden_arrow/briefing)
 "Ei" = (
 /obj/structure/surface/table/almayer,
-/obj/item/storage/box/guncase/flamer,
+/obj/item/storage/box/guncase/flamer/special,
 /obj/item/trash/cigbutt/cigarbutt{
 	pixel_y = 18
 	},