diff --git a/code/modules/cm_marines/equipment/guncases.dm b/code/modules/cm_marines/equipment/guncases.dm
index 0cdc292608..2d1078700b 100644
--- a/code/modules/cm_marines/equipment/guncases.dm
+++ b/code/modules/cm_marines/equipment/guncases.dm
@@ -238,7 +238,7 @@
 	storage_slots = 2
 
 /obj/item/storage/box/guncase/shotgun/pump/special/fill_preset_inventory()
-	new /obj/item/weapon/gun/shotgun/pump/special(src)
+	new /obj/item/weapon/gun/shotgun/pump(src)
 	new /obj/item/ammo_magazine/shotgun/buckshot/special(src)
 
 /obj/item/storage/box/guncase/mk45_automag
diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm
index 8396bd68ce..9428c8f014 100644
--- a/code/modules/projectiles/guns/shotguns.dm
+++ b/code/modules/projectiles/guns/shotguns.dm
@@ -1192,9 +1192,6 @@ can cause issues with ammo types getting mixed up during the burst.
 
 //-------------------------------------------------------
 
-/obj/item/weapon/gun/shotgun/pump/special
-	current_mag = /obj/item/ammo_magazine/internal/shotgun/special
-
 /obj/item/weapon/gun/shotgun/pump/dual_tube
 	name = "generic dual-tube pump shotgun"
 	desc = "A twenty-round pump action shotgun with dual internal tube magazines. You can switch the active internal magazine by toggling the shotgun tube."
diff --git a/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm b/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm
index 0f767d679d..ca183b111d 100644
--- a/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm
+++ b/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm
@@ -330,7 +330,7 @@
 	icon_state = "m79"
 	item_state = "m79"
 	flags_equip_slot = SLOT_BACK
-	preload = /obj/item/explosive/grenade/slug/baton
+	//preload = /obj/item/explosive/grenade/slug/baton
 	is_lobbing = TRUE
 	actions_types = list(/datum/action/item_action/toggle_firing_level)
 
diff --git a/code/modules/projectiles/magazines/shotguns.dm b/code/modules/projectiles/magazines/shotguns.dm
index 01b93432c4..d1017b550a 100644
--- a/code/modules/projectiles/magazines/shotguns.dm
+++ b/code/modules/projectiles/magazines/shotguns.dm
@@ -159,9 +159,6 @@ also doesn't really matter. You can only reload them with handfuls.
 /obj/item/ammo_magazine/internal/shotgun/cmb/m3717
 	max_rounds = 5
 
