diff --git a/code/datums/autolathe/arms.dm b/code/datums/autolathe/arms.dm
index efe5791b11..b40bf27e47 100644
--- a/code/datums/autolathe/arms.dm
+++ b/code/datums/autolathe/arms.dm
@@ -8,29 +8,29 @@
 
 /datum/category_item/autolathe/arms/shotgun_blanks
 	name = "ammunition (12g, blank)"
-	path =/obj/item/ammo_casing/shotgun/blank
+	path =/obj/item/ammo_casing/a12g/blank
 
 /datum/category_item/autolathe/arms/shotgun_beanbag
 	name = "ammunition (12g, beanbag)"
-	path =/obj/item/ammo_casing/shotgun/beanbag
+	path =/obj/item/ammo_casing/a12g/beanbag
 
 /datum/category_item/autolathe/arms/shotgun_flash
 	name = "ammunition (12g, flash)"
-	path =/obj/item/ammo_casing/shotgun/flash
+	path =/obj/item/ammo_casing/a12g/flash
 
 /datum/category_item/autolathe/arms/shotgun
 	name = "ammunition (12g, slug)"
-	path =/obj/item/ammo_casing/shotgun
+	path =/obj/item/ammo_casing/a12g
 	hidden = 1
 
 /datum/category_item/autolathe/arms/shotgun_pellet
 	name = "ammunition (12g, pellet)"
-	path =/obj/item/ammo_casing/shotgun/pellet
+	path =/obj/item/ammo_casing/a12g/pellet
 	hidden = 1
 
 /datum/category_item/autolathe/arms/stunshell
 	name = "ammunition (stun cartridge, shotgun)"
-	path =/obj/item/ammo_casing/shotgun/stunshell
+	path =/obj/item/ammo_casing/a12g/stunshell
 	hidden = 1
 
 //////////////////
@@ -49,119 +49,119 @@
 /////// .45
 /datum/category_item/autolathe/arms/pistol_45
 	name = "pistol magazine (.45)"
-	path =/obj/item/ammo_magazine/c45m
+	path =/obj/item/ammo_magazine/m45
 	hidden = 1
 
 /datum/category_item/autolathe/arms/pistol_45p
 	name = "pistol magazine (.45 practice)"
-	path =/obj/item/ammo_magazine/c45m/practice
+	path =/obj/item/ammo_magazine/m45/practice
 
 /datum/category_item/autolathe/arms/pistol_45r
 	name = "pistol magazine (.45 rubber)"
-	path =/obj/item/ammo_magazine/c45m/rubber
+	path =/obj/item/ammo_magazine/m45/rubber
 
 /datum/category_item/autolathe/arms/pistol_45f
 	name = "pistol magazine (.45 flash)"
-	path =/obj/item/ammo_magazine/c45m/flash
+	path =/obj/item/ammo_magazine/m45/flash
 
 /datum/category_item/autolathe/arms/pistol_45uzi
 	name = "uzi magazine (.45)"
-	path =/obj/item/ammo_magazine/c45uzi
+	path =/obj/item/ammo_magazine/m45uzi
 	hidden = 1
 
 /datum/category_item/autolathe/arms/tommymag
 	name = "Tommygun magazine (.45)"
-	path =/obj/item/ammo_magazine/tommymag
+	path =/obj/item/ammo_magazine/m45tommy
 	hidden = 1
 
 /datum/category_item/autolathe/arms/tommydrum
 	name = "Tommygun drum magazine (.45)"
-	path =/obj/item/ammo_magazine/tommydrum
+	path =/obj/item/ammo_magazine/m45tommydrum
 	hidden = 1
 
 /////// 9mm
 
-/obj/item/ammo_magazine/mc9mm/flash
-	ammo_type =/obj/item/ammo_casing/c9mmf
+/obj/item/ammo_magazine/m9mm/flash
+	ammo_type =/obj/item/ammo_casing/a9mmf
 
-/obj/item/ammo_magazine/mc9mm/rubber
+/obj/item/ammo_magazine/m9mm/rubber
 	name = "magazine (9mm rubber)"
-	ammo_type =/obj/item/ammo_casing/c9mmr
+	ammo_type =/obj/item/ammo_casing/a9mmr
 
-/obj/item/ammo_magazine/mc9mm/practice
+/obj/item/ammo_magazine/m9mm/practice
 	name = "magazine (9mm practice)"
-	ammo_type =/obj/item/ammo_casing/c9mmp
+	ammo_type =/obj/item/ammo_casing/a9mmp
 
 /datum/category_item/autolathe/arms/pistol_9mm
 	name = "pistol magazine (9mm)"
-	path =/obj/item/ammo_magazine/mc9mm
+	path =/obj/item/ammo_magazine/m9mm
 	hidden = 1
 
 /datum/category_item/autolathe/arms/pistol_9mmr
 	name = "pistol magazine (9mm rubber)"
-	path =/obj/item/ammo_magazine/mc9mm/rubber
+	path =/obj/item/ammo_magazine/m9mm/rubber
 
 /datum/category_item/autolathe/arms/pistol_9mmp
 	name = "pistol magazine (9mm practice)"
-	path =/obj/item/ammo_magazine/mc9mm/practice
+	path =/obj/item/ammo_magazine/m9mm/practice
 
 /datum/category_item/autolathe/arms/pistol_9mmf
 	name = "pistol magazine (9mm flash)"
-	path =/obj/item/ammo_magazine/mc9mm/flash
+	path =/obj/item/ammo_magazine/m9mm/flash
 
 /datum/category_item/autolathe/arms/smg_9mm
 	name = "top-mounted SMG magazine (9mm)"
-	path =/obj/item/ammo_magazine/mc9mmt
+	path =/obj/item/ammo_magazine/m9mmt
 	hidden = 1
 
 /datum/category_item/autolathe/arms/smg_9mmr
 	name = "top-mounted SMG magazine (9mm rubber)"
-	path =/obj/item/ammo_magazine/mc9mmt/rubber
+	path =/obj/item/ammo_magazine/m9mmt/rubber
 
 /datum/category_item/autolathe/arms/smg_9mmp
 	name = "top-mounted SMG magazine (9mm practice)"
-	path =/obj/item/ammo_magazine/mc9mmt/practice
+	path =/obj/item/ammo_magazine/m9mmt/practice
 
 /datum/category_item/autolathe/arms/smg_9mmf
 	name = "top-mounted SMG magazine (9mm flash)"
-	path =/obj/item/ammo_magazine/mc9mmt/flash
+	path =/obj/item/ammo_magazine/m9mmt/flash
 
 /////// 10mm
 /datum/category_item/autolathe/arms/smg_10mm
 	name = "SMG magazine (10mm)"
-	path =/obj/item/ammo_magazine/a10mm
+	path =/obj/item/ammo_magazine/m10mm
 	hidden = 1
 
 /datum/category_item/autolathe/arms/pistol_50
 	name = "pistol magazine (.50AE)"
-	path =/obj/item/ammo_magazine/a50
+	path =/obj/item/ammo_magazine/m50
 	hidden = 1
 
 /////// 5.56mm
 /datum/category_item/autolathe/arms/rifle_556
 	name = "rifle magazine (5.56mm)"
-	path =/obj/item/ammo_magazine/c556
+	path =/obj/item/ammo_magazine/m556
 	hidden = 1
 
 /datum/category_item/autolathe/arms/rifle_556p
 	name = "rifle magazine (5.56mm practice)"
-	path =/obj/item/ammo_magazine/c556/practice
+	path =/obj/item/ammo_magazine/m556/practice
 
 /datum/category_item/autolathe/arms/machinegun_556
 	name = "machinegun box magazine (5.56)"
-	path =/obj/item/ammo_magazine/a556
+	path =/obj/item/ammo_magazine/m556saw
 	hidden = 1
 /////// 7.62
 
 
 /datum/category_item/autolathe/arms/rifle_762
 	name = "rifle magazine (7.62mm)"
-	path =/obj/item/ammo_magazine/c762
+	path =/obj/item/ammo_magazine/m762
 	hidden = 1
 
 /datum/category_item/autolathe/arms/shotgun_magazine
 	name = "24rnd shotgun magazine (12g)"
-	path =/obj/item/ammo_magazine/g12
+	path =/obj/item/ammo_magazine/m12gdrum
 	hidden = 1
 
 /*
@@ -188,57 +188,57 @@
 
 /datum/category_item/autolathe/arms/pistol_45
 	name = "pistol magazine (.45)"
-	path =/obj/item/ammo_magazine/c45m/empty
+	path =/obj/item/ammo_magazine/m45/empty
 	category = "Arms and Ammunition"
 
 /datum/category_item/autolathe/arms/pistol_45uzi
 	name = "uzi magazine (.45)"
-	path =/obj/item/ammo_magazine/c45uzi/empty
+	path =/obj/item/ammo_magazine/m45uzi/empty
 	category = "Arms and Ammunition"
 	hidden = 1
 
 /datum/category_item/autolathe/arms/tommymag
 	name = "Tommygun magazine (.45)"
-	path =/obj/item/ammo_magazine/tommymag/empty
+	path =/obj/item/ammo_magazine/m45tommy/empty
 	category = "Arms and Ammunition"
 	hidden = 1
 
 /datum/category_item/autolathe/arms/tommydrum
 	name = "Tommygun drum magazine (.45)"
-	path =/obj/item/ammo_magazine/tommydrum/empty
+	path =/obj/item/ammo_magazine/m45tommydrum/empty
 	category = "Arms and Ammunition"
 	hidden = 1
 
 /datum/category_item/autolathe/arms/pistol_9mm
 	name = "pistol magazine (9mm)"
-	path =/obj/item/ammo_magazine/mc9mm/empty
+	path =/obj/item/ammo_magazine/m9mm/empty
 	category = "Arms and Ammunition"
 
 /datum/category_item/autolathe/arms/smg_9mm
 	name = "top-mounted SMG magazine (9mm)"
-	path =/obj/item/ammo_magazine/mc9mmt/empty
+	path =/obj/item/ammo_magazine/m9mmt/empty
 	category = "Arms and Ammunition"
 
 /datum/category_item/autolathe/arms/smg_10mm
 	name = "SMG magazine (10mm)"
-	path =/obj/item/ammo_magazine/a10mm/empty
+	path =/obj/item/ammo_magazine/m10mm/empty
 	category = "Arms and Ammunition"
 	hidden = 1
 
 /datum/category_item/autolathe/arms/pistol_50
 	name = "pistol magazine (.50AE)"
-	path =/obj/item/ammo_magazine/a50/empty
+	path =/obj/item/ammo_magazine/m50/empty
 	category = "Arms and Ammunition"
 	hidden = 1
 
 /datum/category_item/autolathe/arms/rifle_556
 	name = "10rnd rifle magazine (5.56mm)"
-	path =/obj/item/ammo_magazine/a556/empty
+	path =/obj/item/ammo_magazine/m556saw/empty
 	category = "Arms and Ammunition"
 
 /datum/category_item/autolathe/arms/rifle_556m
 	name = "20rnd rifle magazine (5.56mm)"
-	path =/obj/item/ammo_magazine/a556m/empty
+	path =/obj/item/ammo_magazine/m556sawm/empty
 	category = "Arms and Ammunition"
 	hidden = 1
 
@@ -250,7 +250,7 @@
 
 /datum/category_item/autolathe/arms/rifle_762
 	name = "20rnd rifle magazine (7.62mm)"
-	path =/obj/item/ammo_magazine/c762/empty
+	path =/obj/item/ammo_magazine/m762/empty
 	category = "Arms and Ammunition"
 	hidden = 1
 
@@ -262,7 +262,7 @@
 
 /datum/category_item/autolathe/arms/shotgun_magazine
 	name = "24rnd shotgun magazine (12g)"
-	path =/obj/item/ammo_magazine/g12/empty
+	path =/obj/item/ammo_magazine/m12gdrum/empty
 	category = "Arms and Ammunition"
 	hidden = 1*/
 
@@ -272,17 +272,17 @@
 
 /datum/category_item/autolathe/arms/speedloader_357
 	name = "speedloader (.357)"
-	path =/obj/item/ammo_magazine/a357
+	path =/obj/item/ammo_magazine/s357
 	hidden = 1
 
 /datum/category_item/autolathe/arms/speedloader_38
 	name = "speedloader (.38)"
-	path =/obj/item/ammo_magazine/c38
+	path =/obj/item/ammo_magazine/s38
 	hidden = 1
 
 /datum/category_item/autolathe/arms/speedloader_38r
 	name = "speedloader (.38 rubber)"
-	path =/obj/item/ammo_magazine/c38/rubber
+	path =/obj/item/ammo_magazine/s38/rubber
 
 // Commented out until metal exploits with autolathe is fixed.
 /*/datum/category_item/autolathe/arms/pistol_clip_45
@@ -335,35 +335,35 @@
 
 /datum/category_item/autolathe/arms/pistol_clip_10mm
 	name = "ammo clip (10mm)"
-	path =/obj/item/ammo_magazine/clip/a10mm
+	path =/obj/item/ammo_magazine/clip/c10mm
 	category = "Arms and Ammunition"
 	hidden = 1
 
 /datum/category_item/autolathe/arms/pistol_clip_50
 	name = "ammo clip (.50AE)"
-	path =/obj/item/ammo_magazine/clip/a50
+	path =/obj/item/ammo_magazine/clip/c50
 	category = "Arms and Ammunition"
 	hidden = 1
 */
 /datum/category_item/autolathe/arms/rifle_clip_556
 	name = "ammo clip (5.56mm)"
-	path =/obj/item/ammo_magazine/clip/a556
+	path =/obj/item/ammo_magazine/clip/c556
 	category = "Arms and Ammunition"
 	hidden = 1
 
 /datum/category_item/autolathe/arms/rifle_clip_556_practice
 	name = "ammo clip (5.56mm practice)"
-	path =/obj/item/ammo_magazine/clip/a556/practice
+	path =/obj/item/ammo_magazine/clip/c556/practice
 	category = "Arms and Ammunition"
 
 /datum/category_item/autolathe/arms/rifle_clip_762
 	name = "ammo clip (7.62mm)"
-	path =/obj/item/ammo_magazine/clip/a762
+	path =/obj/item/ammo_magazine/clip/c762
 	hidden = 1
 
 /datum/category_item/autolathe/arms/rifle_clip_762_practice
 	name = "ammo clip (7.62mm practice)"
-	path =/obj/item/ammo_magazine/clip/a762/practice
+	path =/obj/item/ammo_magazine/clip/c762/practice
 
 /datum/category_item/autolathe/arms/knuckledusters
 	name = "knuckle dusters"
diff --git a/code/datums/supplypacks/contraband.dm b/code/datums/supplypacks/contraband.dm
index 0c7fd3f4ed..c200e2edda 100644
--- a/code/datums/supplypacks/contraband.dm
+++ b/code/datums/supplypacks/contraband.dm
@@ -47,7 +47,7 @@
  	name = "Surplus militia rifles"
  	contains = list(
  			/obj/item/weapon/gun/projectile/shotgun/pump/rifle/mosin = 3,
- 			/obj/item/ammo_magazine/clip/a762 = 6
+ 			/obj/item/ammo_magazine/clip/c762 = 6
  			)
  	cost = 50
  	contraband = 1
diff --git a/code/datums/supplypacks/munitions.dm b/code/datums/supplypacks/munitions.dm
index e2df9609ad..d0635ffce6 100644
--- a/code/datums/supplypacks/munitions.dm
+++ b/code/datums/supplypacks/munitions.dm
@@ -27,7 +27,7 @@
 	name = "Flare guns crate"
 	contains = list(
 			/obj/item/weapon/gun/projectile/sec/flash,
-			/obj/item/ammo_magazine/c45m/flash,
+			/obj/item/ammo_magazine/m45/flash,
 			/obj/item/weapon/gun/projectile/shotgun/doublebarrel/flare,
 			/obj/item/weapon/storage/box/flashshells
 			)
