From 5ae8a2d5a51a6ce586b317b9a783e2de587dd32e Mon Sep 17 00:00:00 2001
From: LordFowl <pundanar@gmail.com>
Date: Mon, 5 Jun 2017 04:13:32 -0400
Subject: [PATCH] [New Map] Digging with a shovel no longer creates ore from
 nothing (#2611)

Using a shovel to dig a hole will now only spawn ore that that ore already holds. This means that an ore scanner is once again needed to maximise profits, although digging with a shovel remains far more inefficient than digging with a drill, due to simply how much sand there is in a sand tile.
---
 code/modules/mining/mine_turfs.dm | 60 +++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 18 deletions(-)

diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 5bf84da19be..69f23d082bb 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -709,27 +709,51 @@
 	add_overlay("asteroid_dug", TRUE)
 
 	if(prob(75))
-		new/obj/item/weapon/ore/glass(src)
+		new /obj/item/weapon/ore/glass(src)
 
-	if(prob(25))
-		var/list/ore = list(/obj/item/weapon/ore/coal = 12,
-		/obj/item/weapon/ore/iron = 8,
-		/obj/item/weapon/ore/phoron = 3,
-		/obj/item/weapon/ore/silver = 3,
-		/obj/item/weapon/ore/gold = 2,
-		/obj/item/weapon/ore/osmium = 3,
-		/obj/item/weapon/ore/hydrogen = 2,
-		/obj/item/weapon/ore/uranium = 1,
-		/obj/random/junk = 1,
-		/obj/item/weapon/ore/diamond = 0.5,
-		/obj/random/powercell = 0.2,
-		/obj/random/coin = 0.2,
-		/obj/random/loot = 0.1,
-		/obj/random/action_figure = 0.1)
-		var/ore_path = pickweight(ore)
+	if(prob(25) && has_resources)
+		var/list/ore = list()
+		for(var/metal in resources)
+
+			switch(metal)
+				if("silicates")
+					ore += /obj/item/weapon/ore/glass
+				if("carbonaceous rock")
+					ore += /obj/item/weapon/ore/coal
+				if("iron")
+					ore += /obj/item/weapon/ore/iron
+				if("gold")
+					ore += /obj/item/weapon/ore/gold
+				if("silver")
+					ore += /obj/item/weapon/ore/silver
+				if("diamond")
+					ore += /obj/item/weapon/ore/diamond
+				if("uranium")
+					ore += /obj/item/weapon/ore/uranium
+				if("phoron")
+					ore += /obj/item/weapon/ore/phoron
+				if("osmium")
+					ore += /obj/item/weapon/ore/osmium
+				if("hydrogen")
+					ore += /obj/item/weapon/ore/hydrogen
+				else
+					if(prob(25))
+						switch(rand(1,5))
+							if(1)
+								ore += /obj/random/junk
+							if(2)
+								ore += /obj/random/powercell
+							if(3)
+								ore += /obj/random/coin
+							if(4)
+								ore += /obj/random/loot
+							if(5)
+								ore += /obj/item/weapon/ore/glass
+					else
+						ore += /obj/item/weapon/ore/glass
+		var/ore_path = pick(ore)
 		if(ore)
 			new ore_path(src)
-			user << "<span class='notice'>You unearth something amidst the sand!</span>"
 
 	if(dug <= 10)
 		dug += 1