diff --git a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_treasure_cove.dmm
index 074afe21a3ea..bcbcf9510bf4 100644
--- a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_treasure_cove.dmm
+++ b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_treasure_cove.dmm
@@ -390,9 +390,9 @@
 	pixel_x = 9;
 	pixel_y = -1
 	},
-/obj/item/gun/ballistic/automatic/assault/p16/minutemen{
-	pixel_y = 7;
-	pixel_x = -9
+/obj/item/gun/ballistic/automatic/assault/p16{
+	pixel_x = -9;
+	pixel_y = 7
 	},
 /turf/open/floor/carpet/red,
 /area/ruin/beach/treasure_cove)
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_mimos.dmm b/_maps/_mod_celadon/shuttles/independent/independent_mimos.dmm
index aab9a699b831..01a30f6f2633 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_mimos.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_mimos.dmm
@@ -626,8 +626,8 @@
 /obj/structure/closet/secure_closet/engineering_personal{
 	req_access = null
 	},
-/obj/item/clothing/suit/space/hardsuit/clown,
 /obj/item/reagent_containers/food/snacks/kebab/rat/double,
+/obj/item/clothing/suit/space/hardsuit,
 /turf/open/floor/plasteel/vaporwave{
 	icon_state = "floorscorched1"
 	},
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm
index 10cfea8033e2..a4282e278891 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm
@@ -1432,7 +1432,7 @@
 /area/ship/crew/cryo)
 "qJ" = (
 /obj/machinery/porta_turret/ship/faction/inteq/ballistic{
-	dir = 9;
+	dir = 9
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -2134,7 +2134,7 @@
 /area/ship/hallway/central)
 "xh" = (
 /obj/machinery/porta_turret/ship/faction/inteq/ballistic{
-	dir = 5;
+	dir = 5
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -3000,7 +3000,7 @@
 /area/ship/engineering)
 "Hu" = (
 /obj/machinery/porta_turret/ship/faction/inteq/ballistic{
-	dir = 6;
+	dir = 6
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -3278,7 +3278,7 @@
 /area/ship/security/armory)
 "Ll" = (
 /obj/machinery/porta_turret/ship/faction/inteq/ballistic{
-	dir = 5;
+	dir = 5
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -3422,19 +3422,19 @@
 /obj/effect/turf_decal/trimline/opaque/yellow/line{
 	dir = 8
 	},
-/obj/item/ammo_box/magazine/gal{
-	pixel_x = -5
-	},
-/obj/item/ammo_box/magazine/gal{
-	pixel_x = 5
-	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
 /obj/machinery/light/small/directional/north,
-/obj/item/gun/ballistic/automatic/marksman/gal/inteq{
-	pixel_x = -8;
-	pixel_y = 3
+/obj/item/gun/ballistic/automatic/marksman/f4/inteq{
+	pixel_y = 3;
+	pixel_x = -8
+	},
+/obj/item/ammo_box/magazine/f4_308{
+	pixel_x = -5
+	},
+/obj/item/ammo_box/magazine/f4_308{
+	pixel_x = 5
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
@@ -3526,7 +3526,7 @@
 /area/ship/cargo)
 "Oa" = (
 /obj/machinery/porta_turret/ship/faction/inteq/ballistic{
-	dir = 6;
+	dir = 6
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -3811,7 +3811,7 @@
 /area/ship/hallway/central)
 "QZ" = (
 /obj/machinery/porta_turret/ship/faction/inteq/ballistic{
-	dir = 10;
+	dir = 10
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm
index ae614c695315..9ea25e7da468 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm
@@ -2791,11 +2791,11 @@
 	},
 /obj/item/ammo_box/magazine/m12g/small,
 /obj/item/storage/toolbox/ammo/a308,
-/obj/item/ammo_box/magazine/gal,
-/obj/item/ammo_box/magazine/gal,
 /obj/item/ammo_box/magazine/m12g/small,
 /obj/item/storage/toolbox/ammo/c9mm,
 /obj/item/storage/toolbox/ammo/c9mm,
+/obj/item/ammo_box/magazine/f4_308,
+/obj/item/ammo_box/magazine/f4_308,
 /turf/open/floor/engine{
 	icon_state = "plastitanium";
 	explosion_block = 7
@@ -6439,11 +6439,11 @@
 	pixel_y = -6
 	},
 /obj/item/gun/ballistic/shotgun/automatic/combat/compact,
-/obj/item/gun/ballistic/automatic/marksman/gal/inteq{
+/obj/item/gun/ballistic/automatic/marksman/f4/inteq{
 	pixel_x = -8;
 	pixel_y = 3
 	},
-/obj/item/gun/ballistic/automatic/marksman/gal/inteq{
+/obj/item/gun/ballistic/automatic/marksman/f4/inteq{
 	pixel_x = -8;
 	pixel_y = 3
 	},
diff --git a/_maps/_mod_celadon/shuttles/pirate/pirate_ember.dmm b/_maps/_mod_celadon/shuttles/pirate/pirate_ember.dmm
index eea4cec74ffa..af0831d13574 100644
--- a/_maps/_mod_celadon/shuttles/pirate/pirate_ember.dmm
+++ b/_maps/_mod_celadon/shuttles/pirate/pirate_ember.dmm
@@ -5630,9 +5630,6 @@
 /area/ship/security/armory)
 "By" = (
 /obj/structure/guncloset,
-/obj/item/gun/ballistic/automatic/smg/mini_uzi{
-	pixel_y = -3
-	},
 /obj/effect/turf_decal/techfloor{
 	dir = 9
 	},
@@ -5642,6 +5639,9 @@
 /obj/item/gun/ballistic/rifle/illestren{
 	pixel_y = 5
 	},
+/obj/item/gun/ballistic/automatic/smg/cm5/compact{
+	pixel_y = -3
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security/armory)
 "Bz" = (
@@ -8932,10 +8932,6 @@
 	pixel_y = 2;
 	pixel_x = -4
 	},
-/obj/item/ammo_box/magazine/uzim9mm{
-	pixel_y = -4
-	},
-/obj/item/ammo_box/magazine/uzim9mm,
 /obj/item/ammo_box/magazine/illestren_a850r,
 /obj/item/ammo_box/magazine/illestren_a850r,
 /obj/item/storage/toolbox/ammo/a850r{
@@ -8946,6 +8942,10 @@
 /obj/item/ammo_box/a44roum_speedloader,
 /obj/item/ammo_box/a44roum_speedloader,
 /obj/item/ammo_box/a44roum_speedloader,
+/obj/item/ammo_box/magazine/cm5_9mm{
+	pixel_y = -4
+	},
+/obj/item/ammo_box/magazine/cm5_9mm,
 /turf/open/floor/plasteel/dark,
 /area/ship/security/armory)
 "Ps" = (
diff --git a/_maps/_mod_celadon/shuttles/pirate/pirate_santiana.dmm b/_maps/_mod_celadon/shuttles/pirate/pirate_santiana.dmm
index 5c03330062dd..e8c86b417a37 100644
--- a/_maps/_mod_celadon/shuttles/pirate/pirate_santiana.dmm
+++ b/_maps/_mod_celadon/shuttles/pirate/pirate_santiana.dmm
@@ -549,13 +549,13 @@
 /area/ship/cargo)
 "bm" = (
 /obj/structure/table,
-/obj/item/ammo_box/magazine/uzim9mm,
 /obj/item/clothing/head/helmet/riot,
 /obj/item/ammo_box/magazine/co9mm{
 	pixel_x = 7;
 	pixel_y = -2
 	},
 /obj/item/melee/baton/loaded,
+/obj/item/ammo_box/magazine/cm5_9mm,
 /turf/open/floor/plasteel/mono,
 /area/ship/security/armory)
 "bn" = (
@@ -985,8 +985,8 @@
 /area/ship/security/armory)
 "ck" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/smg/mini_uzi,
 /obj/item/clothing/suit/pirate,
+/obj/item/gun/ballistic/automatic/smg/cm5/compact,
 /turf/open/floor/plasteel/mono,
 /area/ship/security/armory)
 "cl" = (
diff --git a/_maps/_mod_celadon/shuttles/solfed/solfed_saber.dmm b/_maps/_mod_celadon/shuttles/solfed/solfed_saber.dmm
index fe501db7ace5..7dee02c74f22 100644
--- a/_maps/_mod_celadon/shuttles/solfed/solfed_saber.dmm
+++ b/_maps/_mod_celadon/shuttles/solfed/solfed_saber.dmm
@@ -1837,30 +1837,6 @@
 /area/ship/security/prison)
 "ov" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/assault/p16/minutemen{
-	desc = "Standard Solar Federation rifle. It is a modified version of the p16. 5.56 millimeter caliber.";
-	name = "P16 rifle";
-	pixel_x = -11;
-	pixel_y = 9
-	},
-/obj/item/gun/ballistic/automatic/assault/p16/minutemen{
-	desc = "Standard Solar Federation rifle. It is a modified version of the p16. 5.56 millimeter caliber.";
-	name = "P16 rifle";
-	pixel_x = 4;
-	pixel_y = -6
-	},
-/obj/item/gun/ballistic/automatic/assault/p16/minutemen{
-	desc = "Standard Solar Federation rifle. It is a modified version of the p16. 5.56 millimeter caliber.";
-	name = "P16 rifle";
-	pixel_x = -2;
-	pixel_y = -1
-	},
-/obj/item/gun/ballistic/automatic/assault/p16/minutemen{
-	desc = "Standard Solar Federation rifle. It is a modified version of the p16. 5.56 millimeter caliber.";
-	name = "P16 rifle";
-	pixel_x = -7;
-	pixel_y = 5
-	},
 /obj/effect/turf_decal/box/red,
 /obj/structure/sign/poster/official/help_others{
 	pixel_y = 32
@@ -1873,6 +1849,22 @@
 	dir = 2;
 	req_one_access_txt = "2"
 	},
+/obj/item/gun/ballistic/automatic/assault/p16{
+	pixel_x = -11;
+	pixel_y = 9
+	},
+/obj/item/gun/ballistic/automatic/assault/p16{
+	pixel_x = 4;
+	pixel_y = -6
+	},
+/obj/item/gun/ballistic/automatic/assault/p16{
+	pixel_x = -2;
+	pixel_y = -1
+	},
+/obj/item/gun/ballistic/automatic/assault/p16{
+	pixel_x = -7;
+	pixel_y = 5
+	},
 /turf/open/floor/wood/ebony,
 /area/ship/security/armory)
 "oI" = (