@@ -129,7 +129,7 @@
  	contains = list(
  			/obj/item/device/assembly/timer,
  			/obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice = 2,
- 			/obj/item/ammo_magazine/clip/a762/practice = 4,
+ 			/obj/item/ammo_magazine/clip/c762/practice = 4,
  			/obj/item/target = 2,
  			/obj/item/target/alien = 2,
  			/obj/item/target/syndicate = 2
@@ -154,9 +154,9 @@
 	name = "Automatic weapon ammunition crate"
 	num_contained = 6
 	contains = list(
-			/obj/item/ammo_magazine/mc9mmt,
-			/obj/item/ammo_magazine/mc9mmt/rubber,
-			/obj/item/ammo_magazine/a556
+			/obj/item/ammo_magazine/m9mmt,
+			/obj/item/ammo_magazine/m9mmt/rubber,
+			/obj/item/ammo_magazine/m556saw
 			)
 	cost = 25
 	containertype = /obj/structure/closet/crate/secure
diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm
index 4aefe349fd..03f1296ad9 100644
--- a/code/datums/uplink/ammunition.dm
+++ b/code/datums/uplink/ammunition.dm
@@ -8,36 +8,36 @@
 
 /datum/uplink_item/item/ammo/a357
 	name = ".357 Speedloader"
-	path = /obj/item/ammo_magazine/a357
+	path = /obj/item/ammo_magazine/s357
 
 /datum/uplink_item/item/ammo/mc9mm
 	name = "Pistol Magazine (9mm)"
-	path = /obj/item/ammo_magazine/mc9mm
+	path = /obj/item/ammo_magazine/m9mm
 
 /datum/uplink_item/item/ammo/c45m
 	name = "Pistol Magazine (.45)"
-	path = /obj/item/ammo_magazine/c45m
+	path = /obj/item/ammo_magazine/m45
 
 /datum/uplink_item/item/ammo/c45map
 	name = "Pistol Magazine (.45 AP)"
-	path = /obj/item/ammo_magazine/c45m/ap
+	path = /obj/item/ammo_magazine/m45/ap
 
 /datum/uplink_item/item/ammo/tommymag
 	name = "Tommygun Magazine (.45)"
-	path = /obj/item/ammo_magazine/tommymag
+	path = /obj/item/ammo_magazine/m45tommy
 
 /datum/uplink_item/item/ammo/tommymagap
 	name = "Tommygun Magazine (.45 AP)"
-	path = /obj/item/ammo_magazine/tommymag/ap
+	path = /obj/item/ammo_magazine/m45tommy/ap
 
 /datum/uplink_item/item/ammo/tommydrum
 	name = "Tommygun Drum Magazine (.45)"
-	path = /obj/item/ammo_magazine/tommydrum
+	path = /obj/item/ammo_magazine/m45tommydrum
 	item_cost = 40
 
 /datum/uplink_item/item/ammo/tommydrumap
 	name = "Tommygun Drum Magazine (.45 AP)"
-	path = /obj/item/ammo_magazine/tommydrum/ap
+	path = /obj/item/ammo_magazine/m45tommydrum/ap
 
 /datum/uplink_item/item/ammo/darts
 	name = "Darts"
@@ -50,39 +50,39 @@
 
 /datum/uplink_item/item/ammo/c556
 	name = "Rifle Magazine (5.56mm)"
-	path = /obj/item/ammo_magazine/c556
+	path = /obj/item/ammo_magazine/m556
 
 /datum/uplink_item/item/ammo/c556/ext
 	name = "Rifle Magazine (5.56mm Extended)"
-	path = /obj/item/ammo_magazine/c556/ext
+	path = /obj/item/ammo_magazine/m556/ext
 
 /datum/uplink_item/item/ammo/c556/ap
 	name = "Rifle Magazine (5.56mm AP)"
-	path = /obj/item/ammo_magazine/c556/ap
+	path = /obj/item/ammo_magazine/m556/ap
 
 /datum/uplink_item/item/ammo/c556/ap/ext
 	name = "Rifle Magazine (5.56mm AP Extended)"
-	path = /obj/item/ammo_magazine/c556/ap/ext
+	path = /obj/item/ammo_magazine/m556/ap/ext
 
 /datum/uplink_item/item/ammo/c762
 	name = "Rifle Magazine (7.62mm)"
-	path = /obj/item/ammo_magazine/c762
+	path = /obj/item/ammo_magazine/m762
 
 /datum/uplink_item/item/ammo/c762/ap
 	name = "Rifle Magazine (7.62mm AP)"
-	path = /obj/item/ammo_magazine/c762/ap
+	path = /obj/item/ammo_magazine/m762/ap
 
 /datum/uplink_item/item/ammo/a10mm
 	name = "SMG Magazine (10mm)"
-	path = /obj/item/ammo_magazine/a10mm
+	path = /obj/item/ammo_magazine/m10mm
 
 /datum/uplink_item/item/ammo/a556
 	name = "Machinegun Magazine (5.56mm)"
-	path = /obj/item/ammo_magazine/a556
+	path = /obj/item/ammo_magazine/m556saw
 
 /datum/uplink_item/item/ammo/a556/ap
 	name = "Machinegun Magazine (5.56mm AP)"
-	path = /obj/item/ammo_magazine/a556/ap
+	path = /obj/item/ammo_magazine/m556saw/ap
 
 /datum/uplink_item/item/ammo/g12
 	name = "12g Shotgun Ammo Box (Slug)"
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index 2953f0de87..50d6988e35 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -144,7 +144,7 @@
 	if(is_robot_module(O))
 		return 0
 
-	if(istype(O,/obj/item/ammo_magazine/clip) || istype(O,/obj/item/ammo_magazine/a357) || istype(O,/obj/item/ammo_magazine/c38)) // Prevents ammo recycling exploit with speedloaders.
+	if(istype(O,/obj/item/ammo_magazine/clip) || istype(O,/obj/item/ammo_magazine/s357) || istype(O,/obj/item/ammo_magazine/s38)) // Prevents ammo recycling exploit with speedloaders.
 		user << "\The [O] is too hazardous to recycle with the autolathe!"
 		return
 		/*  ToDo: Make this actually check for ammo and change the value of the magazine if it's empty. -Spades
@@ -262,7 +262,7 @@
 				stored_material[material] = max(0, stored_material[material] - round(making.resources[material] * mat_efficiency) * multiplier)
 
 		update_icon() // So lid closes
-		
+
 		sleep(build_time)
 
 		busy = 0
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 06fd49d0e3..dfa4f61ba1 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -124,7 +124,7 @@
 		/obj/item/weapon/handcuffs,
 		/obj/item/device/flash,
 		/obj/item/clothing/glasses,
-		/obj/item/ammo_casing/shotgun,
+		/obj/item/ammo_casing/a12g,
 		/obj/item/ammo_magazine,
 		/obj/item/weapon/cell/device,
 		/obj/item/weapon/reagent_containers/food/snacks/donut/,
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 8eab766dba..c33e26d809 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -136,12 +136,12 @@
 /obj/item/weapon/storage/box/blanks/New()
 	..()
 	for(var/i = 1 to 8)
-		new /obj/item/ammo_casing/shotgun/blank(src)
+		new /obj/item/ammo_casing/a12g/blank(src)
 
 /obj/item/weapon/storage/box/blanks/large/New()
 	..()
 	for(var/i = 1 to 8)
-		new /obj/item/ammo_casing/shotgun/blank(src)
+		new /obj/item/ammo_casing/a12g/blank(src)
 
 /obj/item/weapon/storage/box/beanbags
 	name = "box of beanbag shells"
@@ -152,12 +152,12 @@
 /obj/item/weapon/storage/box/beanbags/New()
 	..()
 	for(var/i = 1 to 8)
-		new /obj/item/ammo_casing/shotgun/beanbag(src)
+		new /obj/item/ammo_casing/a12g/beanbag(src)
 
 /obj/item/weapon/storage/box/beanbags/large/New()
 	..()
 	for(var/i = 1 to 8)
-		new /obj/item/ammo_casing/shotgun/beanbag(src)
+		new /obj/item/ammo_casing/a12g/beanbag(src)
 
 /obj/item/weapon/storage/box/shotgunammo
 	name = "box of shotgun slugs"
@@ -168,12 +168,12 @@
 /obj/item/weapon/storage/box/shotgunammo/New()
 	..()
 	for(var/i = 1 to 8)
-		new /obj/item/ammo_casing/shotgun(src)
+		new /obj/item/ammo_casing/a12g(src)
 
 /obj/item/weapon/storage/box/shotgunammo/large/New()
 	..()
 	for(var/i = 1 to 8)
-		new /obj/item/ammo_casing/shotgun(src)
+		new /obj/item/ammo_casing/a12g(src)
 
 /obj/item/weapon/storage/box/shotgunshells
 	name = "box of shotgun shells"
@@ -184,12 +184,12 @@
 /obj/item/weapon/storage/box/shotgunshells/New()
 	..()
 	for(var/i = 1 to 8)
-		new /obj/item/ammo_casing/shotgun/pellet(src)
+		new /obj/item/ammo_casing/a12g/pellet(src)
 
 /obj/item/weapon/storage/box/shotgunshells/large/New()
 	..()
 	for(var/i = 1 to 8)
-		new /obj/item/ammo_casing/shotgun/pellet(src)
+		new /obj/item/ammo_casing/a12g/pellet(src)
 
 /obj/item/weapon/storage/box/flashshells
 	name = "box of illumination shells"
@@ -200,12 +200,12 @@
 /obj/item/weapon/storage/box/flashshells/New()
 	..()
 	for(var/i = 1 to 8)
-		new /obj/item/ammo_casing/shotgun/flash(src)
+		new /obj/item/ammo_casing/a12g/flash(src)
 
 /obj/item/weapon/storage/box/flashshells/large/New()
 	..()
 	for(var/i = 1 to 8)
-		new /obj/item/ammo_casing/shotgun/flash(src)
+		new /obj/item/ammo_casing/a12g/flash(src)
 
 /obj/item/weapon/storage/box/stunshells
 	name = "box of stun shells"
@@ -216,12 +216,12 @@
 /obj/item/weapon/storage/box/stunshells/New()
 	..()
 	for(var/i = 1 to 8)
-		new /obj/item/ammo_casing/shotgun/stunshell(src)
+		new /obj/item/ammo_casing/a12g/stunshell(src)
 
 /obj/item/weapon/storage/box/stunshells/large/New()
 	..()
 	for(var/i = 1 to 8)
-		new /obj/item/ammo_casing/shotgun/stunshell(src)
+		new /obj/item/ammo_casing/a12g/stunshell(src)
 
 /obj/item/weapon/storage/box/practiceshells
 	name = "box of practice shells"
@@ -232,12 +232,12 @@
 /obj/item/weapon/storage/box/practiceshells/New()
 	..()
 	for(var/i = 1 to 8)
-		new /obj/item/ammo_casing/shotgun/practice(src)
+		new /obj/item/ammo_casing/a12g/practice(src)
 
 /obj/item/weapon/storage/box/practiceshells/large/New()
 	..()
 	for(var/i = 1 to 8)
-		new /obj/item/ammo_casing/shotgun/practice(src)
+		new /obj/item/ammo_casing/a12g/practice(src)
 
 /obj/item/weapon/storage/box/empshells
 	name = "box of emp shells"
@@ -248,12 +248,12 @@
 /obj/item/weapon/storage/box/empshells/New()
 	..()
 	for(var/i = 1 to 8)
-		new /obj/item/ammo_casing/shotgun/emp(src)
+		new /obj/item/ammo_casing/a12g/emp(src)
 
 /obj/item/weapon/storage/box/empshells/large/New()
 	..()
 	for(var/i = 1 to 8)
-		new /obj/item/ammo_casing/shotgun/emp(src)
+		new /obj/item/ammo_casing/a12g/emp(src)
 
 /obj/item/weapon/storage/box/sniperammo
 	name = "box of 14.5mm shells"
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index 573325e079..d5ac595c1e 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -27,7 +27,7 @@
 
 			if("guns")
 				new /obj/item/weapon/gun/projectile/revolver(src)
-				new /obj/item/ammo_magazine/a357(src)
+				new /obj/item/ammo_magazine/s357(src)
 				new /obj/item/weapon/card/emag(src)
 				new /obj/item/weapon/plastique(src)
 				new /obj/item/weapon/plastique(src)
diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm
index 75c0d5830f..5dba97befb 100644
--- a/code/game/objects/random/random.dm
+++ b/code/game/objects/random/random.dm
@@ -285,11 +285,11 @@
 				prob(2);/obj/item/weapon/storage/box/shotgunammo,
 				prob(4);/obj/item/weapon/storage/box/shotgunshells,
 				prob(1);/obj/item/weapon/storage/box/stunshells,
-				prob(2);/obj/item/ammo_magazine/c45m,
-				prob(4);/obj/item/ammo_magazine/c45m/rubber,
-				prob(4);/obj/item/ammo_magazine/c45m/flash,
-				prob(2);/obj/item/ammo_magazine/mc9mmt,
-				prob(6);/obj/item/ammo_magazine/mc9mmt/rubber)
+				prob(2);/obj/item/ammo_magazine/m45,
+				prob(4);/obj/item/ammo_magazine/m45/rubber,
+				prob(4);/obj/item/ammo_magazine/m45/flash,
+				prob(2);/obj/item/ammo_magazine/m9mmt,
+				prob(6);/obj/item/ammo_magazine/m9mmt/rubber)
 
 
 /obj/random/action_figure
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index dc80d17827..a80ceb3580 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -217,7 +217,7 @@
 		new /obj/item/clothing/accessory/storage/black_vest(src)
 		new /obj/item/clothing/head/soft/sec/corp(src)
 		new /obj/item/clothing/under/rank/security/corp(src)
-		new /obj/item/ammo_magazine/c45m/rubber(src)
+		new /obj/item/ammo_magazine/m45/rubber(src)
 		new /obj/item/weapon/gun/energy/taser(src)
 		new /obj/item/weapon/cell/device/weapon(src)
 		new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
@@ -277,8 +277,8 @@
 		new /obj/item/device/radio/headset/headset_sec(src)
 		new /obj/item/device/radio/headset/headset_sec/alt(src)
 		new /obj/item/clothing/suit/storage/vest/detective(src)
-		new /obj/item/ammo_magazine/c45m/rubber(src)
-		new /obj/item/ammo_magazine/c45m/rubber(src)
+		new /obj/item/ammo_magazine/m45/rubber(src)
+		new /obj/item/ammo_magazine/m45/rubber(src)
 		new /obj/item/taperoll/police(src)
 		new /obj/item/weapon/gun/projectile/colt/detective(src)
 		new /obj/item/clothing/accessory/holster/armpit(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
index 98f6138f68..906e46dbe1 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -42,11 +42,11 @@
 /obj/structure/closet/syndicate/nuclear/New()
 	..()
 
-	new /obj/item/ammo_magazine/a10mm(src)
-	new /obj/item/ammo_magazine/a10mm(src)
-	new /obj/item/ammo_magazine/a10mm(src)
-	new /obj/item/ammo_magazine/a10mm(src)
-	new /obj/item/ammo_magazine/a10mm(src)
+	new /obj/item/ammo_magazine/m10mm(src)
+	new /obj/item/ammo_magazine/m10mm(src)
+	new /obj/item/ammo_magazine/m10mm(src)
+	new /obj/item/ammo_magazine/m10mm(src)
+	new /obj/item/ammo_magazine/m10mm(src)
 	new /obj/item/weapon/storage/box/handcuffs(src)
 	new /obj/item/weapon/storage/box/flashbangs(src)
 	new /obj/item/weapon/gun/energy/gun(src)
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 82206fdc30..bd6d1ea4d0 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -480,7 +480,7 @@
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/det(M), slot_head)
 
 			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver(M), slot_r_hand)
-			M.equip_to_slot_or_del(new /obj/item/ammo_magazine/a357(M), slot_l_store)
+			M.equip_to_slot_or_del(new /obj/item/ammo_magazine/s357(M), slot_l_store)
 
 		if ("tournament chef") //Steven Seagal FTW
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chef(M), slot_w_uniform)
@@ -592,7 +592,7 @@
 				sec_briefcase.contents += new /obj/item/weapon/spacecash/c1000
 			sec_briefcase.contents += new /obj/item/weapon/gun/energy/crossbow
 			sec_briefcase.contents += new /obj/item/weapon/gun/projectile/revolver/mateba
-			sec_briefcase.contents += new /obj/item/ammo_magazine/a357
+			sec_briefcase.contents += new /obj/item/ammo_magazine/s357
 			sec_briefcase.contents += new /obj/item/weapon/plastique
 			M.equip_to_slot_or_del(sec_briefcase, slot_l_hand)
 
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index a8987538ab..c887ff5b9b 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -332,7 +332,7 @@ proc/check_panel(mob/M)
 		qdel(O)
 	return
 
-var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/item/ammo_magazine/a357,\
+var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/item/ammo_magazine/s357,\
 	/obj/item/weapon/gun/energy/crossbow, /obj/item/weapon/melee/energy/sword,\
 	/obj/item/weapon/storage/box/syndicate, /obj/item/weapon/storage/box/emps,\
 	/obj/item/weapon/cartridge/syndicate, /obj/item/clothing/under/chameleon,\
diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/magazines.dm
similarity index 57%
rename from code/modules/projectiles/ammunition/boxes.dm
rename to code/modules/projectiles/ammunition/magazines.dm
index 8a259b6342..6202e03cde 100644
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -1,493 +1,514 @@
-///////// .357 /////////
-
-/obj/item/ammo_magazine/a357
-	name = "speedloader (.357)"
-	desc = "A speedloader for .357 revolvers."
-	icon_state = "38"
-	caliber = "357"
-	ammo_type = /obj/item/ammo_casing/a357
-	matter = list(DEFAULT_WALL_MATERIAL = 1260)
-	max_ammo = 6
-	multiple_sprites = 1
-
-///////// .38 /////////
-
-/obj/item/ammo_magazine/c38
-	name = "speedloader (.38)"
-	desc = "A speedloader for .38 revolvers."
-	icon_state = "38"
-	caliber = "38"
-	matter = list(DEFAULT_WALL_MATERIAL = 360)
-	ammo_type = /obj/item/ammo_casing/c38
-	max_ammo = 6
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/c38/rubber
-	name = "speedloader (.38 rubber)"
-	ammo_type = /obj/item/ammo_casing/c38r
-
-/obj/item/ammo_magazine/c38/emp
-	name = "ammunition box (.38 haywire)"
-	ammo_type = /obj/item/ammo_casing/c38/emp
-
-///////// .45 /////////
-
-/obj/item/ammo_magazine/c45m
-	name = "pistol magazine (.45)"
-	icon_state = "45"
-	mag_type = MAGAZINE
-	ammo_type = /obj/item/ammo_casing/c45
-	matter = list(DEFAULT_WALL_MATERIAL = 525) //metal costs are very roughly based around 1 .45 casing = 75 metal
-	caliber = ".45"
-	max_ammo = 7
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/c45m/empty
-	initial_ammo = 0
-
-/obj/item/ammo_magazine/c45m/rubber
-	name = "magazine (.45 rubber)"
-	ammo_type = /obj/item/ammo_casing/c45r
-
-/obj/item/ammo_magazine/c45m/practice
-	name = "magazine (.45 practice)"
-	ammo_type = /obj/item/ammo_casing/c45p
-
-/obj/item/ammo_magazine/c45m/flash
-	name = "magazine (.45 flash)"
-	ammo_type = /obj/item/ammo_casing/c45f
-
-/obj/item/ammo_magazine/c45m/ap
-	name = "magazine (.45 AP)"
-	ammo_type = /obj/item/ammo_casing/c45ap
-
-/obj/item/ammo_magazine/box/emp/c45
-	name = "ammunition box (.45 haywire)"
-	ammo_type = /obj/item/ammo_casing/c45/emp
-
-/obj/item/ammo_magazine/c45uzi
-	name = "stick magazine (.45)"
-	icon_state = "uzi45"
-	mag_type = MAGAZINE
-	ammo_type = /obj/item/ammo_casing/c45
-	matter = list(DEFAULT_WALL_MATERIAL = 1200)
-	caliber = ".45"
-	max_ammo = 16
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/c45uzi/empty
-	initial_ammo = 0
-
-/obj/item/ammo_magazine/tommymag
-	name = "tommygun magazine (.45)"
-	icon_state = "tommy-mag"
-	mag_type = MAGAZINE
-	ammo_type = /obj/item/ammo_casing/c45
-	matter = list(DEFAULT_WALL_MATERIAL = 1500)
-	caliber = ".45"
-	max_ammo = 20
-
-/obj/item/ammo_magazine/tommymag/ap
-	name = "tommygun magazine (.45 AP)"
-	ammo_type = /obj/item/ammo_casing/c45ap
-
-/obj/item/ammo_magazine/tommymag/empty
-	initial_ammo = 0
-
-/obj/item/ammo_magazine/tommydrum
-	name = "tommygun drum magazine (.45)"
-	icon_state = "tommy-drum"
-	w_class = ITEMSIZE_NORMAL // Bulky ammo doesn't fit in your pockets!
-	mag_type = MAGAZINE
-	ammo_type = /obj/item/ammo_casing/c45
-	matter = list(DEFAULT_WALL_MATERIAL = 3750)
-	caliber = ".45"
-	max_ammo = 50
-
-/obj/item/ammo_magazine/tommydrum/ap
-	name = "tommygun drum magazine (.45 AP)"
-	ammo_type = /obj/item/ammo_casing/c45ap
-
-/obj/item/ammo_magazine/tommydrum/empty
-	initial_ammo = 0
-
-/obj/item/ammo_magazine/clip/c45
-	name = "ammo clip (.45)"
-	icon_state = "clip_pistol"
-	desc = "A stripper clip for reloading .45 rounds into magazines."
-	caliber = ".45"
-	ammo_type = /obj/item/ammo_casing/c45
-	matter = list(DEFAULT_WALL_MATERIAL = 675) // metal costs very roughly based around one .45 casing = 75 metal
-	max_ammo = 9
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/clip/c45/rubber
-	name = "ammo clip (.45 rubber)"
-	ammo_type = /obj/item/ammo_casing/c45r
-
-/obj/item/ammo_magazine/clip/c45/practice
-	name = "ammo clip (.45 practice)"
-	ammo_type = /obj/item/ammo_casing/c45p
-
-/obj/item/ammo_magazine/clip/c45/flash
-	name = "ammo clip (.45 flash)"
-	ammo_type = /obj/item/ammo_casing/c45f
-
-///////// 9mm /////////
-
-/obj/item/ammo_magazine/mc9mm
-	name = "magazine (9mm)"
-	icon_state = "9x19p"
-	origin_tech = list(TECH_COMBAT = 2)
-	mag_type = MAGAZINE
-	matter = list(DEFAULT_WALL_MATERIAL = 480)
-	caliber = "9mm"
-	ammo_type = /obj/item/ammo_casing/c9mm
-	max_ammo = 8
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/mc9mm/empty
-	initial_ammo = 0
-
-/obj/item/ammo_magazine/mc9mm/flash
-	ammo_type = /obj/item/ammo_casing/c9mmf
-
-/obj/item/ammo_magazine/mc9mm/rubber
-	name = "magazine (9mm rubber)"
-	ammo_type = /obj/item/ammo_casing/c9mmr
-
-/obj/item/ammo_magazine/mc9mm/practice
-	name = "magazine (9mm practice)"
-	ammo_type = /obj/item/ammo_casing/c9mmp
-
-/obj/item/ammo_magazine/mc9mmt
-	name = "top mounted magazine (9mm)"
-	icon_state = "9mmt"
-	mag_type = MAGAZINE
-	ammo_type = /obj/item/ammo_casing/c9mm
-	matter = list(DEFAULT_WALL_MATERIAL = 1200)
-	caliber = "9mm"
-	max_ammo = 20
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/mc9mmt/empty
-	initial_ammo = 0
-
-/obj/item/ammo_magazine/mc9mmt/rubber
-	name = "top mounted magazine (9mm rubber)"
-	ammo_type = /obj/item/ammo_casing/c9mmr
-
-/obj/item/ammo_magazine/mc9mmt/flash
-	name = "top mounted magazine (9mm flash)"
-	ammo_type = /obj/item/ammo_casing/c9mmf
-
-/obj/item/ammo_magazine/mc9mmt/practice
-	name = "top mounted magazine (9mm practice)"
-	ammo_type = /obj/item/ammo_casing/c9mmp
-
-/obj/item/ammo_magazine/p90
-	name = "high capacity top mounted magazine (9mm armor-piercing)"
-	icon_state = "p90"
-	mag_type = MAGAZINE
-	ammo_type = /obj/item/ammo_casing/c9mm/ap
-	matter = list(DEFAULT_WALL_MATERIAL = 3000)
-	caliber = "9mm"
-	max_ammo = 50
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/p90/empty
-	initial_ammo = 0
-
-/obj/item/ammo_magazine/clip/c9mm
-	name = "ammo clip (9mm)"
-	icon_state = "clip_pistol"
-	desc = "A stripper clip for reloading 9mm rounds into magazines."
-	caliber = "9mm"
-	ammo_type = /obj/item/ammo_casing/c9mm
-	matter = list(DEFAULT_WALL_MATERIAL = 540) // metal costs are very roughly based around one 9mm casing = 60 metal
-	max_ammo = 9
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/clip/c9mm/rubber
-	name = "ammo clip (.45 rubber)"
-	ammo_type = /obj/item/ammo_casing/c9mmr
-
-/obj/item/ammo_magazine/clip/c9mm/practice
-	name = "ammo clip (.45 practice)"
-	ammo_type = /obj/item/ammo_casing/c9mmp
-
-/obj/item/ammo_magazine/clip/c9mm/flash
-	name = "ammo clip (.45 flash)"
-	ammo_type = /obj/item/ammo_casing/c9mmf
-
-/obj/item/ammo_magazine/c9mm // Made by RnD for Prototype SMG and should probably be removed because why does it require DIAMONDS to make bullets?
-	name = "ammunition Box (9mm)"
-	icon_state = "9mm"
-	origin_tech = list(TECH_COMBAT = 2)
-	matter = list(DEFAULT_WALL_MATERIAL = 1800)
-	caliber = "9mm"
-	ammo_type = /obj/item/ammo_casing/c9mm
-	max_ammo = 30
-
-/obj/item/ammo_magazine/c9mm/empty
-	initial_ammo = 0
-
-///////// 5mm /////////
-/*
-/obj/item/ammo_magazine/c5mm
-	name = "magazine (5mm)"
-	icon_state = "fiveseven"
-	mag_type = MAGAZINE
-	ammo_type = /obj/item/ammo_casing/c5mm
-	matter = list(DEFAULT_WALL_MATERIAL = 1200)
-	caliber = "5mm"
-	max_ammo = 20
-	//multiple_sprites = 1
-
-/obj/item/ammo_magazine/clip/c5mm
-	name = "ammo clip (5mm)"
-	icon_state = "clip_pistol"
-	desc = "A stripper clip for reloading 5mm rounds into magazines."
-	caliber = "5mm"
-	ammo_type = /obj/item/ammo_casing/c5mm
-	matter = list(DEFAULT_WALL_MATERIAL = 540) // metal costs are very roughly based around one 5mm casing = 60 metal
-	max_ammo = 9
-	multiple_sprites = 1
-*/
-///////// 10mm /////////
-
-/obj/item/ammo_magazine/a10mm
-	name = "magazine (10mm)"
-	icon_state = "10mm"
-	origin_tech = list(TECH_COMBAT = 2)
-	mag_type = MAGAZINE
-	caliber = "10mm"
-	matter = list(DEFAULT_WALL_MATERIAL = 1500)
-	ammo_type = /obj/item/ammo_casing/a10mm
-	max_ammo = 20
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/a10mm/empty
-	initial_ammo = 0
-
-/obj/item/ammo_magazine/clip/a10mm
-	name = "ammo clip (10mm)"
-	icon_state = "clip_pistol"
-	desc = "A stripper clip for reloading 5mm rounds into magazines."
-	caliber = "10mm"
-	ammo_type = /obj/item/ammo_casing/a10mm
-	matter = list(DEFAULT_WALL_MATERIAL = 675) // metal costs are very roughly based around one 10mm casing = 75 metal
-	max_ammo = 9
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/box/emp/a10mm
-	name = "ammunition box (10mm haywire)"
-	ammo_type = /obj/item/ammo_casing/a10mm/emp
-
-///////// 5.56mm /////////
-
-/obj/item/ammo_magazine/c556
-	name = "magazine (5.56mm)"
-	icon_state = "c5.56"
-	origin_tech = list(TECH_COMBAT = 2)
-	mag_type = MAGAZINE
-	caliber = "a556"
-	matter = list(DEFAULT_WALL_MATERIAL = 1800)
-	ammo_type = /obj/item/ammo_casing/a556
-	max_ammo = 20
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/c556/ext
-	name = "extended magazine (5.56mm)"
-	matter = list(DEFAULT_WALL_MATERIAL = 2700)
-	max_ammo = 30
-
-/obj/item/ammo_magazine/c556/empty
-	initial_ammo = 0
-
-/obj/item/ammo_magazine/c556/ext/empty
-	initial_ammo = 0
-
-/obj/item/ammo_magazine/c556/practice
-	name = "magazine (5.56mm practice)"
-	ammo_type = /obj/item/ammo_casing/a556p
-
-/obj/item/ammo_magazine/c556/practice/ext
-	name = "extended magazine (5.56mm practice)"
-	max_ammo = 30
-
-/obj/item/ammo_magazine/c556/ap
-	name = "magazine (5.56mm armor-piercing)"
-	ammo_type = /obj/item/ammo_casing/a556/ap
-
-/obj/item/ammo_magazine/c556/ap/ext
-	name = "extended magazine (5.56mm armor-piercing)"
-	max_ammo = 30
-
-/obj/item/ammo_magazine/clip/a556
-	name = "ammo clip (5.56mm)"
-	icon_state = "clip_rifle"
-	caliber = "a556"
-	ammo_type = /obj/item/ammo_casing/a556
-	matter = list(DEFAULT_WALL_MATERIAL = 450) // metal costs are very roughly based around one 10mm casing = 180 metal
-	max_ammo = 5
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/clip/a556/ap
-	name = "rifle clip (5.56mm armor-piercing)"
-	ammo_type = /obj/item/ammo_casing/a556/ap
-
-/obj/item/ammo_magazine/clip/a556/practice
-	name = "rifle clip (5.56mm practice)"
-	ammo_type = /obj/item/ammo_casing/a556
-
-/obj/item/ammo_magazine/a556
-	name = "magazine box (5.56mm)"
-	icon_state = "a556"
-	origin_tech = list(TECH_COMBAT = 2)
-	mag_type = MAGAZINE
-	caliber = "a556"
-	matter = list(DEFAULT_WALL_MATERIAL = 10000)
-	ammo_type = /obj/item/ammo_casing/a556
-	w_class = ITEMSIZE_NORMAL // This should NOT fit in your pocket!!
-	max_ammo = 50
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/a556/ap
-	name = "magazine box (5.56mm armor-piercing)"
-	ammo_type = /obj/item/ammo_casing/a556/ap
-
-/obj/item/ammo_magazine/a556/empty
-	initial_ammo = 0
-
-///////// .50 AE /////////
-
-/obj/item/ammo_magazine/a50
-	name = "magazine (.50 AE)"
-	icon_state = "50ae"
-	origin_tech = list(TECH_COMBAT = 2)
-	mag_type = MAGAZINE
-	caliber = ".50"
-	matter = list(DEFAULT_WALL_MATERIAL = 1260)
-	ammo_type = /obj/item/ammo_casing/a50
-	max_ammo = 7
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/a50/empty
-	initial_ammo = 0
-
-/obj/item/ammo_magazine/clip/a50
-	name = "ammo clip (.50 AE)"
-	icon_state = "clip_pistol"
-	desc = "A stripper clip for reloading .50 Action Express rounds into magazines."
-	caliber = ".50"
-	ammo_type = /obj/item/ammo_casing/a50
-	matter = list(DEFAULT_WALL_MATERIAL = 1620) // metal costs are very roughly based around one .50 casing = 180 metal
-	max_ammo = 9
-	multiple_sprites = 1
-
-///////// 7.62mm /////////
-
-/obj/item/ammo_magazine/c762
-	name = "magazine (7.62mm)"
-	icon_state = "c7.62"
-	mag_type = MAGAZINE
-	caliber = "a762"
-	matter = list(DEFAULT_WALL_MATERIAL = 2000)
-	ammo_type = /obj/item/ammo_casing/a762
-	max_ammo = 10
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/c762/ap
-	name = "magazine (7.62mm armor-piercing)"
-	ammo_type = /obj/item/ammo_casing/a762/ap
-
-/obj/item/ammo_magazine/c762/empty
-	initial_ammo = 0
-
-/obj/item/ammo_magazine/s762 // 's' for small!
-	name = "magazine (7.62mm)"
-	icon_state = "SVD"
-	mag_type = MAGAZINE
-	caliber = "a762"
-	matter = list(DEFAULT_WALL_MATERIAL = 1000)
-	ammo_type = /obj/item/ammo_casing/a762
-	max_ammo = 10
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/s762/empty
-	initial_ammo = 0
-
-/obj/item/ammo_magazine/s762/ap
-	name = "magazine (7.62mm armor-piercing)"
-	ammo_type = /obj/item/ammo_casing/a762/ap
-
-/obj/item/ammo_magazine/clip/a762
-	name = "ammo clip (7.62mm)"
-	icon_state = "clip_rifle"
-	caliber = "a762"
-	ammo_type = /obj/item/ammo_casing/a762
-	matter = list(DEFAULT_WALL_MATERIAL = 1000) // metal costs are very roughly based around one 7.62 casing = 200 metal
-	max_ammo = 5
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/clip/a762/ap
-	name = "rifle clip (7.62mm armor-piercing)"
-	ammo_type = /obj/item/ammo_casing/a762/ap
-
-/obj/item/ammo_magazine/clip/a762/practice
-	name = "rifle clip (7.62mm practice)"
-	ammo_type = /obj/item/ammo_casing/a762p
-
-///////// 12g /////////
-
-/obj/item/ammo_magazine/g12
-	name = "magazine (12 gauge)"
-	icon_state = "12g"
-	mag_type = MAGAZINE
-	caliber = "shotgun"
-	matter = list(DEFAULT_WALL_MATERIAL = 2200)
-	ammo_type = /obj/item/ammo_casing/shotgun
-	max_ammo = 24
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/g12/beanbag
-	name = "magazine (12 gauge beanbag)"
-	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
-
-/obj/item/ammo_magazine/g12/pellet
-	name = "magazine (12 gauge pellet)"
-	ammo_type = /obj/item/ammo_casing/shotgun/pellet
-
-/obj/item/ammo_magazine/g12/flash
-	name = "magazine (12 gauge flash)"
-	ammo_type = /obj/item/ammo_casing/shotgun/flash
-
-/obj/item/ammo_magazine/g12/empty
-	initial_ammo = 0
-
-///////// .75 Gyrojet /////////
-
-/obj/item/ammo_magazine/a75
-	name = "ammo magazine (.75 Gyrojet)"
-	icon_state = "75"
-	mag_type = MAGAZINE
-	caliber = "75"
-	ammo_type = /obj/item/ammo_casing/a75
-	multiple_sprites = 1
-	max_ammo = 4
-
-/obj/item/ammo_magazine/a75/empty
-	initial_ammo = 0
-
-///////// Misc. /////////
-
-/obj/item/ammo_magazine/caps
-	name = "speedloader (caps)"
-	icon_state = "T38"
-	caliber = "caps"
-	color = "#FF0000"
-	ammo_type = /obj/item/ammo_casing/cap
-	matter = list(DEFAULT_WALL_MATERIAL = 600)
-	max_ammo = 7
+/************************************************************************/
+/*
+#    An explaination of the naming format for guns and ammo:
+#
+#    a = Ammo, as in individual rounds of ammunition.
+#    b = Box, intended to have ammo taken out one at a time by hand.
+#    c = Clips, intended to reload magazines or guns quickly.
+#    m = Magazine, intended to hold rounds of ammo.
+#    s = Speedloaders, intended to reload guns quickly.
+#
+#    Use this format, followed by the caliber. For example, a shotgun's caliber
+#    variable is "12g" as a result. Ergo, a shotgun round's path would have "a12g",
+#    or a magazine with shotgun shells would be "m12g" instead. To avoid confusion
+#    for developers and in-game admins spawning these items, stick to this format.
+#    Likewise, when creating new rounds, the caliber variable should match whatever
+#    the name says.
+#
+#    This comment is copied in rounds.dm as well.
+#
+#    Also, if a magazine is only meant for a specific gun, include the name
+#    of the specific gun in the path. Example: m45uzi is only for the Uzi.
+*/
+/************************************************************************/
+
+
+
+///////// .357 /////////
+
+/obj/item/ammo_magazine/s357
+	name = "speedloader (.357)"
+	desc = "A speedloader for .357 revolvers."
+	icon_state = "38"
+	caliber = "357"
+	ammo_type = /obj/item/ammo_casing/a357
+	matter = list(DEFAULT_WALL_MATERIAL = 1260)
+	max_ammo = 6
+	multiple_sprites = 1
+
+///////// .38 /////////
+
+/obj/item/ammo_magazine/s38
+	name = "speedloader (.38)"
+	desc = "A speedloader for .38 revolvers."
+	icon_state = "38"
+	caliber = ".38"
+	matter = list(DEFAULT_WALL_MATERIAL = 360)
+	ammo_type = /obj/item/ammo_casing/a38
+	max_ammo = 6
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/s38/rubber
+	name = "speedloader (.38 rubber)"
+	ammo_type = /obj/item/ammo_casing/a38r
+
+/obj/item/ammo_magazine/s38/emp
+	name = "speedloader (.38 haywire)"
+	ammo_type = /obj/item/ammo_casing/a38/emp
+
+///////// .45 /////////
+
+/obj/item/ammo_magazine/m45
+	name = "pistol magazine (.45)"
+	icon_state = "45"
+	mag_type = MAGAZINE
+	ammo_type = /obj/item/ammo_casing/a45
+	matter = list(DEFAULT_WALL_MATERIAL = 525) //metal costs are very roughly based around 1 .45 casing = 75 metal
+	caliber = ".45"
+	max_ammo = 7
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/m45/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/m45/rubber
+	name = "magazine (.45 rubber)"
+	ammo_type = /obj/item/ammo_casing/a45r
+
+/obj/item/ammo_magazine/m45/practice
+	name = "magazine (.45 practice)"
+	ammo_type = /obj/item/ammo_casing/a45p
+
+/obj/item/ammo_magazine/m45/flash
+	name = "magazine (.45 flash)"
+	ammo_type = /obj/item/ammo_casing/a45f
+
+/obj/item/ammo_magazine/m45/ap
+	name = "magazine (.45 AP)"
+	ammo_type = /obj/item/ammo_casing/a45ap
+
+/obj/item/ammo_magazine/box/emp/b45
+	name = "ammunition box (.45 haywire)"
+	ammo_type = /obj/item/ammo_casing/a45/emp
+
+/obj/item/ammo_magazine/m45uzi
+	name = "stick magazine (.45)"
+	icon_state = "uzi45"
+	mag_type = MAGAZINE
+	ammo_type = /obj/item/ammo_casing/a45
+	matter = list(DEFAULT_WALL_MATERIAL = 1200)
+	caliber = ".45"
+	max_ammo = 16
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/m45uzi/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/m45tommy
+	name = "tommygun magazine (.45)"
+	icon_state = "tommy-mag"
+	mag_type = MAGAZINE
+	ammo_type = /obj/item/ammo_casing/a45
+	matter = list(DEFAULT_WALL_MATERIAL = 1500)
+	caliber = ".45"
+	max_ammo = 20
+
+/obj/item/ammo_magazine/m45tommy/ap
+	name = "tommygun magazine (.45 AP)"
+	ammo_type = /obj/item/ammo_casing/a45ap
+
+/obj/item/ammo_magazine/m45tommy/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/m45tommydrum
+	name = "tommygun drum magazine (.45)"
+	icon_state = "tommy-drum"
+	w_class = ITEMSIZE_NORMAL // Bulky ammo doesn't fit in your pockets!
+	mag_type = MAGAZINE
+	ammo_type = /obj/item/ammo_casing/a45
+	matter = list(DEFAULT_WALL_MATERIAL = 3750)
+	caliber = ".45"
+	max_ammo = 50
+
+/obj/item/ammo_magazine/m45tommydrum/ap
+	name = "tommygun drum magazine (.45 AP)"
+	ammo_type = /obj/item/ammo_casing/a45ap
+
+/obj/item/ammo_magazine/m45tommydrum/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/clip/c45
+	name = "ammo clip (.45)"
+	icon_state = "clip_pistol"
+	desc = "A stripper clip for reloading .45 rounds into magazines."
+	caliber = ".45"
+	ammo_type = /obj/item/ammo_casing/a45
+	matter = list(DEFAULT_WALL_MATERIAL = 675) // metal costs very roughly based around one .45 casing = 75 metal
+	max_ammo = 9
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/clip/c45/rubber
+	name = "ammo clip (.45 rubber)"
+	ammo_type = /obj/item/ammo_casing/a45r
+
+/obj/item/ammo_magazine/clip/c45/practice
+	name = "ammo clip (.45 practice)"
+	ammo_type = /obj/item/ammo_casing/a45p
+
+/obj/item/ammo_magazine/clip/c45/flash
+	name = "ammo clip (.45 flash)"
+	ammo_type = /obj/item/ammo_casing/a45f
+
+///////// 9mm /////////
+
+/obj/item/ammo_magazine/m9mm
+	name = "magazine (9mm)"
+	icon_state = "9x19p"
+	origin_tech = list(TECH_COMBAT = 2)
+	mag_type = MAGAZINE
+	matter = list(DEFAULT_WALL_MATERIAL = 480)
+	caliber = "9mm"
+	ammo_type = /obj/item/ammo_casing/a9mm
+	max_ammo = 8
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/m9mm/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/m9mm/flash
+	ammo_type = /obj/item/ammo_casing/a9mmf
+
+/obj/item/ammo_magazine/m9mm/rubber
+	name = "magazine (9mm rubber)"
+	ammo_type = /obj/item/ammo_casing/a9mmr
+
+/obj/item/ammo_magazine/m9mm/practice
+	name = "magazine (9mm practice)"
+	ammo_type = /obj/item/ammo_casing/a9mmp
+
+/obj/item/ammo_magazine/m9mmt
+	name = "top mounted magazine (9mm)"
+	icon_state = "9mmt"
+	mag_type = MAGAZINE
+	ammo_type = /obj/item/ammo_casing/a9mm
+	matter = list(DEFAULT_WALL_MATERIAL = 1200)
+	caliber = "9mm"
+	max_ammo = 20
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/m9mmt/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/m9mmt/rubber
+	name = "top mounted magazine (9mm rubber)"
+	ammo_type = /obj/item/ammo_casing/a9mmr
+
+/obj/item/ammo_magazine/m9mmt/flash
+	name = "top mounted magazine (9mm flash)"
+	ammo_type = /obj/item/ammo_casing/a9mmf
+
+/obj/item/ammo_magazine/m9mmt/practice
+	name = "top mounted magazine (9mm practice)"
+	ammo_type = /obj/item/ammo_casing/a9mmp
+
+/obj/item/ammo_magazine/m9mmp90
+	name = "high capacity top mounted magazine (9mm armor-piercing)"
+	icon_state = "p90"
+	mag_type = MAGAZINE
+	ammo_type = /obj/item/ammo_casing/a9mm/ap
+	matter = list(DEFAULT_WALL_MATERIAL = 3000)
+	caliber = "9mm"
+	max_ammo = 50
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/m9mmp90/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/clip/c9mm
+	name = "ammo clip (9mm)"
+	icon_state = "clip_pistol"
+	desc = "A stripper clip for reloading 9mm rounds into magazines."
+	caliber = "9mm"
+	ammo_type = /obj/item/ammo_casing/a9mm
+	matter = list(DEFAULT_WALL_MATERIAL = 540) // metal costs are very roughly based around one 9mm casing = 60 metal
+	max_ammo = 9
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/clip/c9mm/rubber
+	name = "ammo clip (.45 rubber)"
+	ammo_type = /obj/item/ammo_casing/a9mmr
+
+/obj/item/ammo_magazine/clip/c9mm/practice
+	name = "ammo clip (.45 practice)"
+	ammo_type = /obj/item/ammo_casing/a9mmp
+
+/obj/item/ammo_magazine/clip/c9mm/flash
+	name = "ammo clip (.45 flash)"
+	ammo_type = /obj/item/ammo_casing/a9mmf
+
+/obj/item/ammo_magazine/box/c9mm // Made by RnD for Prototype SMG and should probably be removed because why does it require DIAMONDS to make bullets?
+	name = "ammunition Box (9mm)"
+	icon_state = "9mm"
+	origin_tech = list(TECH_COMBAT = 2)
+	matter = list(DEFAULT_WALL_MATERIAL = 1800)
+	caliber = "9mm"
+	ammo_type = /obj/item/ammo_casing/a9mm
+	max_ammo = 30
+
+/obj/item/ammo_magazine/box/c9mm/empty
+	initial_ammo = 0
+
+///////// 10mm /////////
+
+/obj/item/ammo_magazine/m10mm
+	name = "magazine (10mm)"
+	icon_state = "10mm"
+	origin_tech = list(TECH_COMBAT = 2)
+	mag_type = MAGAZINE
+	caliber = "10mm"
+	matter = list(DEFAULT_WALL_MATERIAL = 1500)
+	ammo_type = /obj/item/ammo_casing/a10mm
+	max_ammo = 20
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/m10mm/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/clip/c10mm
+	name = "ammo clip (10mm)"
+	icon_state = "clip_pistol"
+	desc = "A stripper clip for reloading 5mm rounds into magazines."
+	caliber = "10mm"
+	ammo_type = /obj/item/ammo_casing/a10mm
+	matter = list(DEFAULT_WALL_MATERIAL = 675) // metal costs are very roughly based around one 10mm casing = 75 metal
+	max_ammo = 9
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/box/emp/b10
+	name = "ammunition box (10mm haywire)"
+	ammo_type = /obj/item/ammo_casing/a10mm/emp
+
+///////// 5.56mm /////////
+
+/obj/item/ammo_magazine/m556
+	name = "magazine (5.56mm)"
+	icon_state = "m556"
+	origin_tech = list(TECH_COMBAT = 2)
+	mag_type = MAGAZINE
+	caliber = "5.56mm"
+	matter = list(DEFAULT_WALL_MATERIAL = 1800)
+	ammo_type = /obj/item/ammo_casing/a556
+	max_ammo = 20
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/m556/ext
+	name = "extended magazine (5.56mm)"
+	matter = list(DEFAULT_WALL_MATERIAL = 2700)
+	max_ammo = 30
+
+/obj/item/ammo_magazine/m556/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/m556/ext/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/m556/practice
+	name = "magazine (5.56mm practice)"
+	ammo_type = /obj/item/ammo_casing/a556p
+
+/obj/item/ammo_magazine/m556/practice/ext
+	name = "extended magazine (5.56mm practice)"
+	max_ammo = 30
+
+/obj/item/ammo_magazine/m556/ap
+	name = "magazine (5.56mm armor-piercing)"
+	ammo_type = /obj/item/ammo_casing/a556/ap
+
+/obj/item/ammo_magazine/m556/ap/ext
+	name = "extended magazine (5.56mm armor-piercing)"
+	max_ammo = 30
+
+/obj/item/ammo_magazine/m556/small
+	name = "reduced magazine (5.56mm)"
+	icon_state = "m556-small"
+	matter = list(DEFAULT_WALL_MATERIAL = 900)
+	max_ammo = 10
+
+/obj/item/ammo_magazine/m556/small/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/m556/small/practice
+	name = "magazine (5.56mm practice)"
+	ammo_type = /obj/item/ammo_casing/a556p
+
+/obj/item/ammo_magazine/m556/small/ap
+	name = "magazine (5.56mm armor-piercing)"
+	ammo_type = /obj/item/ammo_casing/a556/ap
+
+/obj/item/ammo_magazine/clip/c556
+	name = "ammo clip (5.56mm)"
+	icon_state = "clip_rifle"
+	caliber = "5.56mm"
+	ammo_type = /obj/item/ammo_casing/a556
+	matter = list(DEFAULT_WALL_MATERIAL = 450) // metal costs are very roughly based around one 10mm casing = 180 metal
+	max_ammo = 5
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/clip/c556/ap
+	name = "rifle clip (5.56mm armor-piercing)"
+	ammo_type = /obj/item/ammo_casing/a556/ap
+
+/obj/item/ammo_magazine/clip/c556/practice
+	name = "rifle clip (5.56mm practice)"
+	ammo_type = /obj/item/ammo_casing/a556
+
+/obj/item/ammo_magazine/m556saw
+	name = "magazine box (5.56mm)"
+	icon_state = "a556"
+	origin_tech = list(TECH_COMBAT = 2)
+	mag_type = MAGAZINE
+	caliber = "5.56mm"
+	matter = list(DEFAULT_WALL_MATERIAL = 10000)
+	ammo_type = /obj/item/ammo_casing/a556
+	w_class = ITEMSIZE_NORMAL // This should NOT fit in your pocket!!
+	max_ammo = 50
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/m556saw/ap
+	name = "magazine box (5.56mm armor-piercing)"
+	ammo_type = /obj/item/ammo_casing/a556/ap
+
+/obj/item/ammo_magazine/m556saw/empty
+	initial_ammo = 0
+
+///////// .50 AE /////////
+
+/obj/item/ammo_magazine/m50
+	name = "magazine (.50 AE)"
+	icon_state = "50ae"
+	origin_tech = list(TECH_COMBAT = 2)
+	mag_type = MAGAZINE
+	caliber = ".50AE"
+	matter = list(DEFAULT_WALL_MATERIAL = 1260)
+	ammo_type = /obj/item/ammo_casing/a50ae
+	max_ammo = 7
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/m50/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/clip/c50
+	name = "ammo clip (.50 AE)"
+	icon_state = "clip_pistol"
+	desc = "A stripper clip for reloading .50 Action Express rounds into magazines."
+	caliber = ".50AE"
+	ammo_type = /obj/item/ammo_casing/a50ae
+	matter = list(DEFAULT_WALL_MATERIAL = 1620) // metal costs are very roughly based around one .50 casing = 180 metal
+	max_ammo = 9
+	multiple_sprites = 1
+
+///////// 7.62mm /////////
+
+/obj/item/ammo_magazine/m762
+	name = "magazine (7.62mm)"
+	icon_state = "m762-small"
+	mag_type = MAGAZINE
+	caliber = "7.62mm"
+	matter = list(DEFAULT_WALL_MATERIAL = 2000)
+	ammo_type = /obj/item/ammo_casing/a762
+	max_ammo = 10
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/m762/ap
+	name = "magazine (7.62mm armor-piercing)"
+	ammo_type = /obj/item/ammo_casing/a762/ap
+
+/obj/item/ammo_magazine/m762/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/m762m // Intentionally not a subtype of m762 because it's supposed to be incompatible with the Z8 Bulldog rifle.
+	name = "magazine (7.62mm)"
+	icon_state = "m762"
+	mag_type = MAGAZINE
+	caliber = "7.62mm"
+	matter = list(DEFAULT_WALL_MATERIAL = 4000)
+	ammo_type = /obj/item/ammo_casing/a762
+	max_ammo = 20
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/m762m/ap
+	name = "magazine (7.62mm armor-piercing)"
+	ammo_type = /obj/item/ammo_casing/a762/ap
+
+/obj/item/ammo_magazine/m762m/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/clip/c762
+	name = "ammo clip (7.62mm)"
+	icon_state = "clip_rifle"
+	caliber = "7.62mm"
+	ammo_type = /obj/item/ammo_casing/a762
+	matter = list(DEFAULT_WALL_MATERIAL = 1000) // metal costs are very roughly based around one 7.62 casing = 200 metal
+	max_ammo = 5
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/clip/c762/ap
+	name = "rifle clip (7.62mm armor-piercing)"
+	ammo_type = /obj/item/ammo_casing/a762/ap
+
+/obj/item/ammo_magazine/clip/c762/practice
+	name = "rifle clip (7.62mm practice)"
+	ammo_type = /obj/item/ammo_casing/a762p
+
+///////// 12g /////////
+
+/obj/item/ammo_magazine/m12gdrum
+	name = "magazine (12 gauge)"
+	icon_state = "12g"
+	mag_type = MAGAZINE
+	caliber = "12g"
+	matter = list(DEFAULT_WALL_MATERIAL = 2200)
+	ammo_type = /obj/item/ammo_casing/a12g
+	max_ammo = 24
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/m12gdrum/beanbag
+	name = "magazine (12 gauge beanbag)"
+	ammo_type = /obj/item/ammo_casing/a12g/beanbag
+
+/obj/item/ammo_magazine/m12gdrum/pellet
+	name = "magazine (12 gauge pellet)"
+	ammo_type = /obj/item/ammo_casing/a12g/pellet
+
+/obj/item/ammo_magazine/m12gdrum/flash
+	name = "magazine (12 gauge flash)"
+	ammo_type = /obj/item/ammo_casing/a12g/flash
+
+/obj/item/ammo_magazine/m12gdrum/empty
+	initial_ammo = 0
+
+///////// .75 Gyrojet /////////
+
+/obj/item/ammo_magazine/m75
+	name = "ammo magazine (.75 Gyrojet)"
+	icon_state = "75"
+	mag_type = MAGAZINE
+	caliber = ".75"
+	ammo_type = /obj/item/ammo_casing/a75
+	multiple_sprites = 1
+	max_ammo = 4
+
+/obj/item/ammo_magazine/m75/empty
+	initial_ammo = 0
+
+///////// Misc. /////////
+
+/obj/item/ammo_magazine/caps
+	name = "speedloader (caps)"
+	icon_state = "T38"
+	caliber = "caps"
+	color = "#FF0000"
+	ammo_type = /obj/item/ammo_casing/cap
+	matter = list(DEFAULT_WALL_MATERIAL = 600)
+	max_ammo = 7
 	multiple_sprites = 1
\ No newline at end of file
diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/rounds.dm
similarity index 76%
rename from code/modules/projectiles/ammunition/bullets.dm
rename to code/modules/projectiles/ammunition/rounds.dm
index dfbd721952..3230e6ed62 100644
--- a/code/modules/projectiles/ammunition/bullets.dm
+++ b/code/modules/projectiles/ammunition/rounds.dm
@@ -1,291 +1,323 @@
-/obj/item/ammo_casing/a357
-	desc = "A .357 bullet casing."
-	caliber = "357"
-	projectile_type = /obj/item/projectile/bullet/pistol/strong
-
-/obj/item/ammo_casing/a50
-	desc = "A .50AE bullet casing."
-	caliber = ".50"
-	projectile_type = /obj/item/projectile/bullet/pistol/strong
-
-/obj/item/ammo_casing/a75
-	desc = "A .75 gyrojet rocket sheathe."
-	caliber = "75"
-	projectile_type = /obj/item/projectile/bullet/gyro
-
-/obj/item/ammo_casing/c38
-	desc = "A .38 bullet casing."
-	caliber = "38"
-	projectile_type = /obj/item/projectile/bullet/pistol
-
-/obj/item/ammo_casing/c38r
-	desc = "A .38 rubber bullet casing."
-	caliber = "38"
-	icon_state = "r-casing"
-	projectile_type = /obj/item/projectile/bullet/pistol/rubber
-
-/obj/item/ammo_casing/c38/emp
-	name = ".38 haywire round"
-	desc = "A .38 bullet casing fitted with a single-use ion pulse generator."
-	icon_state = "empcasing"
-	projectile_type = /obj/item/projectile/ion/small
-	matter = list(DEFAULT_WALL_MATERIAL = 130, "uranium" = 100)
-
-/*
- * 9mm
- */
-
-/obj/item/ammo_casing/c9mm
-	desc = "A 9mm bullet casing."
-	caliber = "9mm"
-	projectile_type = /obj/item/projectile/bullet/pistol
-
-/obj/item/ammo_casing/c9mm/ap
-	desc = "A 9mm armor-piercing bullet casing."
-	projectile_type = /obj/item/projectile/bullet/pistol/ap
-
-/obj/item/ammo_casing/c9mmf
-	desc = "A 9mm flash shell casing."
-	caliber = "9mm"
-	icon_state = "r-casing"
-	projectile_type = /obj/item/projectile/energy/flash
-
-/obj/item/ammo_casing/c9mmr
-	desc = "A 9mm rubber bullet casing."
-	caliber = "9mm"
-	icon_state = "r-casing"
-	projectile_type = /obj/item/projectile/bullet/pistol/rubber
-
-/obj/item/ammo_casing/c9mmp
-	desc = "A 9mm practice bullet casing."
-	caliber = "9mm"
-	icon_state = "r-casing"
-	projectile_type = /obj/item/projectile/bullet/pistol/practice
-
-/*
-/obj/item/ammo_casing/c5mm
-	desc = "A 5mm bullet casing."
-	caliber = "5mm"
-	projectile_type = /obj/item/projectile/bullet/pistol/ap
-*/
-
-/*
- * 45 ammo
- */
-
-/obj/item/ammo_casing/c45
-	desc = "A .45 bullet casing."
-	caliber = ".45"
-	projectile_type = /obj/item/projectile/bullet/pistol/medium
-
-/obj/item/ammo_casing/c45ap
-	desc = "A .45 Armor-Piercing bullet casing."
-	caliber = ".45"
-	icon_state = "r-casing"
-	projectile_type = /obj/item/projectile/bullet/pistol/medium/ap
-
-/obj/item/ammo_casing/c45p
-	desc = "A .45 practice bullet casing."
-	caliber = ".45"
-	icon_state = "r-casing"
-	projectile_type = /obj/item/projectile/bullet/pistol/practice
-
-/obj/item/ammo_casing/c45r
-	desc = "A .45 rubber bullet casing."
-	caliber = ".45"
-	icon_state = "r-casing"
-	projectile_type = /obj/item/projectile/bullet/pistol/rubber
-
-/obj/item/ammo_casing/c45f
-	desc = "A .45 flash shell casing."
-	caliber = ".45"
-	icon_state = "r-casing"
-	projectile_type = /obj/item/projectile/energy/flash
-
-/obj/item/ammo_casing/c45/emp
-	name = ".45 haywire round"
-	desc = "A .45 bullet casing fitted with a single-use ion pulse generator."
-	projectile_type = /obj/item/projectile/ion/small
-	icon_state = "empcasing"
-	matter = list(DEFAULT_WALL_MATERIAL = 130, "uranium" = 100)
-
-/obj/item/ammo_casing/c45/hp
-	desc = "A .45 hollow-point bullet casing."
-	projectile_type = /obj/item/projectile/bullet/pistol/medium/hollow
-
-
-/*
- * 10mm
- */
-
-/obj/item/ammo_casing/a10mm
-	desc = "A 10mm bullet casing."
-	caliber = "10mm"
-	projectile_type = /obj/item/projectile/bullet/pistol/medium
-
-/obj/item/ammo_casing/a10mm/emp
-	name = "10mm haywire round"
-	desc = "A 10mm bullet casing fitted with a single-use ion pulse generator."
-	projectile_type = /obj/item/projectile/ion/small
-	icon_state = "empcasing"
-	matter = list(DEFAULT_WALL_MATERIAL = 130, "uranium" = 100)
-
-/*
- * Shotguns
- */
-
-/obj/item/ammo_casing/shotgun
-	name = "shotgun slug"
-	desc = "A 12 gauge slug."
-	icon_state = "slshell"
-	caliber = "shotgun"
-	projectile_type = /obj/item/projectile/bullet/shotgun
-	matter = list(DEFAULT_WALL_MATERIAL = 360)
-
-/obj/item/ammo_casing/shotgun/pellet
-	name = "shotgun shell"
-	desc = "A 12 gauge shell."
-	icon_state = "gshell"
-	projectile_type = /obj/item/projectile/bullet/pellet/shotgun
-	matter = list(DEFAULT_WALL_MATERIAL = 360)
-
-/obj/item/ammo_casing/shotgun/blank
-	name = "shotgun shell"
-	desc = "A blank shell."
-	icon_state = "blshell"
-	projectile_type = /obj/item/projectile/bullet/blank
-	matter = list(DEFAULT_WALL_MATERIAL = 90)
-
-/obj/item/ammo_casing/shotgun/practice
-	name = "shotgun shell"
-	desc = "A practice shell."
-	icon_state = "pshell"
-	projectile_type = /obj/item/projectile/bullet/shotgun/practice
-	matter = list("metal" = 90)
-
-/obj/item/ammo_casing/shotgun/beanbag
-	name = "beanbag shell"
-	desc = "A beanbag shell."
-	icon_state = "bshell"
-	projectile_type = /obj/item/projectile/bullet/shotgun/beanbag
-	matter = list(DEFAULT_WALL_MATERIAL = 180)
-
-//Can stun in one hit if aimed at the head, but
-//is blocked by clothing that stops tasers and is vulnerable to EMP
-/obj/item/ammo_casing/shotgun/stunshell
-	name = "stun shell"
-	desc = "A 12 gauge taser cartridge."
-	icon_state = "stunshell"
-	projectile_type = /obj/item/projectile/energy/electrode/stunshot
-	matter = list(DEFAULT_WALL_MATERIAL = 360, "glass" = 720)
-
-/obj/item/ammo_casing/shotgun/stunshell/emp_act(severity)
-	if(prob(100/severity)) BB = null
-	update_icon()
-
-//Does not stun, only blinds, but has area of effect.
-/obj/item/ammo_casing/shotgun/flash
-	name = "flash shell"
-	desc = "A chemical shell used to signal distress or provide illumination."
-	icon_state = "fshell"
-	projectile_type = /obj/item/projectile/energy/flash/flare
-	matter = list(DEFAULT_WALL_MATERIAL = 90, "glass" = 90)
-
-/obj/item/ammo_casing/shotgun/emp
-	name = "ion shell"
-	desc = "An advanced shotgun round that creates a small EMP when it strikes a target."
-	icon_state = "empshell"
-	projectile_type = /obj/item/projectile/ion
-//	projectile_type = /obj/item/projectile/bullet/shotgun/ion
-	matter = list(DEFAULT_WALL_MATERIAL = 360, "uranium" = 240)
-
-/*
- * 762mm
- */
-
-/obj/item/ammo_casing/a762
-	desc = "A 7.62mm bullet casing."
-	caliber = "a762"
-	icon_state = "rifle-casing"
-	projectile_type = /obj/item/projectile/bullet/rifle/a762
-
-/obj/item/ammo_casing/a762/ap
-	desc = "A 7.62mm armor-piercing bullet casing."
-	projectile_type = /obj/item/projectile/bullet/rifle/a762/ap
-
-/obj/item/ammo_casing/a762p
-	desc = "A 7.62mm practice bullet casing."
-	caliber = "a762"
-	icon_state = "rifle-casing" // Need to make an icon for these
-	projectile_type = /obj/item/projectile/bullet/rifle/practice
-
-/obj/item/ammo_casing/a762/blank
-	desc = "A blank 7.62mm bullet casing."
-	projectile_type = /obj/item/projectile/bullet/blank
-	matter = list(DEFAULT_WALL_MATERIAL = 90)
-
-/obj/item/ammo_casing/a762/hp
-	desc = "A 7.62mm hollow-point bullet casing."
-	projectile_type = /obj/item/projectile/bullet/rifle/a762/hollow
-
-//145mm
-
-/obj/item/ammo_casing/a145
-	desc = "A 14.5mm shell."
-	icon_state = "lcasing"
-	caliber = "14.5mm"
-	projectile_type = /obj/item/projectile/bullet/rifle/a145
-	matter = list(DEFAULT_WALL_MATERIAL = 1250)
-
-/*
- * 556mm
- */
-
-/obj/item/ammo_casing/a556
-	desc = "A 5.56mm bullet casing."
-	caliber = "a556"
-	icon_state = "rifle-casing"
-	projectile_type = /obj/item/projectile/bullet/rifle/a556
-
-/obj/item/ammo_casing/a556/ap
-	desc = "A 5.56mm armor-piercing bullet casing."
-	projectile_type = /obj/item/projectile/bullet/rifle/a556/ap
-
-/obj/item/ammo_casing/a556p
-	desc = "A 5.56mm practice bullet casing."
-	caliber = "a556"
-	icon_state = "rifle-casing" // Need to make an icon for these
-	projectile_type = /obj/item/projectile/bullet/rifle/practice
-
-/obj/item/ammo_casing/a556/blank
-	desc = "A blank 5.56mm bullet casing."
-	projectile_type = /obj/item/projectile/bullet/blank
-	matter = list(DEFAULT_WALL_MATERIAL = 90)
-
-/obj/item/ammo_casing/a556/hp
-	desc = "A 5.56mm hollow-point bullet casing."
-	projectile_type = /obj/item/projectile/bullet/rifle/a556/hollow
-
-/*
- * Misc
- */
-
-/obj/item/ammo_casing/rocket
-	name = "rocket shell"
-	desc = "A high explosive designed to be fired from a launcher."
-	icon_state = "rocketshell"
-	projectile_type = /obj/item/missile
-	caliber = "rocket"
-
-/obj/item/ammo_casing/cap
-	name = "cap"
-	desc = "A cap for children toys."
-	caliber = "caps"
-	icon_state = "r-casing"
-	color = "#FF0000"
-	projectile_type = /obj/item/projectile/bullet/pistol/cap
-
-/obj/item/ammo_casing/spent // For simple hostile mobs only, so they don't cough up usable bullets when firing. This is for literally nothing else.
-	icon_state = "s-casing-spent"
-	BB = null
+/************************************************************************/
+/*
+#    An explaination of the naming format for guns and ammo:
+#
+#    a = Ammo, as in individual rounds of ammunition.
+#    b = Box, intended to have ammo taken out one at a time by hand.
+#    c = Clips, intended to reload magazines or guns quickly.
+#    m = Magazine, intended to hold rounds of ammo.
+#    s = Speedloaders, intended to reload guns quickly.
+#
+#    Use this format, followed by the caliber. For example, a shotgun's caliber
+#    variable is "12g" as a result. Ergo, a shotgun round's path would have "a12g",
+#    or a magazine with shotgun shells would be "m12g" instead. To avoid confusion
+#    for developers and in-game admins spawning these items, stick to this format.
+#    Likewise, when creating new rounds, the caliber variable should match whatever
+#    the name says.
+#
+#    This comment is copied in magazines.dm as well.
+*/
+/************************************************************************/
+
+/*
+ * .357
+ */
+
+/obj/item/ammo_casing/a357
+	desc = "A .357 bullet casing."
+	caliber = "357"
+	projectile_type = /obj/item/projectile/bullet/pistol/strong
+
+/*
+ * .38
+ */
+
+/obj/item/ammo_casing/a38
+	desc = "A .38 bullet casing."
+	caliber = ".38"
+	projectile_type = /obj/item/projectile/bullet/pistol
+
+/obj/item/ammo_casing/a38r
+	desc = "A .38 rubber bullet casing."
+	caliber = ".38"
+	icon_state = "r-casing"
+	projectile_type = /obj/item/projectile/bullet/pistol/rubber
+
+/obj/item/ammo_casing/a38/emp
+	name = ".38 haywire round"
+	desc = "A .38 bullet casing fitted with a single-use ion pulse generator."
+	icon_state = "empcasing"
+	projectile_type = /obj/item/projectile/ion/small
+	matter = list(DEFAULT_WALL_MATERIAL = 130, "uranium" = 100)
+
+/*
+ * .50 Action Express
+ */
+
+/obj/item/ammo_casing/a50ae
+	desc = "A .50AE bullet casing."
+	caliber = ".50AE"
+	projectile_type = /obj/item/projectile/bullet/pistol/strong
+
+/*
+ * .75 (aka Gyrojet Rockets, aka admin abuse)
+ */
+
+/obj/item/ammo_casing/a75
+	desc = "A .75 gyrojet rocket sheathe."
+	caliber = ".75"
+	projectile_type = /obj/item/projectile/bullet/gyro
+
+/*
+ * 9mm
+ */
+
+/obj/item/ammo_casing/a9mm
+	desc = "A 9mm bullet casing."
+	caliber = "9mm"
+	projectile_type = /obj/item/projectile/bullet/pistol
+
+/obj/item/ammo_casing/a9mm/ap
+	desc = "A 9mm armor-piercing bullet casing."
+	projectile_type = /obj/item/projectile/bullet/pistol/ap
+
+/obj/item/ammo_casing/a9mmf
+	desc = "A 9mm flash shell casing."
+	caliber = "9mm"
+	icon_state = "r-casing"
+	projectile_type = /obj/item/projectile/energy/flash
+
+/obj/item/ammo_casing/a9mmr
+	desc = "A 9mm rubber bullet casing."
+	caliber = "9mm"
+	icon_state = "r-casing"
+	projectile_type = /obj/item/projectile/bullet/pistol/rubber
+
+/obj/item/ammo_casing/a9mmp
+	desc = "A 9mm practice bullet casing."
+	caliber = "9mm"
+	icon_state = "r-casing"
+	projectile_type = /obj/item/projectile/bullet/pistol/practice
+
+/*
+ * .45
+ */
+
+/obj/item/ammo_casing/a45
+	desc = "A .45 bullet casing."
+	caliber = ".45"
+	projectile_type = /obj/item/projectile/bullet/pistol/medium
+
+/obj/item/ammo_casing/a45ap
+	desc = "A .45 Armor-Piercing bullet casing."
+	caliber = ".45"
+	icon_state = "r-casing"
+	projectile_type = /obj/item/projectile/bullet/pistol/medium/ap
+
+/obj/item/ammo_casing/a45p
+	desc = "A .45 practice bullet casing."
+	caliber = ".45"
+	icon_state = "r-casing"
+	projectile_type = /obj/item/projectile/bullet/pistol/practice
+
+/obj/item/ammo_casing/a45r
+	desc = "A .45 rubber bullet casing."
+	caliber = ".45"
+	icon_state = "r-casing"
+	projectile_type = /obj/item/projectile/bullet/pistol/rubber
+
+/obj/item/ammo_casing/a45f
+	desc = "A .45 flash shell casing."
+	caliber = ".45"
+	icon_state = "r-casing"
+	projectile_type = /obj/item/projectile/energy/flash
+
+/obj/item/ammo_casing/a45/emp
+	name = ".45 haywire round"
+	desc = "A .45 bullet casing fitted with a single-use ion pulse generator."
+	projectile_type = /obj/item/projectile/ion/small
+	icon_state = "empcasing"
+	matter = list(DEFAULT_WALL_MATERIAL = 130, "uranium" = 100)
+
+/obj/item/ammo_casing/a45/hp
+	desc = "A .45 hollow-point bullet casing."
+	projectile_type = /obj/item/projectile/bullet/pistol/medium/hollow
+
+
+/*
+ * 10mm
+ */
+
+/obj/item/ammo_casing/a10mm
+	desc = "A 10mm bullet casing."
+	caliber = "10mm"
+	projectile_type = /obj/item/projectile/bullet/pistol/medium
+
+/obj/item/ammo_casing/a10mm/emp
+	name = "10mm haywire round"
+	desc = "A 10mm bullet casing fitted with a single-use ion pulse generator."
+	projectile_type = /obj/item/projectile/ion/small
+	icon_state = "empcasing"
+	matter = list(DEFAULT_WALL_MATERIAL = 130, "uranium" = 100)
+
+/*
+ * 12g (aka shotgun ammo)
+ */
+
+/obj/item/ammo_casing/a12g
+	name = "shotgun slug"
+	desc = "A 12 gauge slug."
+	icon_state = "slshell"
+	caliber = "12g"
+	projectile_type = /obj/item/projectile/bullet/shotgun
+	matter = list(DEFAULT_WALL_MATERIAL = 360)
+
+/obj/item/ammo_casing/a12g/pellet
+	name = "shotgun shell"
+	desc = "A 12 gauge shell."
+	icon_state = "gshell"
+	projectile_type = /obj/item/projectile/bullet/pellet/shotgun
+	matter = list(DEFAULT_WALL_MATERIAL = 360)
+
+/obj/item/ammo_casing/a12g/blank
+	name = "shotgun shell"
+	desc = "A blank shell."
+	icon_state = "blshell"
+	projectile_type = /obj/item/projectile/bullet/blank
+	matter = list(DEFAULT_WALL_MATERIAL = 90)
+
+/obj/item/ammo_casing/a12g/practice
+	name = "shotgun shell"
+	desc = "A practice shell."
+	icon_state = "pshell"
+	projectile_type = /obj/item/projectile/bullet/shotgun/practice
+	matter = list("metal" = 90)
+
+/obj/item/ammo_casing/a12g/beanbag
+	name = "beanbag shell"
+	desc = "A beanbag shell."
+	icon_state = "bshell"
+	projectile_type = /obj/item/projectile/bullet/shotgun/beanbag
+	matter = list(DEFAULT_WALL_MATERIAL = 180)
+
+//Can stun in one hit if aimed at the head, but
+//is blocked by clothing that stops tasers and is vulnerable to EMP
+/obj/item/ammo_casing/a12g/stunshell
+	name = "stun shell"
+	desc = "A 12 gauge taser cartridge."
+	icon_state = "stunshell"
+	projectile_type = /obj/item/projectile/energy/electrode/stunshot
+	matter = list(DEFAULT_WALL_MATERIAL = 360, "glass" = 720)
+
+/obj/item/ammo_casing/a12g/stunshell/emp_act(severity)
+	if(prob(100/severity)) BB = null
+	update_icon()
+
+//Does not stun, only blinds, but has area of effect.
+/obj/item/ammo_casing/a12g/flash
+	name = "flash shell"
+	desc = "A chemical shell used to signal distress or provide illumination."
+	icon_state = "fshell"
+	projectile_type = /obj/item/projectile/energy/flash/flare
+	matter = list(DEFAULT_WALL_MATERIAL = 90, "glass" = 90)
+
+/obj/item/ammo_casing/a12g/emp
+	name = "ion shell"
+	desc = "An advanced shotgun round that creates a small EMP when it strikes a target."
+	icon_state = "empshell"
+	projectile_type = /obj/item/projectile/ion
+//	projectile_type = /obj/item/projectile/bullet/shotgun/ion
+	matter = list(DEFAULT_WALL_MATERIAL = 360, "uranium" = 240)
+
+/*
+ * 7.62mm
+ */
+
+/obj/item/ammo_casing/a762
+	desc = "A 7.62mm bullet casing."
+	caliber = "7.62mm"
+	icon_state = "rifle-casing"
+	projectile_type = /obj/item/projectile/bullet/rifle/a762
+
+/obj/item/ammo_casing/a762/ap
+	desc = "A 7.62mm armor-piercing bullet casing."
+	projectile_type = /obj/item/projectile/bullet/rifle/a762/ap
+
+/obj/item/ammo_casing/a762p
+	desc = "A 7.62mm practice bullet casing."
+	caliber = "7.62mm"
+	icon_state = "rifle-casing" // Need to make an icon for these
+	projectile_type = /obj/item/projectile/bullet/rifle/practice
+
+/obj/item/ammo_casing/a762/blank
+	desc = "A blank 7.62mm bullet casing."
+	projectile_type = /obj/item/projectile/bullet/blank
+	matter = list(DEFAULT_WALL_MATERIAL = 90)
+
+/obj/item/ammo_casing/a762/hp
+	desc = "A 7.62mm hollow-point bullet casing."
+	projectile_type = /obj/item/projectile/bullet/rifle/a762/hollow
+
+/*
+ * 14.5mm (anti-materiel rifle round)
+ */
+
+/obj/item/ammo_casing/a145
+	desc = "A 14.5mm shell."
+	icon_state = "lcasing"
+	caliber = "14.5mm"
+	projectile_type = /obj/item/projectile/bullet/rifle/a145
+	matter = list(DEFAULT_WALL_MATERIAL = 1250)
+
+/*
+ * 5.56mm
+ */
+
+/obj/item/ammo_casing/a556
+	desc = "A 5.56mm bullet casing."
+	caliber = "5.56mm"
+	icon_state = "rifle-casing"
+	projectile_type = /obj/item/projectile/bullet/rifle/a556
+
+/obj/item/ammo_casing/a556/ap
+	desc = "A 5.56mm armor-piercing bullet casing."
+	projectile_type = /obj/item/projectile/bullet/rifle/a556/ap
+
+/obj/item/ammo_casing/a556p
+	desc = "A 5.56mm practice bullet casing."
+	caliber = "5.56mm"
+	icon_state = "rifle-casing" // Need to make an icon for these
+	projectile_type = /obj/item/projectile/bullet/rifle/practice
+
+/obj/item/ammo_casing/a556/blank
+	desc = "A blank 5.56mm bullet casing."
+	projectile_type = /obj/item/projectile/bullet/blank
+	matter = list(DEFAULT_WALL_MATERIAL = 90)
+
+/obj/item/ammo_casing/a556/hp
+	desc = "A 5.56mm hollow-point bullet casing."
+	projectile_type = /obj/item/projectile/bullet/rifle/a556/hollow
+
+/*
+ * Misc
+ */
+
+/obj/item/ammo_casing/rocket
+	name = "rocket shell"
+	desc = "A high explosive designed to be fired from a launcher."
+	icon_state = "rocketshell"
+	projectile_type = /obj/item/missile
+	caliber = "rocket"
+
+/obj/item/ammo_casing/cap
+	name = "cap"
+	desc = "A cap for children toys."
+	caliber = "caps"
+	icon_state = "r-casing"
+	color = "#FF0000"
+	projectile_type = /obj/item/projectile/bullet/pistol/cap
+
+/obj/item/ammo_casing/spent // For simple hostile mobs only, so they don't cough up usable bullets when firing. This is for literally nothing else.
+	icon_state = "s-casing-spent"
+	BB = null
 	projectile_type = null
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index bf30c19991..5abcead8f3 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -8,7 +8,7 @@
 	caliber = "9mm"
 	origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2)
 	slot_flags = SLOT_BELT
