Merge remote-tracking branch 'tgstation/master' into point-zero

Conflicts:
	code/modules/research/protolathe.dm

code/modules/mining/ores_coins.dm

@@ -36,6 +36,7 @@
 	icon_state = "Glass ore"
 	origin_tech = "materials=1"
 	points = 1
+	materials = list(MAT_GLASS = 100)
 	refined_type = /obj/item/stack/sheet/glass
 
 /obj/item/weapon/ore/glass/attack_self(mob/living/user)
@@ -236,36 +237,43 @@
 /obj/item/weapon/coin/gold
 	cmineral = "gold"
 	icon_state = "coin_gold_heads"
+	materials = list(MAT_GOLD = 400)
 	value = 160
 
 /obj/item/weapon/coin/silver
 	cmineral = "silver"
 	icon_state = "coin_silver_heads"
+	materials = list(MAT_SILVER = 400)
 	value = 40
 
 /obj/item/weapon/coin/diamond
 	cmineral = "diamond"
 	icon_state = "coin_diamond_heads"
+	materials = list(MAT_DIAMOND = 400)
 	value = 120
 
 /obj/item/weapon/coin/iron
 	cmineral = "iron"
 	icon_state = "coin_iron_heads"
+	materials = list(MAT_METAL = 400)
 	value = 20
 
 /obj/item/weapon/coin/plasma
 	cmineral = "plasma"
 	icon_state = "coin_plasma_heads"
+	materials = list(MAT_PLASMA = 400)
 	value = 80
 
 /obj/item/weapon/coin/uranium
 	cmineral = "uranium"
 	icon_state = "coin_uranium_heads"
+	materials = list(MAT_URANIUM = 400)
 	value = 160
 
 /obj/item/weapon/coin/clown
 	cmineral = "bananium"
 	icon_state = "coin_bananium_heads"
+	materials = list(MAT_BANANIUM = 400)
 	value = 600 //makes the clown cri
 
 /obj/item/weapon/coin/adamantine