Pass I

code/modules/projectiles/ammunition.dm

@@ -67,7 +67,7 @@
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	item_state = "syringe_kit"
-	m_amt = 30000
+	materials = list(MAT_METAL=30000)
 	throwforce = 2
 	w_class = 1.0
 	throw_speed = 4

code/modules/projectiles/ammunition/ammo_casings.dm

@@ -38,7 +38,7 @@
 	icon_state = "blshell"
 	caliber = "shotgun"
 	projectile_type = "/obj/item/projectile/bullet"
-	m_amt = 4000
+	materials = list(MAT_METAL=4000)
 
 
 /obj/item/ammo_casing/shotgun/buckshot
@@ -55,7 +55,7 @@
 	desc = "A weak beanbag slug for riot control."
 	icon_state = "bshell"
 	projectile_type = "/obj/item/projectile/bullet/weakbullet/rubber"
-	m_amt = 250
+	materials = list(MAT_METAL=250)
 
 
 /obj/item/ammo_casing/shotgun/improvised
@@ -63,7 +63,7 @@
 	desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards."
 	icon_state = "gshell"
 	projectile_type = "/obj/item/projectile/bullet/pellet/weak"
-	m_amt = 250
+	materials = list(MAT_METAL=250)
 	pellets = 5
 	deviation = 30
 
@@ -73,7 +73,7 @@
 	propellant. It's like playing russian roulette, with a shotgun."
 	icon_state = "improvshell"
 	projectile_type = /obj/item/projectile/bullet/pellet/random
-	m_amt = 250
+	materials = list(MAT_METAL=250)
 	pellets = 5
 	deviation = 30
 
@@ -86,7 +86,7 @@
 	desc = "A stunning taser slug."
 	icon_state = "stunshell"
 	projectile_type = "/obj/item/projectile/bullet/stunshot"
-	m_amt = 200
+	materials = list(MAT_METAL=250)
 
 
 /obj/item/ammo_casing/shotgun/meteorshot
@@ -164,7 +164,7 @@
 	desc = "A tranquilizer round used to subdue individuals utilizing stimulants."
 	icon_state = "cshell"
 	projectile_type = "/obj/item/projectile/bullet/dart/syringe/tranquilizer"
-	m_amt = 250
+	materials = list(MAT_METAL=250)
 
 /obj/item/ammo_casing/syringegun
 	name = "syringe gun spring"

code/modules/projectiles/ammunition/boxes.dm

@@ -54,7 +54,7 @@
 	origin_tech = "combat=2"
 	ammo_type = /obj/item/ammo_casing/shotgun
 	max_ammo = 8
-	m_amt = 100000
+	materials = list(MAT_METAL=32000)
 
 /obj/item/ammo_box/shotgun/buck
 	name = "Ammunition Box (buckshot)"
@@ -63,15 +63,15 @@
 /obj/item/ammo_box/shotgun/stun
 	name = "Ammunition Box (stun shells)"
 	ammo_type = /obj/item/ammo_casing/shotgun/stunslug
-	m_amt = 20000
+	materials = list(MAT_METAL=2000)
 
 /obj/item/ammo_box/shotgun/beanbag
 	name = "Ammunition Box (beanbag shells)"
 	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
-	m_amt = 4000
+	materials = list(MAT_METAL=2000)
 
 /obj/item/ammo_box/shotgun/tranquilizer
 	name = "Ammunition Box (tranquilizer darts)"
 	icon_state = "45box"
 	ammo_type = /obj/item/ammo_casing/shotgun/tranquilizer
-	m_amt = 2000
+	materials = list(MAT_METAL=2000)

code/modules/projectiles/gun.dm

@@ -10,7 +10,7 @@
 	item_state = "gun"
 	flags =  CONDUCT
 	slot_flags = SLOT_BELT
-	m_amt = 2000
+	materials = list(MAT_METAL=2000)
 	w_class = 3.0
 	throwforce = 5
 	throw_speed = 4

code/modules/projectiles/guns/energy/laser.dm

@@ -6,7 +6,7 @@
 	fire_sound = 'sound/weapons/Laser.ogg'
 	charge_cost = 830
 	w_class = 3.0
-	m_amt = 2000
+	materials = list(MAT_METAL=2000)
 	origin_tech = "combat=3;magnets=2"
 	projectile_type = "/obj/item/projectile/beam"
 

code/modules/projectiles/guns/energy/special.dm

@@ -272,7 +272,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 	icon_state = "crossbow"
 	item_state = "crossbow"
 	w_class = 2
-	m_amt = 2000
+	materials = list(MAT_METAL=2000)
 	origin_tech = "combat=2;magnets=2;syndicate=5"
 	silenced = 1
 	projectile_type = "/obj/item/projectile/energy/bolt"
@@ -285,7 +285,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 	desc = "A reverse engineered weapon using syndicate technology."
 	icon_state = "crossbowlarge"
 	w_class = 3
-	m_amt = 4000
+	materials = list(MAT_METAL=4000)
 	origin_tech = "combat=2;magnets=2;syndicate=3" //can be further researched for more syndie tech
 	silenced = 0
 	projectile_type = "/obj/item/projectile/energy/bolt/large"
@@ -294,7 +294,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 	desc = "One and done!"
 	icon_state = "crossbowlarge"
 	origin_tech = null
-	m_amt = 0
+	materials = list()
 
 /obj/item/weapon/gun/energy/plasmacutter
 	name = "plasma cutter"

code/modules/projectiles/guns/energy/stun.dm

@@ -63,7 +63,7 @@
 	icon_state = "crossbow"
 	w_class = 2.0
 	item_state = "crossbow"
-	m_amt = 2000
+	materials = list(MAT_METAL=2000)
 	origin_tech = "combat=2;magnets=2;syndicate=5"
 	silenced = 1
 	fire_sound = 'sound/weapons/Genhit.ogg'
@@ -98,7 +98,7 @@
 	silenced = 0
 	w_class = 3.0
 	force = 10
-	m_amt = 4000
+	materials = list(MAT_METAL=4000)
 	projectile_type = "/obj/item/projectile/energy/bolt/large"
 
 

code/modules/projectiles/guns/projectile.dm

@@ -8,7 +8,7 @@
 	icon_state = "pistol"
 	origin_tech = "combat=2;materials=2"
 	w_class = 3.0
-	m_amt = 1000
+	materials = list(MAT_METAL=1000)
 //	recoil = 1
 	var/mag_type = "/obj/item/ammo_box/magazine/m10mm" //Removes the need for max_ammo and caliber info
 	var/obj/item/ammo_box/magazine/magazine