-	ammo_type = /obj/item/ammo_casing/c9mm
+	ammo_type = /obj/item/ammo_casing/a9mm
 	multi_aim = 1
 	burst_delay = 2
 
@@ -33,8 +33,8 @@
 	slot_flags = SLOT_BELT|SLOT_BACK
 	fire_sound = 'sound/weapons/Gunshot_light.ogg'
 	load_method = MAGAZINE
-	magazine_type = /obj/item/ammo_magazine/a10mm
-	allowed_magazines = list(/obj/item/ammo_magazine/a10mm)
+	magazine_type = /obj/item/ammo_magazine/m10mm
+	allowed_magazines = list(/obj/item/ammo_magazine/m10mm)
 	auto_eject = 1
 	auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
 
@@ -56,12 +56,12 @@
 	item_state = null
 	w_class = ITEMSIZE_LARGE
 	force = 10
-	caliber = "a556"
+	caliber = "5.56mm"
 	origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4)
 	slot_flags = SLOT_BACK
 	load_method = MAGAZINE
-	magazine_type = /obj/item/ammo_magazine/c556
-	allowed_magazines = list(/obj/item/ammo_magazine/c556)
+	magazine_type = /obj/item/ammo_magazine/m556
+	allowed_magazines = list(/obj/item/ammo_magazine/m556)
 
 	one_handed_penalty = 4
 
