Fixes a few things, adds 556 clips

code/datums/autolathe/arms.dm

@@ -152,10 +152,7 @@
 	path =/obj/item/ammo_magazine/a556
 	hidden = 1
 /////// 7.62
-/datum/category_item/autolathe/arms/rifle_small_762
+
-	name = "rifle magazine (7.62mm)"
-	path =/obj/item/ammo_magazine/s762
-	hidden = 1
 
 /datum/category_item/autolathe/arms/rifle_762
 	name = "rifle magazine (7.62mm)"
@@ -167,6 +164,13 @@
 	path =/obj/item/ammo_magazine/g12
 	hidden = 1
 
+/*
+/datum/category_item/autolathe/arms/rifle_small_762
+	name = "rifle magazine (7.62mm)"
+	path =/obj/item/ammo_magazine/s762
+	hidden = 1
+*/
+
 /* Commented out until autolathe stuff is decided/fixed. Will probably remove these entirely. -Spades
 // These should always be/empty! The idea is to fill them up manually with ammo clips.
 
@@ -340,7 +344,7 @@
 	path =/obj/item/ammo_magazine/clip/a50
 	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
@@ -351,7 +355,6 @@
 	name = "ammo clip (5.56mm practice)"
 	path =/obj/item/ammo_magazine/clip/a556/practice
 	category = "Arms and Ammunition"
-*/
 
 /datum/category_item/autolathe/arms/rifle_clip_762
 	name = "ammo clip (7.62mm)"

code/modules/projectiles/ammunition/boxes.dm

@@ -299,11 +299,15 @@
 
 /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
@@ -317,10 +321,10 @@
 	ammo_type = /obj/item/ammo_casing/a556/ap
 
 /obj/item/ammo_magazine/c556/ap/ext
-	name = "exteneded magazine (5.56mm armor-piercing)"
+	name = "extended magazine (5.56mm armor-piercing)"
 	max_ammo = 30
 
-/obj/item/ammo_magazine/clip/c556
+/obj/item/ammo_magazine/clip/a556
 	name = "ammo clip (5.56mm)"
 	icon_state = "clip_rifle"
 	caliber = "a556"
@@ -329,11 +333,11 @@
 	max_ammo = 5
 	multiple_sprites = 1
 
-/obj/item/ammo_magazine/clip/c556/ap
+/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/c556/practice
+/obj/item/ammo_magazine/clip/a556/practice
 	name = "rifle clip (5.56mm practice)"
 	ammo_type = /obj/item/ammo_casing/a556
 
@@ -389,7 +393,7 @@
 	icon_state = "c7.62"
 	mag_type = MAGAZINE
 	caliber = "a762"
-	matter = list(DEFAULT_WALL_MATERIAL = 4000)
+	matter = list(DEFAULT_WALL_MATERIAL = 2000)
 	ammo_type = /obj/item/ammo_casing/a762
 	max_ammo = 10
 	multiple_sprites = 1
@@ -406,7 +410,7 @@
 	icon_state = "SVD"
 	mag_type = MAGAZINE
 	caliber = "a762"
-	matter = list(DEFAULT_WALL_MATERIAL = 2000)
+	matter = list(DEFAULT_WALL_MATERIAL = 1000)
 	ammo_type = /obj/item/ammo_casing/a762
 	max_ammo = 10
 	multiple_sprites = 1

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

@@ -346,7 +346,7 @@
 /obj/item/weapon/gun/projectile/automatic/carbine
 	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 = "bullpupm"
+	icon_state = "bullpup"
 	item_state = "bullpup"
 	w_class = ITEMSIZE_LARGE
 	force = 10
@@ -364,12 +364,11 @@
 		list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=6,    burst_accuracy=list(0,-1,-2), dispersion=list(0.0, 0.6, 0.6))
 		)
 
-/*/obj/item/weapon/gun/projectile/automatic/carbine/update_icon(var/ignore_inhands)
+/obj/item/weapon/gun/projectile/automatic/carbine/update_icon(var/ignore_inhands)
 	..()
-	if(istype(ammo_magazine,/obj/item/ammo_magazine/a556m))
+	if(ammo_magazine)
-		icon_state = "bullpupm"
+		icon_state = "bullpup"
 	else
-		icon_state = (ammo_magazine)? "bullpup" : "bullpup-empty"
+		icon_state = "bullpup-empty"
 	item_state = (ammo_magazine)? "bullpup" : "bullpup-empty"
 	if(!ignore_inhands) update_held_icon()
-*/