diff --git a/modular_skyrat/modules/blueshield/code/closet.dm b/modular_skyrat/modules/blueshield/code/closet.dm
index 8c7a3c195c9..a03bde358cd 100644
--- a/modular_skyrat/modules/blueshield/code/closet.dm
+++ b/modular_skyrat/modules/blueshield/code/closet.dm
@@ -29,5 +29,5 @@
 	new /obj/item/restraints/handcuffs(src)
 	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
 	new /obj/item/storage/medkit/tactical/blueshield(src)
-	new /obj/item/storage/toolbox/guncase/skyrat/carwo_large_case/sindano(src)
+	new /obj/item/storage/toolbox/guncase/skyrat/carwo_large_case/wt550(src) // Bubberstation Edit
 	new /obj/item/storage/bag/garment/blueshield(src)
diff --git a/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm b/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm
index 97c006240a5..3ef841ec94c 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm
@@ -1,3 +1,4 @@
+/* Bubberstation Removal
 /datum/supply_pack/security/armory/cmg
 	name = "Carwo 'Sindano' Submachinegun Crate"
 	desc = "Three entirely proprietary Sindano kits, chambered in .35 Sol Short. Each kit contains three empty magazines and a box each of incapacitator and lethal rounds."
@@ -8,3 +9,4 @@
 		/obj/item/storage/toolbox/guncase/skyrat/carwo_large_case/sindano,
 	)
 	crate_name = "Carwo 'Sindano' Submachinegun Crate"
+*/
diff --git a/modular_zubbers/code/game/objects/items/storage/guncases.dm b/modular_zubbers/code/game/objects/items/storage/guncases.dm
new file mode 100644
index 00000000000..ca57baaae3b
--- /dev/null
+++ b/modular_zubbers/code/game/objects/items/storage/guncases.dm
@@ -0,0 +1,12 @@
+/obj/item/storage/toolbox/guncase/skyrat/carwo_large_case/wt550
+	name = "WT-550 Gun Case"
+
+	weapon_to_spawn = /obj/item/gun/ballistic/automatic/wt550
+	extra_to_spawn = /obj/item/ammo_box/magazine/wt550m9
+
+/obj/item/storage/toolbox/guncase/skyrat/carwo_large_case/wt550/PopulateContents() // The gun and two extra mags
+	new weapon_to_spawn (src)
+
+	generate_items_inside(list(
+		/obj/item/ammo_box/magazine/wt550m9 = 2,
+	), src)
diff --git a/tgstation.dme b/tgstation.dme
index 22424746a16..0ae001e192f 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -7563,7 +7563,6 @@
 #include "modular_skyrat\modules\sec_haul\code\guns\ammo.dm"
 #include "modular_skyrat\modules\sec_haul\code\guns\armory_spawns.dm"
 #include "modular_skyrat\modules\sec_haul\code\guns\bullets.dm"
-#include "modular_skyrat\modules\sec_haul\code\guns\cargo_stuff.dm"
 #include "modular_skyrat\modules\sec_haul\code\misc\ai_module.dm"
 #include "modular_skyrat\modules\sec_haul\code\misc\bullet_drive.dm"
 #include "modular_skyrat\modules\sec_haul\code\misc\decals.dm"
@@ -7755,6 +7754,7 @@
 #include "modular_zubbers\code\game\objects\items\robot\items\harm_alarm_new.dm"
 #include "modular_zubbers\code\game\objects\items\robot\robot_upgrades\adv_plasmacutter_upgrade.dm"
 #include "modular_zubbers\code\game\objects\items\storage\boxes.dm"
+#include "modular_zubbers\code\game\objects\items\storage\guncases.dm"
 #include "modular_zubbers\code\game\objects\structures\plaques\static_plaques.dm"
 #include "modular_zubbers\code\game\traits\negative.dm"
 #include "modular_zubbers\code\game\traits\neutral.dm"