@@ -73,8 +73,8 @@
 
 /obj/item/weapon/gun/projectile/automatic/sts35/update_icon(var/ignore_inhands)
 	..()
-	if(istype(ammo_magazine,/obj/item/ammo_magazine/s762))
-		icon_state = "arifle-small"
+	if(istype(ammo_magazine,/obj/item/ammo_magazine/m556/small))
+		icon_state = "arifle-small" // If using the small magazines, use the small magazine sprite.
 	else
 		icon_state = (ammo_magazine)? "arifle" : "arifle-empty"
 	if(!ignore_inhands) update_held_icon()
@@ -88,11 +88,11 @@
 	caliber = "9mm"
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2)
 	slot_flags = SLOT_BELT
-	ammo_type = "/obj/item/ammo_casing/c9mmr"
+	ammo_type = "/obj/item/ammo_casing/a9mmr"
 	fire_sound = 'sound/weapons/Gunshot_light.ogg'
 	load_method = MAGAZINE
-	magazine_type = /obj/item/ammo_magazine/mc9mmt/rubber
-	allowed_magazines = list(/obj/item/ammo_magazine/mc9mmt)
+	magazine_type = /obj/item/ammo_magazine/m9mmt/rubber
+	allowed_magazines = list(/obj/item/ammo_magazine/m9mmt)
 
 /obj/item/weapon/gun/projectile/automatic/wt550/update_icon()
 	..()
