Polishing oversights away

code/modules/projectiles/ammunition/boxes.dm

@@ -288,7 +288,7 @@
 
 /obj/item/ammo_magazine/m556
 	name = "magazine (5.56mm)"
-	icon_state = "c5.56mid"
+	icon_state = "m556"
 	origin_tech = list(TECH_COMBAT = 2)
 	mag_type = MAGAZINE
 	caliber = "a556"
@@ -325,14 +325,9 @@
 	max_ammo = 30
 
 /obj/item/ammo_magazine/m556/small
-	name = "magazine (5.56)"
-	icon_state = "c5.56" // This icon is named wrongly. Change later.
-	mag_type = MAGAZINE
-	caliber = "a762"
+	icon_state = "m556-small"
 	matter = list(DEFAULT_WALL_MATERIAL = 900)
-	ammo_type = /obj/item/ammo_casing/a762
 	max_ammo = 10
-	multiple_sprites = 1
 
 /obj/item/ammo_magazine/m556/small/empty
 	initial_ammo = 0
@@ -342,7 +337,7 @@
 	ammo_type = /obj/item/ammo_casing/a556p
 
 /obj/item/ammo_magazine/m556/small/ap
-	name = "magazine (7.62mm armor-piercing)"
+	name = "magazine (5.56mm armor-piercing)"
 	ammo_type = /obj/item/ammo_casing/a556/ap
 
 /obj/item/ammo_magazine/clip/c556
@@ -411,7 +406,7 @@
 
 /obj/item/ammo_magazine/m762
 	name = "magazine (7.62mm)"
-	icon_state = "c7.62"
+	icon_state = "m762-small"
 	mag_type = MAGAZINE
 	caliber = "a762"
 	matter = list(DEFAULT_WALL_MATERIAL = 2000)
@@ -426,6 +421,23 @@
 /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 = "a762"
+	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"

code/modules/projectiles/guns/projectile/automatic.dm

@@ -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()
@@ -343,7 +343,7 @@
 	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"
@@ -354,8 +354,8 @@
 	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/m762
-	allowed_magazines = list(/obj/item/ammo_magazine/m762)
+	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,8 +366,8 @@
 
 /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"