-/obj/item/ammo_magazine/internal/shotgun/special
-	default_ammo = /datum/ammo/bullet/shotgun/buckshot/special
-
 //-------------------------------------------------------
 
 /*
diff --git a/icons/mob/humans/onmob/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi
index 166b1ca247..b4304566f1 100644
Binary files a/icons/mob/humans/onmob/items_lefthand_1.dmi and b/icons/mob/humans/onmob/items_lefthand_1.dmi differ
diff --git a/icons/mob/humans/onmob/items_righthand_1.dmi b/icons/mob/humans/onmob/items_righthand_1.dmi
index 0ee09c272a..5616390e48 100644
Binary files a/icons/mob/humans/onmob/items_righthand_1.dmi and b/icons/mob/humans/onmob/items_righthand_1.dmi differ
diff --git a/icons/obj/items/weapons/guns/attachments.dmi b/icons/obj/items/weapons/guns/attachments.dmi
index 1753d2d6bf..1bb4e62501 100644
Binary files a/icons/obj/items/weapons/guns/attachments.dmi and b/icons/obj/items/weapons/guns/attachments.dmi differ
diff --git a/icons/obj/items/weapons/guns/attachments/stock.dmi b/icons/obj/items/weapons/guns/attachments/stock.dmi
index 3ff9157feb..a83c838842 100644
Binary files a/icons/obj/items/weapons/guns/attachments/stock.dmi and b/icons/obj/items/weapons/guns/attachments/stock.dmi differ
diff --git a/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi b/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi
index 0c8b652e70..3053b1ee18 100644
Binary files a/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi differ
diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm
index 5c513c1551..56edcea81d 100644
--- a/maps/map_files/golden_arrow/golden_arrow.dmm
+++ b/maps/map_files/golden_arrow/golden_arrow.dmm
@@ -3906,17 +3906,6 @@
 	},
 /turf/open/floor/plating,
 /area/golden_arrow/hangar)
-"oK" = (
-/obj/item/storage/box/guncase/flamer/special{
-	layer = 3.1;
-	pixel_y = 10
-	},
-/obj/structure/surface/rack,
-/obj/item/storage/box/guncase/pumpshotgun,
-/obj/item/ammo_magazine/shotgun/slugs,
-/obj/item/attachable/stock,
-/turf/open/floor/almayer,
-/area/golden_arrow/platoonarmory)
 "oM" = (
 /obj/structure/filingcabinet{
 	density = 0;
@@ -9789,8 +9778,7 @@
 	pixel_y = 10
 	},
 /obj/structure/surface/rack,
-/obj/item/storage/box/guncase/pumpshotgun,
-/obj/item/ammo_magazine/shotgun/slugs,
+/obj/item/storage/box/guncase/shotguncombat,
 /turf/open/floor/almayer,
 /area/golden_arrow/platoonarmory)
 "LQ" = (
@@ -24234,7 +24222,7 @@ EG
 EG
 EG
 HZ
-oK
+LP
 NU
 pI
 Ot
diff --git a/maps/map_files/golden_arrow_classic/golden_arrow_classic.dmm b/maps/map_files/golden_arrow_classic/golden_arrow_classic.dmm
index ab5d87ee73..b53554e736 100644
--- a/maps/map_files/golden_arrow_classic/golden_arrow_classic.dmm
+++ b/maps/map_files/golden_arrow_classic/golden_arrow_classic.dmm
@@ -613,7 +613,7 @@
 /area/golden_arrow/prep_hallway)
 "cV" = (
 /obj/structure/surface/table/almayer,
-/obj/item/storage/box/guncase/pumpshotgun/special,
+/obj/item/storage/box/guncase/shotguncombat,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -4989,7 +4989,7 @@
 	name = "spent snailshot";
 	layer = 2.7
 	},
-/obj/item/storage/box/guncase/pumpshotgun/special,
+/obj/item/storage/box/guncase/shotguncombat,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -6236,7 +6236,6 @@
 "Kp" = (
 /obj/structure/largecrate/supply/motiondetectors,
 /obj/structure/largecrate/supply/explosives/grenades/less{
-	icon_state = "case";
 	pixel_y = 10;
 	pixel_x = 3
 	},
@@ -7126,9 +7125,7 @@
 	},
 /area/golden_arrow/cryo_cells)
 "Pm" = (
-/obj/structure/largecrate/supply/explosives/grenades/less{
-	icon_state = "case"
-	},
+/obj/structure/largecrate/supply/explosives/grenades/less,
 /obj/structure/largecrate/supply/motiondetectors{
 	pixel_y = 10
 	},
diff --git a/maps/map_files/rover/rover.dmm b/maps/map_files/rover/rover.dmm
index 19fc8b60cd..57cc7055ae 100644
--- a/maps/map_files/rover/rover.dmm
+++ b/maps/map_files/rover/rover.dmm
@@ -488,10 +488,12 @@
 /obj/structure/machinery/light{
 	dir = 8
 	},
-/obj/item/weapon/gun/shotgun/pump,
-/obj/item/ammo_magazine/shotgun/buckshot,
-/obj/item/ammo_magazine/shotgun/slugs,
-/obj/item/attachable/stock,
+/obj/item/storage/box/guncase/shotgun/pump{
+	pixel_y = -3
+	},
+/obj/item/storage/box/guncase/shotgun/pump{
+	pixel_y = 5
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},