@@ -109,14 +109,14 @@
 	item_state = "z8carbine"
 	w_class = ITEMSIZE_LARGE
 	force = 10
-	caliber = "a762"
+	caliber = "7.62mm"
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 3)
 	ammo_type = "/obj/item/ammo_casing/a556" // Is this really needed anymore?
 	fire_sound = 'sound/weapons/Gunshot.ogg'
 	slot_flags = SLOT_BACK
 	load_method = MAGAZINE
-	magazine_type = /obj/item/ammo_magazine/c762
-	allowed_magazines = list(/obj/item/ammo_magazine/c762)
+	magazine_type = /obj/item/ammo_magazine/m762
+	allowed_magazines = list(/obj/item/ammo_magazine/m762)
 	auto_eject = 1
 	auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
 
@@ -181,14 +181,14 @@
 	force = 10
 	slot_flags = 0
 	max_shells = 50
-	caliber = "a556"
+	caliber = "5.56mm"
 	origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 2)
 	slot_flags = SLOT_BACK
 	ammo_type = "/obj/item/ammo_casing/a556" // Is this really needed anymore?
 	fire_sound = 'sound/weapons/machinegun.ogg'
 	load_method = MAGAZINE
-	magazine_type = /obj/item/ammo_magazine/a556
-	allowed_magazines = list(/obj/item/ammo_magazine/a556, /obj/item/ammo_magazine/c556)
+	magazine_type = /obj/item/ammo_magazine/m556saw
+	allowed_magazines = list(/obj/item/ammo_magazine/m556saw, /obj/item/ammo_magazine/m556)
 
 	one_handed_penalty = 6
 
