puts it in maps

_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm

@@ -184,15 +184,14 @@
 /obj/item/clothing/suit/armor/vest/security,
 /obj/item/clothing/mask/gas/sechailer,
 /obj/item/gps,
-/obj/item/gun/ballistic/automatic/pistol/commander,
 /obj/structure/railing{
 	dir = 4
 	},
 /obj/item/ammo_box/c9mm,
 /obj/item/ammo_box/c9mm,
 /obj/item/ammo_box/magazine/co9mm,
-/obj/item/ammo_box/magazine/co9mm,
 /obj/item/storage/belt/security/webbing,
+/obj/item/storage/toolbox/pistolcase/commander,
 /turf/open/floor/wood,
 /area/ship/security)
 "bD" = (
@@ -3115,9 +3114,6 @@
 /area/ship/engineering)
 "Ha" = (
 /obj/structure/closet/secure_closet/lp/lieutenant,
-/obj/item/gun/energy/e_gun{
-	pixel_y = 1
-	},
 /obj/item/stock_parts/cell/gun,
 /obj/item/melee/classic_baton/telescopic,
 /obj/item/kitchen/knife/combat/survival,
@@ -3131,12 +3127,12 @@
 	pixel_x = 7;
 	pixel_y = -20
 	},
-/obj/item/gun/ballistic/automatic/pistol/commander,
 /obj/item/ammo_box/c9mm,
 /obj/item/ammo_box/c9mm,
 /obj/item/ammo_box/c9mm/rubbershot,
 /obj/item/ammo_box/magazine/co9mm,
-/obj/item/ammo_box/magazine/co9mm,
+/obj/item/storage/toolbox/pistolcase/commander,
+/obj/item/storage/toolbox/pistolcase/egun,
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "Hd" = (

_maps/shuttles/roumain/srm_elder.dmm

@@ -2014,11 +2014,9 @@
 /obj/item/gps{
 	pixel_x = -7
 	},
-/obj/item/gun/ballistic/revolver/montagne,
 /obj/item/storage/backpack/satchel/leather,
-/obj/item/ammo_box/c45_speedloader,
-/obj/item/ammo_box/c45_speedloader,
 /obj/item/ammo_box/c45,
+/obj/item/storage/toolbox/pistolcase/montagne,
 /turf/open/floor/wood/mahogany,
 /area/ship/bridge)
 "zH" = (

_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm

@@ -62,11 +62,9 @@
 /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
 /obj/item/clothing/head/ngr/peaked,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/gun/ballistic/revolver,
-/obj/item/ammo_box/a357/match,
-/obj/item/ammo_box/a357/match,
 /obj/item/ammo_box/a357/match,
 /obj/item/pen/edagger,
+/obj/item/storage/toolbox/pistolcase/a357,
 /turf/open/floor/carpet/black,
 /area/ship/bridge)
 "bJ" = (

code/game/objects/items/storage/toolbox.dm

@@ -392,6 +392,19 @@
 	new /obj/item/gun/ballistic/derringer/no_mag(src)
 	new /obj/item/gun/ballistic/derringer/no_mag(src)
 
+/obj/item/storage/toolbox/pistolcase/a357
+/obj/item/storage/toolbox/pistolcase/derringer/PopulateContents()
+	new /obj/item/gun/ballistic/revolver/no_mag(src)
+	new /obj/item/ammo_box/a357/empty(src)
+	new /obj/item/ammo_box/a357/empty(src)
+
+/obj/item/storage/toolbox/pistolcase/montagne
+/obj/item/storage/toolbox/pistolcase/derringer/PopulateContents()
+	new /obj/item/gun/ballistic/revolver/montagne/no_mag(src)
+	new /obj/item/ammo_box/c45_speedloader/empty(src)
+	new /obj/item/ammo_box/c45_speedloader/empty(src)
+
+
 /obj/item/storage/toolbox/pistolcase/disposable
 /obj/item/storage/toolbox/pistolcase/disposable/PopulateContents()
 	new /obj/item/gun/ballistic/automatic/pistol/disposable(src)

code/modules/projectiles/boxes_magazines/ammo_boxes.dm

@@ -13,6 +13,9 @@
 	w_class = WEIGHT_CLASS_TINY
 	instant_load = TRUE
 
+/obj/item/ammo_box/a357/empty
+	start_empty = TRUE
+
 /obj/item/ammo_box/a357/match
 	name = "speed loader (.357 match)"
 	desc = "A 7-round speed loader for quickly reloading .357 revolvers. These match rounds travel faster, perform better against armor, and can ricochet off targets."

code/modules/projectiles/guns/ballistic/revolver.dm

@@ -528,6 +528,9 @@
 /obj/item/gun/ballistic/revolver/detective/no_mag
 	spawnwithmagazine = FALSE
 
+/obj/item/gun/ballistic/revolver/no_mag
+	spawnwithmagazine = FALSE
+
 /obj/item/gun/ballistic/revolver/mateba
 	name = "\improper Unica 6 auto-revolver"
 	desc = "A high-powered revolver with a unique auto-reloading system. Uses .357 ammo."