Other stuff

cmss13-devs · Sep 9, 2024 · c70fe63 · c70fe63
1 parent d33e1f1
commit c70fe63
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm
@@ -779,6 +779,12 @@ var/global/list/gear_datums_by_name = list()
 	path = /obj/item/storage/large_holster/machete/arnold/weak
 	allowed_origins = USCM_ORIGINS
 
+/datum/gear/weapon/m37
+	display_name = "M37 Shotgun"
+	path = /obj/item/storage/box/guncase/shotgunpump
+	allowed_origins = USCM_ORIGINS
+	cost = 6
+
 /datum/gear/drink
 	category = "Canned drinks"
 

diff --git a/code/modules/cm_marines/equipment/guncases.dm b/code/modules/cm_marines/equipment/guncases.dm
@@ -242,8 +242,6 @@
 
 /obj/item/storage/box/guncase/shotgunpump/fill_preset_inventory()
 	new /obj/item/weapon/gun/shotgun/pump(src)
-	new /obj/item/ammo_magazine/shotgun/buckshot(src)
-	new /obj/item/ammo_magazine/shotgun/slugs(src)
 	new /obj/item/storage/pouch/shotgun(src)
 	new /obj/item/storage/large_holster/m37(src)
 	new /obj/item/attachable/stock/shotgun(src)

diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm
@@ -18118,6 +18118,8 @@
 /obj/structure/machinery/light/double/blue{
 	light_color = "#dae2ff"
 	},
+/obj/structure/surface/table/almayer,
+/obj/item/tool/crowbar,
 /turf/open/floor/almayer,
 /area/golden_arrow/platoonarmory)
 "hbu" = (