@@ -225,7 +225,7 @@
 		return ..() //once open, behave like normal
 
 /obj/item/weapon/gun/projectile/automatic/l6_saw/update_icon()
-	if(istype(ammo_magazine,/obj/item/ammo_magazine/c762))
+	if(istype(ammo_magazine,/obj/item/ammo_magazine/m762))
 		icon_state = "l6[cover_open ? "open" : "closed"]mag"
 		item_state = icon_state
 	else
@@ -252,13 +252,13 @@
 	item_state = null
 	w_class = ITEMSIZE_LARGE
 	force = 10
-	caliber = "shotgun"
+	caliber = "12g"
 	fire_sound = 'sound/weapons/shotgun.ogg'
 	origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4)
 	slot_flags = SLOT_BACK
 	load_method = MAGAZINE
-	magazine_type = /obj/item/ammo_magazine/g12
-	allowed_magazines = list(/obj/item/ammo_magazine/g12)
+	magazine_type = /obj/item/ammo_magazine/m12gdrum
+	allowed_magazines = list(/obj/item/ammo_magazine/m12gdrum)
 
 	one_handed_penalty = 4
 
@@ -284,8 +284,8 @@
 	load_method = MAGAZINE
 	caliber = ".45"
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
-	magazine_type = /obj/item/ammo_magazine/c45uzi
-	allowed_magazines = list(/obj/item/ammo_magazine/c45uzi)
+	magazine_type = /obj/item/ammo_magazine/m45uzi
+	allowed_magazines = list(/obj/item/ammo_magazine/m45uzi)
 
 	firemodes = list(
 		list(mode_name="semiauto", burst=1, fire_delay=0),
@@ -310,8 +310,8 @@
 	slot_flags = SLOT_BELT // ToDo: Belt sprite.
 	fire_sound = 'sound/weapons/Gunshot_light.ogg'
 	load_method = MAGAZINE
-	magazine_type = /obj/item/ammo_magazine/p90
-	allowed_magazines = list(/obj/item/ammo_magazine/p90, /obj/item/ammo_magazine/mc9mmt) // ToDo: New sprite for the different mag.
+	magazine_type = /obj/item/ammo_magazine/m9mmp90
+	allowed_magazines = list(/obj/item/ammo_magazine/m9mmp90, /obj/item/ammo_magazine/m9mmt) // ToDo: New sprite for the different mag.
 
 	firemodes = list(
 		list(mode_name="semiauto", burst=1, fire_delay=0),
@@ -330,8 +330,8 @@
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
 	slot_flags = SLOT_BELT // ToDo: Belt sprite.
 	load_method = MAGAZINE
-	magazine_type = /obj/item/ammo_magazine/tommymag
-	allowed_magazines = list(/obj/item/ammo_magazine/tommymag, /obj/item/ammo_magazine/tommydrum)
+	magazine_type = /obj/item/ammo_magazine/m45tommy
+	allowed_magazines = list(/obj/item/ammo_magazine/m45tommy, /obj/item/ammo_magazine/m45tommydrum)
 
 	firemodes = list(
 		list(mode_name="semiauto", burst=1, fire_delay=0),
@@ -343,19 +343,19 @@
 	icon_state = (ammo_magazine)? "tommygun" : "tommygun-empty"
 //	update_held_icon()
 
-/obj/item/weapon/gun/projectile/automatic/carbine
+/obj/item/weapon/gun/projectile/automatic/carbine // Admin abuse assault rifle. ToDo: Make this less shit. Maybe remove its autofire, and make it spawn with only 10 rounds at start.
 	name = "assault carbine"
 	desc = "The bullpup configured GP3000 is a lightweight, compact, military-grade assault rifle produced by Gurov Projectile Weapons LLC. It is sold almost exclusively to standing armies. The serial number on this one has been scratched off. Uses 5.56mm rounds."
 	icon_state = "bullpup"
 	item_state = "bullpup"
 	w_class = ITEMSIZE_LARGE
 	force = 10
-	caliber = "a762"
+	caliber = "7.62mm"
 	origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4)
 	slot_flags = SLOT_BACK
 	load_method = MAGAZINE
-	magazine_type = /obj/item/ammo_magazine/c762
-	allowed_magazines = list(/obj/item/ammo_magazine/c762)
+	magazine_type = /obj/item/ammo_magazine/m762m
+	allowed_magazines = list(/obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762m)
 
 	one_handed_penalty = 4
 
@@ -366,9 +366,9 @@
 
 /obj/item/weapon/gun/projectile/automatic/carbine/update_icon(var/ignore_inhands)
 	..()
-	if(ammo_magazine)
-		icon_state = "bullpup"
+	if(istype(ammo_magazine,/obj/item/ammo_magazine/m762))
+		icon_state = "bullpup-small" // If using the smaller magazines, use the small mag sprite.
 	else
 		icon_state = "bullpup-empty"
 	item_state = (ammo_magazine)? "bullpup" : "bullpup-empty"
-	if(!ignore_inhands) update_held_icon()
+	if(!ignore_inhands) update_held_icon()
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/projectile/boltaction.dm b/code/modules/projectiles/guns/projectile/boltaction.dm
index cbc403c4e0..17e2fe1234 100644
--- a/code/modules/projectiles/guns/projectile/boltaction.dm
+++ b/code/modules/projectiles/guns/projectile/boltaction.dm
@@ -7,7 +7,7 @@
 	icon_state = "boltaction"
 	fire_sound = 'sound/weapons/rifleshot.ogg'
 	max_shells = 5
-	caliber = "a762"
+	caliber = "7.62mm"
 	origin_tech = list(TECH_COMBAT = 1)// Old as shit rifle doesn't have very good tech.
 	ammo_type = /obj/item/ammo_casing/a762
 	load_method = SINGLE_CASING|SPEEDLOADER
@@ -60,7 +60,7 @@
 	icon_state = "leveraction"
 	fire_sound = 'sound/weapons/rifleshot.ogg'
 	max_shells = 5
-	caliber = "a762"
+	caliber = "7.62mm"
 	origin_tech = list(TECH_COMBAT = 1)// Old as shit rifle doesn't have very good tech.
 	ammo_type = /obj/item/ammo_casing/a762
 	load_method = SINGLE_CASING|SPEEDLOADER
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index fd46803c68..ba5f4f147d 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -2,8 +2,8 @@
 	var/unique_reskin
 	name = ".45 pistol"
 	desc = "A cheap Martian knock-off of a Colt M1911. Uses .45 rounds."
-	magazine_type = /obj/item/ammo_magazine/c45m
-	allowed_magazines = list(/obj/item/ammo_magazine/c45m)
+	magazine_type = /obj/item/ammo_magazine/m45
+	allowed_magazines = list(/obj/item/ammo_magazine/m45)
 	icon_state = "colt"
 	caliber = ".45"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
@@ -12,7 +12,7 @@
 
 /obj/item/weapon/gun/projectile/colt/detective
 	desc = "A Martian recreation of an old Terran pistol. Uses .45 rounds."
-	magazine_type = /obj/item/ammo_magazine/c45m/rubber
+	magazine_type = /obj/item/ammo_magazine/m45/rubber
 
 /obj/item/weapon/gun/projectile/colt/detective/update_icon()
 	if(ammo_magazine)
@@ -71,7 +71,7 @@
 	name = ".45 pistol"
 	desc = "The NT Mk58 is a cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Found pretty much everywhere humans are. Uses .45 rounds."
 	icon_state = "secguncomp"
-	magazine_type = /obj/item/ammo_magazine/c45m/rubber
+	magazine_type = /obj/item/ammo_magazine/m45/rubber
 	caliber = ".45"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
 	fire_sound = 'sound/weapons/semiauto.ogg'
@@ -86,7 +86,7 @@
 
 /obj/item/weapon/gun/projectile/sec/flash
 	name = ".45 signal pistol"
-	magazine_type = /obj/item/ammo_magazine/c45m/flash
+	magazine_type = /obj/item/ammo_magazine/m45/flash
 
 /obj/item/weapon/gun/projectile/sec/wood
 	desc = "The NT Mk58 is a cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. This one has a sweet wooden grip. Uses .45 rounds."
@@ -111,8 +111,8 @@
 	recoil = 0
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
 	load_method = MAGAZINE
-	magazine_type = /obj/item/ammo_magazine/c45m
-	allowed_magazines = list(/obj/item/ammo_magazine/c45m)
+	magazine_type = /obj/item/ammo_magazine/m45
+	allowed_magazines = list(/obj/item/ammo_magazine/m45)
 
 /obj/item/weapon/gun/projectile/deagle
 	name = "desert eagle"
@@ -120,11 +120,11 @@
 	icon_state = "deagle"
 	item_state = "deagle"
 	force = 14.0
-	caliber = ".50"
+	caliber = ".50AE"
 	load_method = MAGAZINE
 	fire_sound = 'sound/weapons/deagle.ogg'
-	magazine_type = /obj/item/ammo_magazine/a50
-	allowed_magazines = list(/obj/item/ammo_magazine/a50)
+	magazine_type = /obj/item/ammo_magazine/m50
+	allowed_magazines = list(/obj/item/ammo_magazine/m50)
 
 /obj/item/weapon/gun/projectile/deagle/update_icon()
 	..()
@@ -168,13 +168,13 @@
 	desc = "Speak softly, and carry a big gun. Fires rare .75 caliber self-propelled exploding bolts--because fuck you and everything around you."
 	icon_state = "gyropistol"
 	max_shells = 8
-	caliber = "75"
+	caliber = ".75"
 	fire_sound = 'sound/weapons/rpg.ogg'
 	origin_tech = list(TECH_COMBAT = 3)
 	ammo_type = "/obj/item/ammo_casing/a75"
 	load_method = MAGAZINE
-	magazine_type = /obj/item/ammo_magazine/a75
-	allowed_magazines = list(/obj/item/ammo_magazine/a75)
+	magazine_type = /obj/item/ammo_magazine/m75
+	allowed_magazines = list(/obj/item/ammo_magazine/m75)
 	auto_eject = 1
 	auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
 
@@ -196,12 +196,12 @@
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 2)
 	fire_sound = 'sound/weapons/semiauto.ogg'
 	load_method = MAGAZINE
-	magazine_type = /obj/item/ammo_magazine/mc9mm
-	allowed_magazines = list(/obj/item/ammo_magazine/mc9mm)
+	magazine_type = /obj/item/ammo_magazine/m9mm
+	allowed_magazines = list(/obj/item/ammo_magazine/m9mm)
 
 /obj/item/weapon/gun/projectile/pistol/flash
 	name = "holdout signal pistol"
-	magazine_type = /obj/item/ammo_magazine/mc9mm/flash
+	magazine_type = /obj/item/ammo_magazine/m9mm/flash
 
 /obj/item/weapon/gun/projectile/pistol/attack_hand(mob/living/user as mob)
 	if(user.get_inactive_hand() == src)
@@ -256,17 +256,17 @@
 
 	var/global/list/ammo_types = list(
 		/obj/item/ammo_casing/a357              = ".357",
-		/obj/item/ammo_casing/c9mmf             = "9mm",
-		/obj/item/ammo_casing/c45f              = ".45",
+		/obj/item/ammo_casing/a9mmf             = "9mm",
+		/obj/item/ammo_casing/a45f              = ".45",
 		/obj/item/ammo_casing/a10mm             = "10mm",
-		/obj/item/ammo_casing/shotgun           = "12 gauge",
-		/obj/item/ammo_casing/shotgun           = "12 gauge",
-		/obj/item/ammo_casing/shotgun/pellet    = "12 gauge",
-		/obj/item/ammo_casing/shotgun/pellet    = "12 gauge",
-		/obj/item/ammo_casing/shotgun/pellet    = "12 gauge",
-		/obj/item/ammo_casing/shotgun/beanbag   = "12 gauge",
-		/obj/item/ammo_casing/shotgun/stunshell = "12 gauge",
-		/obj/item/ammo_casing/shotgun/flash     = "12 gauge",
+		/obj/item/ammo_casing/a12g           = "12 gauge",
+		/obj/item/ammo_casing/a12g           = "12 gauge",
+		/obj/item/ammo_casing/a12g/pellet    = "12 gauge",
+		/obj/item/ammo_casing/a12g/pellet    = "12 gauge",
+		/obj/item/ammo_casing/a12g/pellet    = "12 gauge",
+		/obj/item/ammo_casing/a12g/beanbag   = "12 gauge",
+		/obj/item/ammo_casing/a12g/stunshell = "12 gauge",
+		/obj/item/ammo_casing/a12g/flash     = "12 gauge",
 		/obj/item/ammo_casing/a762              = "7.62mm",
 		/obj/item/ammo_casing/a556              = "5.56mm"
 		)
@@ -299,8 +299,8 @@
 	caliber = "9mm"
 	load_method = MAGAZINE
 	fire_sound = 'sound/weapons/semiauto.ogg'
-	magazine_type = /obj/item/ammo_magazine/mc9mm
-	allowed_magazines = list(/obj/item/ammo_magazine/mc9mm)
+	magazine_type = /obj/item/ammo_magazine/m9mm
+	allowed_magazines = list(/obj/item/ammo_magazine/m9mm)
 
 /obj/item/weapon/gun/projectile/luger/update_icon()
 	..()
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index e7d31c0226..3886450fcf 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -43,10 +43,10 @@
 	name = "revolver"
 	desc = "A cheap Martian knock-off of a Smith & Wesson Model 10. Uses .38-Special rounds."
 	icon_state = "detective"
-	caliber = "38"
+	caliber = ".38"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
 	fire_sound = 'sound/weapons/Gunshot_light.ogg'
-	ammo_type = /obj/item/ammo_casing/c38
+	ammo_type = /obj/item/ammo_casing/a38
 
 /obj/item/weapon/gun/projectile/revolver/detective/verb/rename_gun()
 	set name = "Name Gun"
@@ -71,13 +71,13 @@
 	name = "Deckard .38"
 	desc = "A custom-built revolver, based off the semi-popular Detective Special model."
 	icon_state = "deckard-empty"
-	caliber = "38"
+	caliber = ".38"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
 	fire_sound = 'sound/weapons/Gunshot_light.ogg'
-	ammo_type = /obj/item/ammo_casing/c38
+	ammo_type = /obj/item/ammo_casing/a38
 
 /obj/item/weapon/gun/projectile/revolver/deckard/emp
-	ammo_type = /obj/item/ammo_casing/c38/emp
+	ammo_type = /obj/item/ammo_casing/a38/emp
 
 
 /obj/item/weapon/gun/projectile/revolver/deckard/update_icon()
@@ -107,13 +107,13 @@
 	name = "\"The Judge\""
 	desc = "A revolving hand-shotgun by Cybersun Industries that packs the power of a 12 guage in the palm of your hand (if you don't break your wrist). Uses 12 shotgun rounds."
 	icon_state = "judge"
-	caliber = "shotgun"
+	caliber = "12g"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 4)
 	max_shells = 5
 	fire_sound = 'sound/weapons/shotgun.ogg'
 	recoil = 2 // ow my fucking hand
 	accuracy = -1 // smooth bore + short barrel = shit accuracy
