diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm
index 2ab9a9405507..71547105e161 100644
--- a/_maps/shuttles/inteq/inteq_talos.dmm
+++ b/_maps/shuttles/inteq/inteq_talos.dmm
@@ -5311,12 +5311,21 @@
 /obj/structure/sign/poster/retro/lasergun_new{
 	pixel_x = -32
 	},
-/obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq/no_mag{
-	pixel_x = -8;
-	pixel_y = 8
+/obj/item/storage/guncase/mapper{
+	pixel_x = 2;
+	pixel_y = -2
 	},
-/obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq/no_mag{
-	pixel_x = -12
+/obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq/no_mag,
+/obj/item/ammo_box/magazine/m12g_bulldog,
+/obj/item/ammo_box/magazine/m12g_bulldog,
+/obj/item/storage/guncase/mapper{
+	pixel_y = 2;
+	pixel_x = -2
+	},
+/obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq/no_mag,
+/obj/item/ammo_box/magazine/m12g_bulldog,
+/obj/item/ammo_box/magazine/m12g_bulldog{
+	pixel_y = -1
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
@@ -6538,25 +6547,9 @@
 /obj/structure/sign/poster/official/ion_carbine{
 	pixel_x = -32
 	},
-/obj/item/ammo_box/magazine/m12g_bulldog{
-	pixel_x = 5;
-	pixel_y = 5
-	},
-/obj/item/ammo_box/magazine/m12g_bulldog{
-	pixel_x = 5;
-	pixel_y = 5
-	},
-/obj/item/ammo_box/magazine/m12g_bulldog{
-	pixel_x = -5
-	},
-/obj/item/ammo_box/magazine/m12g_bulldog{
-	pixel_x = -5
-	},
-/obj/item/ammo_box/magazine/co9mm{
-	pixel_x = 5
-	},
-/obj/item/ammo_box/magazine/co9mm{
-	pixel_x = -5
+/obj/item/toy/plush/moth/deadhead{
+	pixel_x = 3;
+	pixel_y = 3
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
@@ -7419,9 +7412,10 @@
 /obj/structure/rack,
 /obj/effect/turf_decal/siding/thinplating/dark,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/gun/ballistic/automatic/pistol/commander/inteq{
-	pixel_y = 5
-	},
+/obj/item/storage/guncase/pistol/mapper,
+/obj/item/gun/ballistic/automatic/pistol/commander/inteq,
+/obj/item/ammo_box/magazine/co9mm,
+/obj/item/ammo_box/magazine/co9mm,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "Wr" = (
diff --git a/code/game/objects/items/storage/guncases.dm b/code/game/objects/items/storage/guncases.dm
index 2dea2490041b..b5c47a98086e 100644
--- a/code/game/objects/items/storage/guncases.dm
+++ b/code/game/objects/items/storage/guncases.dm
@@ -20,13 +20,20 @@
 	var/mag_count = 2
 	var/ammoless = TRUE
 	var/grab_loc = FALSE
+	var/holdable_items = list(
+		/obj/item/gun,
+		/obj/item/ammo_box,
+		/obj/item/stock_parts/cell/gun
+	)
 
 /obj/item/storage/guncase/Initialize(mapload)
 	. = ..()
 	if(mapload && grab_loc)
 		var/items_eaten = 0
 		for(var/obj/item/I in loc)
-			if(I.w_class <= max_w_class)
+			if(I.w_class > max_w_class)
+				continue
+			if(is_type_in_list(I, holdable_items))
 				I.forceMove(src)
 				items_eaten++
 			if(items_eaten >= mag_count + 1)
@@ -37,11 +44,7 @@
 	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
 	STR.max_items = max_items
 	STR.max_w_class = max_w_class
-	STR.set_holdable(list(
-		/obj/item/gun,
-		/obj/item/ammo_box,
-		/obj/item/stock_parts/cell/gun
-		))
+	STR.set_holdable(holdable_items)
 
 /obj/item/storage/guncase/PopulateContents()
 	if(grab_loc)