M37 is now a proper heirloom

code/modules/cm_marines/equipment/guncases.dm

@@ -207,7 +207,7 @@
 
 //------------
 /obj/item/storage/box/guncase/pumpshotgun
-	name = "\improper M37A2 Pump Shotgun case"
+	name = "\improper M37 Pump Shotgun case"
 	desc = "A gun case containing the M37A2 Pump Shotgun."
 	icon_state = "guncase_red"
 	storage_slots = 4
@@ -226,6 +226,8 @@
 				new /obj/item/ammo_magazine/shotgun/slugs(src)
 
 /obj/item/storage/box/guncase/pumpshotgun/special
+	name = "\improper M37 Pump Shotgun case"
+	desc = "A gun case containing a Marine's family heirloom."
 	storage_slots = 2
 
 /obj/item/storage/box/guncase/pumpshotgun/special/fill_preset_inventory()

code/modules/projectiles/guns/shotguns.dm

@@ -1069,12 +1069,12 @@ can cause issues with ammo types getting mixed up during the burst.
 //Shotguns in this category will need to be pumped each shot.
 
 /obj/item/weapon/gun/shotgun/pump
-	name = "\improper M37A2 pump shotgun"
-	desc = "An Armat Battlefield Systems classic design, the M37A2 combines close-range firepower with long term reliability. Requires a pump, which is a Unique Action."
+	name = "\improper M37 pump shotgun"
+	desc = "An Armat Battlefield Systems classic design, the M37A2 combines close-range firepower with long term reliability. Utilizes a pump action system."
 	icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi'
 	icon_state = "m37"
 	item_state = "m37"
-	current_mag = /obj/item/ammo_magazine/internal/shotgun
+	current_mag = /obj/item/ammo_magazine/internal/shotgun/m37
 	flags_equip_slot = SLOT_BACK
 	fire_sound = 'sound/weapons/gun_shotgun.ogg'
 	firesound_volume = 60
@@ -1193,7 +1193,10 @@ can cause issues with ammo types getting mixed up during the burst.
 //-------------------------------------------------------
 
 /obj/item/weapon/gun/shotgun/pump/special
+	name = "\improper M37 pump shotgun"
+	desc = "A nonstandard piece kept around for close encounters. Likely worth a lot to a museum, that's probably not what grandpa wanted. Chambered in twelve gauge and uses a pump action."
 	current_mag = /obj/item/ammo_magazine/internal/shotgun/special
+	starting_attachment_types = list(/obj/item/attachable/stock/shotgun)
 
 /obj/item/weapon/gun/shotgun/pump/dual_tube
 	name = "generic dual-tube pump shotgun"

code/modules/projectiles/magazines/shotguns.dm

@@ -95,9 +95,12 @@ also doesn't really matter. You can only reload them with handfuls.
 	desc = "An internal magazine. It is not supposed to be seen or removed."
 	default_ammo = /datum/ammo/bullet/shotgun/buckshot
 	caliber = "12g"
-	max_rounds = 9
+	max_rounds = 6
 	chamber_closed = 0
 
+/obj/item/ammo_magazine/internal/shotgun/m37
+	max_rounds = 4
+
 /obj/item/ammo_magazine/internal/shotgun/double //For a double barrel.
 	default_ammo = /datum/ammo/bullet/shotgun/buckshot
 	max_rounds = 2
@@ -145,6 +148,7 @@ also doesn't really matter. You can only reload them with handfuls.
 
 /obj/item/ammo_magazine/internal/shotgun/type23/special
 	default_ammo = /datum/ammo/bullet/shotgun/heavy/buckshot/special
+	max_rounds = 4
 
 /obj/item/ammo_magazine/internal/shotgun/cmb
 	default_ammo = /datum/ammo/bullet/shotgun/buckshot
@@ -155,6 +159,7 @@ also doesn't really matter. You can only reload them with handfuls.
 
 /obj/item/ammo_magazine/internal/shotgun/special
 	default_ammo = /datum/ammo/bullet/shotgun/buckshot/special
+	max_rounds = 4
 
 //-------------------------------------------------------
 

maps/map_files/golden_arrow/golden_arrow.dmm

@@ -613,7 +613,6 @@
 /area/golden_arrow/prep_hallway)
 "cV" = (
 /obj/structure/surface/table/almayer,
-/obj/item/storage/box/guncase/pumpshotgun/special,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -4983,13 +4982,6 @@
 /area/golden_arrow/platoon_sergeant)
 "Di" = (
 /obj/structure/surface/table/almayer,
-/obj/item/prop/helmetgarb/spent_slug{
-	pixel_y = -9;
-	pixel_x = 8;
-	name = "spent snailshot";
-	layer = 2.7
-	},
-/obj/item/storage/box/guncase/pumpshotgun/special,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -6229,6 +6221,9 @@
 /obj/item/ammo_magazine/rifle/m4ra/pve,
 /obj/item/ammo_magazine/rifle/m4ra/pve,
 /obj/effect/decal/cleanable/dirt,
+/obj/item/ammo_magazine/rifle/lmg,
+/obj/item/ammo_magazine/rifle/lmg,
+/obj/item/ammo_magazine/rifle/lmg,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -6284,6 +6279,13 @@
 "KK" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/surface/table/almayer,
+/obj/item/storage/box/guncase/pumpshotgun/special,
+/obj/item/prop/helmetgarb/spent_slug{
+	pixel_y = -9;
+	pixel_x = 8;
+	name = "spent snailshot";
+	layer = 2.7
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -8278,6 +8280,7 @@
 /obj/structure/machinery/light{
 	dir = 4
 	},
+/obj/item/weapon/gun/rifle/lmg,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},