-	ammo_type = /obj/item/ammo_casing/shotgun
+	ammo_type = /obj/item/ammo_casing/a12g
 	// ToDo: Remove accuracy debuf in exchange for slightly injuring your hand every time you fire it.
 
 /obj/item/weapon/gun/projectile/revolver/lemat
@@ -124,11 +124,11 @@
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
 	handle_casings = CYCLE_CASINGS
 	max_shells = 9
-	caliber = "38"
-	ammo_type = /obj/item/ammo_casing/c38
+	caliber = ".38"
+	ammo_type = /obj/item/ammo_casing/a38
 	var/secondary_max_shells = 1
-	var/secondary_caliber = "shotgun"
-	var/secondary_ammo_type = /obj/item/ammo_casing/shotgun
+	var/secondary_caliber = "12g"
+	var/secondary_ammo_type = /obj/item/ammo_casing/a12g
 	var/flipped_firing = 0
 	var/list/secondary_loaded = list()
 	var/list/tertiary_loaded = list()
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 84ad0bc426..bc14bb9425 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -8,10 +8,10 @@
 	force = 10
 	flags =  CONDUCT
 	slot_flags = SLOT_BACK
-	caliber = "shotgun"
+	caliber = "12g"
 	origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2)
 	load_method = SINGLE_CASING
-	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
+	ammo_type = /obj/item/ammo_casing/a12g/beanbag
 	handle_casings = HOLD_CASINGS
 	fire_sound = 'sound/weapons/shotgun.ogg'
 	var/recentpump = 0 // to prevent spammage
@@ -48,7 +48,7 @@
 	item_state = "cshotgun"
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2)
 	max_shells = 7 //match the ammo box capacity, also it can hold a round in the chamber anyways, for a total of 8.
-	ammo_type = /obj/item/ammo_casing/shotgun
+	ammo_type = /obj/item/ammo_casing/a12g
 
 /obj/item/weapon/gun/projectile/shotgun/doublebarrel
 	name = "double-barreled shotgun"
@@ -64,9 +64,9 @@
 	force = 10
 	flags =  CONDUCT
 	slot_flags = SLOT_BACK
-	caliber = "shotgun"
+	caliber = "12g"
 	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 1)
-	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
+	ammo_type = /obj/item/ammo_casing/a12g/beanbag
 
 	burst_delay = 0
 	firemodes = list(
@@ -75,12 +75,12 @@
 		)
 
 /obj/item/weapon/gun/projectile/shotgun/doublebarrel/pellet
-	ammo_type = /obj/item/ammo_casing/shotgun/pellet
+	ammo_type = /obj/item/ammo_casing/a12g/pellet
 
 /obj/item/weapon/gun/projectile/shotgun/doublebarrel/flare
 	name = "signal shotgun"
 	desc = "A double-barreled shotgun meant to fire signal flash shells."
-	ammo_type = /obj/item/ammo_casing/shotgun/flash
+	ammo_type = /obj/item/ammo_casing/a12g/flash
 
 /obj/item/weapon/gun/projectile/shotgun/doublebarrel/unload_ammo(user, allow_dump)
 	..(user, allow_dump=1)
@@ -115,6 +115,6 @@
 	icon_state = "sawnshotgun"
 	item_state = "sawnshotgun"
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
-	ammo_type = /obj/item/ammo_casing/shotgun/pellet
+	ammo_type = /obj/item/ammo_casing/a12g/pellet
 	w_class = ITEMSIZE_NORMAL
 	force = 5
diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm
index be280c2f64..9a16f68a4c 100644
--- a/code/modules/projectiles/guns/projectile/sniper.dm
+++ b/code/modules/projectiles/guns/projectile/sniper.dm
@@ -80,7 +80,7 @@
 	slot_flags = SLOT_BACK // Needs a sprite.
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
 	recoil = 2 //extra kickback
-	caliber = "a762"
+	caliber = "7.62mm"
 	load_method = MAGAZINE
 	accuracy = -3 //shooting at the hip
 	scoped_accuracy = 0
@@ -88,11 +88,11 @@
 	one_handed_penalty = 4 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand.
 	fire_sound = 'sound/weapons/SVD_shot.ogg'
 	magazine_type = /obj/item/ammo_magazine/SVD
-	allowed_magazines = list(/obj/item/ammo_magazine/SVD, /obj/item/ammo_magazine/c762)
+	allowed_magazines = list(/obj/item/ammo_magazine/SVD, /obj/item/ammo_magazine/m762)
 
 /obj/item/weapon/gun/projectile/SVD/update_icon()
 	..()
-//	if(istype(ammo_magazine,/obj/item/ammo_magazine/c762)
+//	if(istype(ammo_magazine,/obj/item/ammo_magazine/m762)
 //		icon_state = "SVD-bigmag" //No icon for this exists yet.
 	if(ammo_magazine)
 		icon_state = "SVD"
diff --git a/code/modules/random_map/drop/drop_types.dm b/code/modules/random_map/drop/drop_types.dm
index 7c505607bd..8fb02007b4 100644
--- a/code/modules/random_map/drop/drop_types.dm
+++ b/code/modules/random_map/drop/drop_types.dm
@@ -62,10 +62,10 @@ var/global/list/datum/supply_drop_loot/supply_drop
 		/obj/item/weapon/storage/box/emps,
 		/obj/item/weapon/storage/box/flashbangs,
 		/obj/item/weapon/gun/projectile/automatic/sts35,
-		/obj/item/ammo_magazine/c762/ap,
-		/obj/item/ammo_magazine/c762/ap,
+		/obj/item/ammo_magazine/m762/ap,
+		/obj/item/ammo_magazine/m762/ap,
 		/obj/item/weapon/gun/projectile/colt,
