Merge with dev.

code/modules/paperwork/pen.dm

@@ -21,7 +21,7 @@
 	w_class = 1.0
 	throw_speed = 7
 	throw_range = 15
-	m_amt = 10
+	matter = list("metal" = 10)
 	var/colour = "black"	//what colour the ink is!
 	pressure_resistance = 2
 

code/modules/paperwork/photography.dm

@@ -119,7 +119,7 @@
 	w_class = 2.0
 	flags = FPRINT | CONDUCT | TABLEPASS
 	slot_flags = SLOT_BELT
-	m_amt = 2000
+	matter = list("metal" = 2000)
 	var/pictures_max = 10
 	var/pictures_left = 10
 	var/on = 1

code/modules/paperwork/stamps.dm

@@ -9,7 +9,7 @@
 	w_class = 1.0
 	throw_speed = 7
 	throw_range = 15
-	m_amt = 60
+	matter = list("metal" = 60)
 	item_color = "cargo"
 	pressure_resistance = 2
 	attack_verb = list("stamped")