Pass I

code/modules/reagents/grenade_launcher.dm

@@ -15,7 +15,7 @@
 	var/ammo_type = /obj/item/weapon/grenade
 	var/unloaded
 
-	m_amt = 2000
+	materials = list(MAT_METAL=2000)
 
 	examine()
 		set src in view()

code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm

@@ -6,7 +6,7 @@
 	icon_state = "glass_empty"
 	amount_per_transfer_from_this = 10
 	volume = 50
-	g_amt = 500
+	materials = list(MAT_GLASS=500)
 
 
 	proc/smash(mob/living/target as mob, mob/living/user as mob)

code/modules/reagents/reagent_containers/glass_containers.dm

@@ -181,8 +181,7 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "beaker"
 	item_state = "beaker"
-	m_amt = 0
-	g_amt = 500
+	materials = list(MAT_GLASS=500)
 	var/obj/item/device/assembly_holder/assembly = null
 
 	on_reagent_change()
@@ -276,7 +275,7 @@
 	name = "large beaker"
 	desc = "A large beaker. Can hold up to 100 units."
 	icon_state = "beakerlarge"
-	g_amt = 2500
+	materials = list(MAT_GLASS=2500)
 	volume = 100
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25,30,50,100)
@@ -286,7 +285,7 @@
 	name = "vial"
 	desc = "A small glass vial. Can hold up to 25 units."
 	icon_state = "vial"
-	g_amt = 250
+	materials = list(MAT_GLASS=250)
 	volume = 25
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25)
@@ -296,7 +295,7 @@
 	name = "cryostasis beaker"
 	desc = "A cryostasis beaker that allows for chemical storage without reactions. Can hold up to 50 units."
 	icon_state = "beakernoreact"
-	g_amt = 500
+	materials = list(MAT_GLASS=500)
 	volume = 50
 	amount_per_transfer_from_this = 10
 	flags = OPENCONTAINER | NOREACT
@@ -305,7 +304,7 @@
 	name = "bluespace beaker"
 	desc = "A bluespace beaker, powered by experimental bluespace technology and Element Cuban combined with the Compound Pete. Can hold up to 300 units."
 	icon_state = "beakerbluespace"
-	g_amt = 5000
+	materials = list(MAT_GLASS=5000)
 	volume = 300
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25,30,50,100,300)
@@ -335,8 +334,7 @@
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "bucket"
 	item_state = "bucket"
-	m_amt = 200
-	g_amt = 0
+	materials = list(MAT_METAL=200)
 	w_class = 3.0
 	amount_per_transfer_from_this = 20
 	possible_transfer_amounts = list(5,10,15,25,30,50,80,100,120)
@@ -357,7 +355,7 @@
 	name = "vial"
 	desc = "Small glass vial. Looks fragile."
 	icon_state = "vial"
-	g_amt = 500
+	materials = list(MAT_GLASS=500)
 	volume = 15
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list(1,5,15)
@@ -386,8 +384,7 @@
 	icon = 'icons/obj/tank.dmi'
 	icon_state = "canister"
 	item_state = "canister"
-	m_amt = 300
-	g_amt = 0
+	materials = list(MAT_METAL=300)
 	w_class = 4.0
 
 	amount_per_transfer_from_this = 20

code/modules/reagents/syringe_gun.dm

@@ -7,7 +7,7 @@
 	throw_speed = 2
 	throw_range = 10
 	force = 4
-	m_amt = 2000
+	materials = list(MAT_METAL=2000)
 	clumsy_check = 0
 	fire_sound = 'sound/items/syringeproj.ogg'
 	var/list/syringes = list()