-		/obj/item/ammo_magazine/c45m,
+		/obj/item/ammo_magazine/m45,
 		/obj/item/weapon/material/hatchet/tacknife/combatknife)
 
 /datum/supply_drop_loot/heavy_warfare
@@ -83,8 +83,8 @@ var/global/list/datum/supply_drop_loot/supply_drop
 		/obj/item/clothing/accessory/storage/black_drop_pouches,
 		/obj/item/weapon/storage/backpack/dufflebag/sec,
 		/obj/item/weapon/gun/projectile/automatic/carbine,
-		/obj/item/ammo_magazine/c762/ap,
-		/obj/item/ammo_magazine/c762,
+		/obj/item/ammo_magazine/m762/ap,
+		/obj/item/ammo_magazine/m762,
 		/obj/item/weapon/shield/energy,
 		/obj/item/weapon/grenade/frag,
 		/obj/item/weapon/grenade/frag,
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 49678c966c..6f1add522a 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -545,7 +545,7 @@ other types of metals and chemistry for reagents).
 	id = "ammo_9mm"
 	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3)
 	materials = list(DEFAULT_WALL_MATERIAL = 3750, "silver" = 100)
-	build_path = /obj/item/ammo_magazine/c9mm
+	build_path = /obj/item/ammo_magazine/box/c9mm
 	sort_string = "TAACA"
 
 /datum/design/item/weapon/stunshell
@@ -553,7 +553,7 @@ other types of metals and chemistry for reagents).
 	id = "stunshell"
 	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3)
 	materials = list(DEFAULT_WALL_MATERIAL = 4000)
-	build_path = /obj/item/ammo_casing/shotgun/stunshell
+	build_path = /obj/item/ammo_casing/a12g/stunshell
 	sort_string = "TAACB"
 
 /datum/design/item/weapon/chemsprayer
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 0e0959705e..dcdb20e070 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi
index ba02b5a324..75f5005aa5 100644
Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ
diff --git a/maps/northern_star/polaris-1.dmm b/maps/northern_star/polaris-1.dmm
index 2b58fe7175..faa4589659 100644
--- a/maps/northern_star/polaris-1.dmm
+++ b/maps/northern_star/polaris-1.dmm
@@ -2311,7 +2311,7 @@
 "aSw" = (/obj/structure/bed/chair{dir = 1},/obj/structure/closet/walllocker/emerglocker{pixel_x = 0; pixel_y = -32},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station)
 "aSx" = (/turf/simulated/wall/r_wall,/area/maintenance/substation/security)
 "aSy" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/maintenance/security_port)
-"aSz" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/red/full,/obj/item/ammo_magazine/mc9mmt/rubber,/obj/item/ammo_magazine/mc9mmt/rubber,/obj/item/ammo_magazine/mc9mmt/rubber,/obj/item/ammo_magazine/c45m/rubber,/obj/item/ammo_magazine/c45m/rubber,/obj/item/ammo_magazine/c45m/rubber,/obj/item/ammo_magazine/c45m/rubber,/obj/item/ammo_magazine/c45m/rubber,/obj/item/ammo_magazine/c45m/rubber,/obj/machinery/door/window/brigdoor/northleft{name = "Ammo"; req_access = list(2)},/turf/simulated/floor/tiled/dark,/area/security/armoury)
+"aSz" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/red/full,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/machinery/door/window/brigdoor/northleft{name = "Ammo"; req_access = list(2)},/turf/simulated/floor/tiled/dark,/area/security/armoury)
 "aSA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/primary/central_one)
 "aSB" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/hallway/primary/central_one)
 "aSC" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled,/area/hallway/primary/central_one)
@@ -5255,7 +5255,7 @@
 "bXc" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor/tiled/white,/area/medical/patient_b)
 "bXd" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/structure/table/glass,/obj/item/weapon/paper_bin,/obj/item/weapon/clipboard,/obj/item/weapon/pen,/turf/simulated/floor/tiled/white,/area/medical/patient_b)
 "bXe" = (/obj/machinery/computer/med_data/laptop,/obj/structure/table/glass,/obj/effect/floor_decal/corner/pink/full{dir = 4},/obj/machinery/light,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/white,/area/medical/patient_b)
-"bXf" = (/obj/structure/table/reinforced,/obj/machinery/light{dir = 4},/obj/item/ammo_magazine/mc9mmt/practice,/obj/item/ammo_magazine/mc9mmt/practice,/obj/item/ammo_magazine/c45m/practice,/obj/item/ammo_magazine/c45m/practice,/obj/item/ammo_magazine/c45m/practice,/obj/item/ammo_magazine/c45m/practice,/obj/item/ammo_magazine/c45m/practice,/obj/item/ammo_magazine/c45m/practice,/turf/simulated/floor/tiled,/area/security/range)
+"bXf" = (/obj/structure/table/reinforced,/obj/machinery/light{dir = 4},/obj/item/ammo_magazine/m9mmt/practice,/obj/item/ammo_magazine/m9mmt/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/turf/simulated/floor/tiled,/area/security/range)
 "bXg" = (/obj/item/weapon/storage/box/lights/mixed,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/structure/table/steel,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/green,/obj/item/device/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"},/turf/simulated/floor/tiled/dark,/area/medical/biostorage)
 "bXh" = (/obj/structure/closet/crate{icon_state = "crateopen"; name = "Grenade Crate"; opened = 1},/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/grenade/chem_grenade,/obj/item/device/assembly/igniter,/obj/item/device/assembly/igniter,/obj/item/device/assembly/igniter,/obj/item/device/assembly/timer,/obj/item/device/assembly/timer,/obj/item/device/assembly/timer,/turf/simulated/floor/tiled/dark,/area/medical/biostorage)
 "bXi" = (/obj/structure/bed/chair/comfy/brown{dir = 1},/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 8; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = -21; pixel_y = 0},/turf/simulated/floor/carpet/blue,/area/medical/psych)
@@ -6167,7 +6167,7 @@
 "coE" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_three)
 "coF" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/green,/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop)
 "coG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/crew_quarters/sleep/elevator)
-"coH" = (/obj/effect/floor_decal/corner/green/full{dir = 4},/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/item/ammo_magazine/c45m,/obj/item/ammo_magazine/c45m,/obj/item/ammo_magazine/c45m,/obj/item/ammo_magazine/c45m,/obj/item/ammo_magazine/c45m,/obj/item/ammo_magazine/c45m,/obj/item/ammo_magazine/mc9mmt,/obj/item/ammo_magazine/mc9mmt,/obj/item/ammo_magazine/mc9mmt,/obj/machinery/door/window/brigdoor/northright{name = "Ammo"},/turf/simulated/floor/tiled/dark,/area/security/tactical)
+"coH" = (/obj/effect/floor_decal/corner/green/full{dir = 4},/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/machinery/door/window/brigdoor/northright{name = "Ammo"},/turf/simulated/floor/tiled/dark,/area/security/tactical)
 "coI" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor,/area/maintenance/medbay_aft)
 "coJ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/maintenance/medbay_aft)
 "coK" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor,/area/maintenance/medbay_aft)
diff --git a/maps/northern_star/polaris-2.dmm b/maps/northern_star/polaris-2.dmm
index 3f14b89489..edead8f198 100644
--- a/maps/northern_star/polaris-2.dmm
+++ b/maps/northern_star/polaris-2.dmm
@@ -859,7 +859,7 @@
 "aqA" = (/obj/structure/table/rack,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "aqB" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/gun/energy/ionrifle,/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "aqC" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table/rack,/obj/item/weapon/gun/projectile/automatic/wt550,/obj/item/weapon/gun/projectile/automatic/wt550,/obj/item/weapon/gun/projectile/automatic/wt550,/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
-"aqD" = (/obj/structure/table/rack,/obj/item/ammo_magazine/mc9mmt,/obj/item/ammo_magazine/mc9mmt,/obj/item/ammo_magazine/mc9mmt,/obj/item/ammo_magazine/mc9mmt,/obj/item/ammo_magazine/mc9mmt,/obj/item/ammo_magazine/mc9mmt,/obj/item/ammo_magazine/mc9mmt,/obj/item/ammo_magazine/mc9mmt,/obj/item/ammo_magazine/mc9mmt,/obj/item/ammo_magazine/mc9mmt/rubber,/obj/item/ammo_magazine/mc9mmt/rubber,/obj/item/ammo_magazine/mc9mmt/rubber,/obj/item/ammo_magazine/mc9mmt/rubber,/obj/item/ammo_magazine/mc9mmt/rubber,/obj/item/ammo_magazine/mc9mmt/rubber,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
+"aqD" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "aqE" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/gun/launcher/grenade,/obj/item/weapon/gun/launcher/grenade,/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "aqF" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/flashbangs,/obj/item/weapon/storage/box/flashbangs,/obj/item/weapon/storage/box/emps{pixel_x = 4; pixel_y = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/storage/box/frags,/obj/item/weapon/storage/box/smokes,/obj/item/weapon/storage/box/smokes,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "aqG" = (/obj/machinery/vending/security,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
@@ -869,11 +869,11 @@
 "aqK" = (/obj/machinery/door/blast/regular{icon_state = "pdoor1"; id = "ASSAULT"; name = "Assault Weapon Storage"; p_open = 0},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "aqL" = (/obj/structure/sign/securearea,/turf/simulated/shuttle/wall/dark/hard_corner,/area/centcom/specops)
 "aqM" = (/obj/machinery/door/airlock/centcom,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
-"aqN" = (/obj/structure/table/rack,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
+"aqN" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "aqO" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/automatic/z8,/obj/item/weapon/gun/projectile/automatic/z8,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "aqP" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/sniperrifle,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
-"aqQ" = (/obj/structure/table/rack,/obj/item/ammo_magazine/p90,/obj/item/ammo_magazine/p90,/obj/item/ammo_magazine/p90,/obj/item/ammo_magazine/p90,/obj/item/weapon/gun/projectile/automatic/p90,/obj/item/weapon/gun/projectile/automatic/p90,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
-"aqR" = (/obj/structure/table/rack,/obj/item/ammo_magazine/a556,/obj/item/ammo_magazine/a556,/obj/item/ammo_magazine/a556,/obj/item/ammo_magazine/a556,/obj/item/weapon/gun/projectile/automatic/l6_saw,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
+"aqQ" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/weapon/gun/projectile/automatic/p90,/obj/item/weapon/gun/projectile/automatic/p90,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
+"aqR" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m556saw,/obj/item/ammo_magazine/m556saw,/obj/item/ammo_magazine/m556saw,/obj/item/ammo_magazine/m556saw,/obj/item/weapon/gun/projectile/automatic/l6_saw,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "aqS" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops)
 "aqT" = (/obj/structure/closet/crate,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "aqU" = (/obj/machinery/autolathe{desc = "Your typical Autolathe. It appears to have much more options than your regular one, however..."; hacked = 1; name = "Unlocked Autolathe"},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
@@ -896,7 +896,7 @@
 "arl" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/weapon/storage/box/shotgunshells,/obj/item/weapon/storage/box/shotgunshells,/obj/item/weapon/storage/box/shotgunammo,/obj/item/weapon/storage/box/shotgunammo,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "arm" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/item/weapon/gun/projectile/shotgun/pump/combat,/obj/item/weapon/gun/projectile/shotgun/pump/combat,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "arn" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/weapon/gun/projectile/automatic/z8,/obj/item/weapon/gun/projectile/automatic/z8,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
-"aro" = (/obj/structure/table/rack,/obj/item/ammo_magazine/a556,/obj/item/ammo_magazine/a556,/obj/item/ammo_magazine/a556,/obj/item/ammo_magazine/a556,/obj/item/ammo_magazine/a556,/obj/item/ammo_magazine/a556,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/ammo_magazine/a556,/obj/item/ammo_magazine/a556,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
+"aro" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m556saw,/obj/item/ammo_magazine/m556saw,/obj/item/ammo_magazine/m556saw,/obj/item/ammo_magazine/m556saw,/obj/item/ammo_magazine/m556saw,/obj/item/ammo_magazine/m556saw,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/ammo_magazine/m556saw,/obj/item/ammo_magazine/m556saw,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "arp" = (/obj/machinery/deployable/barrier,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "arq" = (/obj/structure/table/reinforced,/obj/item/device/pda/ert,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "arr" = (/obj/effect/floor_decal/corner/purple{dir = 9},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops)
@@ -953,7 +953,7 @@
 "asq" = (/obj/structure/table/rack,/obj/item/weapon/melee/energy/sword/blue,/obj/item/weapon/melee/energy/sword/blue,/obj/item/weapon/melee/energy/sword/blue,/obj/item/weapon/melee/energy/sword/blue,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "asr" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/xray,/obj/item/weapon/gun/energy/xray,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "ass" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/laser,/obj/item/weapon/gun/energy/laser,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
-"ast" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/ammo_magazine/c45m/rubber,/obj/item/ammo_magazine/c45m/rubber,/obj/item/ammo_magazine/c45m/rubber,/obj/item/ammo_magazine/c45m/rubber,/obj/item/ammo_magazine/c45m/rubber,/obj/item/ammo_magazine/c45m/flash,/obj/item/ammo_magazine/c45m/flash,/obj/item/ammo_magazine/c45m,/obj/item/ammo_magazine/c45m,/obj/item/ammo_magazine/c45m,/obj/item/ammo_magazine/c45m,/obj/item/ammo_magazine/c45m,/obj/item/ammo_magazine/c45m,/obj/item/ammo_magazine/c45m,/obj/item/ammo_magazine/c45m,/obj/item/ammo_magazine/c45m,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
+"ast" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/flash,/obj/item/ammo_magazine/m45/flash,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "asu" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/item/weapon/gun/projectile/sec,/obj/item/weapon/gun/projectile/sec,/obj/item/weapon/gun/projectile/sec,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "asv" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "asw" = (/obj/structure/table/reinforced,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
@@ -1179,7 +1179,7 @@
 "awI" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start)
 "awJ" = (/obj/structure/bed/chair{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start)
 "awK" = (/obj/structure/closet/hydrant{pixel_y = 32},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start)
-"awL" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/security,/obj/item/weapon/storage/belt/security,/obj/item/ammo_magazine/mc9mm/flash,/obj/item/weapon/gun/projectile/pistol/flash,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start)
+"awL" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/security,/obj/item/weapon/storage/belt/security,/obj/item/ammo_magazine/m9mm/flash,/obj/item/weapon/gun/projectile/pistol/flash,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start)
 "awM" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/syndicate_mothership)
 "awN" = (/obj/machinery/door/airlock/centcom{name = "Bathroom"; opacity = 1},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_mothership)
 "awO" = (/obj/machinery/shower{dir = 1},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_mothership)
@@ -1207,8 +1207,8 @@
 "axk" = (/obj/structure/table/rack,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership)
 "axl" = (/obj/structure/table/rack,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership)
 "axm" = (/obj/structure/table/rack,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera,/obj/item/device/camera,/obj/item/device/camera,/obj/item/device/camera,/obj/item/device/camera,/obj/item/device/camera,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership)
-"axn" = (/obj/structure/table/rack,/obj/item/ammo_magazine/a10mm,/obj/item/ammo_magazine/a10mm,/obj/item/ammo_magazine/a10mm,/obj/item/ammo_magazine/a10mm,/obj/item/ammo_magazine/a10mm,/obj/item/ammo_magazine/a10mm,/obj/item/weapon/gun/projectile/automatic/c20r,/obj/item/weapon/gun/projectile/automatic/c20r,/obj/item/weapon/gun/projectile/automatic/c20r,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership)
-"axo" = (/obj/structure/table/rack,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/obj/item/weapon/gun/projectile/automatic/sts35,/obj/item/weapon/gun/projectile/automatic/sts35,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership)
+"axn" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/weapon/gun/projectile/automatic/c20r,/obj/item/weapon/gun/projectile/automatic/c20r,/obj/item/weapon/gun/projectile/automatic/c20r,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership)
+"axo" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/weapon/gun/projectile/automatic/sts35,/obj/item/weapon/gun/projectile/automatic/sts35,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership)
 "axp" = (/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops)
 "axq" = (/obj/machinery/vending/boozeomat,/turf/simulated/shuttle/wall/dark,/area/shuttle/administration/centcom)
 "axr" = (/obj/machinery/vending/coffee,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom)
diff --git a/polaris.dme b/polaris.dme
index 9f075b1d76..92abfde4f5 100644
--- a/polaris.dme
+++ b/polaris.dme
@@ -1876,8 +1876,8 @@
 #include "code\modules\projectiles\effects.dm"
 #include "code\modules\projectiles\gun.dm"
 #include "code\modules\projectiles\projectile.dm"
-#include "code\modules\projectiles\ammunition\boxes.dm"
-#include "code\modules\projectiles\ammunition\bullets.dm"
+#include "code\modules\projectiles\ammunition\magazines.dm"
+#include "code\modules\projectiles\ammunition\rounds.dm"
 #include "code\modules\projectiles\guns\energy.dm"
 #include "code\modules\projectiles\guns\launcher.dm"
 #include "code\modules\projectiles\guns\projectile.dm"