Merge remote-tracking branch 'upstream/master'

code/modules/mining/mine_turfs.dm

@@ -56,7 +56,8 @@ var/list/mining_overlay_cache = list()
 		"silicates" = /obj/item/weapon/ore/glass,
 		"carbon" = /obj/item/weapon/ore/coal,
 		"verdantium" = /obj/item/weapon/ore/verdantium,
-		"marble" = /obj/item/weapon/ore/marble
+		"marble" = /obj/item/weapon/ore/marble,
+		"lead" = /obj/item/weapon/ore/lead
 	)
 
 	has_resources = 1

code/modules/mining/ore.dm

@@ -28,7 +28,7 @@
 	name = "recrystallized carbonate"
 	icon_state = "ore_marble"
 	origin_tech = list(TECH_MATERIAL = 1)
-	material = "carbon"
+	material = "marble"
 
 /obj/item/weapon/ore/glass
 	name = "sand"

code/modules/mining/ore_datum.dm

@@ -140,6 +140,7 @@ var/global/list/ore_data = list()
 	compresses_to = MAT_VERDANTIUM
 	result_amount = 2
 	spread_chance = 5
+	ore = /obj/item/weapon/ore/verdantium
 	scan_icon = "mineral_rare"
 	xarch_ages = list(
 		"billion" = 13,