Merge with development

code/modules/mining/alloys.dm

@@ -11,25 +11,25 @@
 /datum/alloy/plasteel
 	metaltag = "plasteel"
 	requires = list(
-		"platinum" = 1,
-		"carbon" = 2,
-		"hematite" = 2
-		)
+		ORE_PLATINUM = 1,
+		ORE_COAL = 2,
+		ORE_IRON = 2
+	)
 	product_mod = 0.3
 	product = /obj/item/stack/material/plasteel
 
 /datum/alloy/steel
 	metaltag = DEFAULT_WALL_MATERIAL
 	requires = list(
-		"carbon" = 1,
-		"hematite" = 1
-		)
+		ORE_COAL = 1,
+		ORE_IRON = 1
+	)
 	product = /obj/item/stack/material/steel
 
 /datum/alloy/borosilicate
 	metaltag = "borosilicate glass"
 	requires = list(
-		"platinum" = 1,
-		"sand" = 2
-		)
+		ORE_PLATINUM = 1,
+		ORE_SAND = 2
+	)
 	product = /obj/item/stack/material/glass/phoronglass

code/modules/mining/drilling/drill.dm

@@ -38,6 +38,8 @@
 	var/need_update_field = 0
 	var/need_player_check = 0
 
+	var/datum/effect_system/sparks/spark_system
+
 /obj/machinery/mining/drill/New()
 
 	..()
@@ -49,6 +51,8 @@
 	component_parts += new /obj/item/weapon/stock_parts/micro_laser(src)
 	component_parts += new /obj/item/weapon/cell/high(src)
 
+	spark_system = bind_spark(src, 3)
+
 	RefreshParts()
 
 /obj/machinery/mining/drill/process()
@@ -208,15 +212,11 @@
 			if(supported && panel_open)
 				if(cell)
 					system_error("unsealed cell fitting error")
-					var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
-					s.set_up(3, 1, src.loc)
-					s.start()
+					spark_system.queue()
 					sleep(20)
-					s.set_up(3, 1, src.loc)
-					s.start()
+					spark_system.queue()
 					sleep(10)
-					s.set_up(3, 1, src.loc)
-					s.start()
+					spark_system.queue()
 					sleep(10)
 					if(panel_open)
 						if(prob(70))

code/modules/mining/mine_items.dm

@@ -34,7 +34,10 @@
 	name = "lantern"
 	icon_state = "lantern"
 	desc = "A mining lantern."
-	brightness_on = 6			// luminosity when on
+	brightness_on = 4			// luminosity when on
+	light_power = 0.75
+	light_wedge = LIGHT_OMNI
+	light_color = LIGHT_COLOR_FIRE
 
 /*****************************Pickaxe********************************/
 

code/modules/mining/mine_turfs.dm

@@ -279,7 +279,8 @@
 				if(prob(50))
 					M.Stun(5)
 			M.apply_effect(25, IRRADIATE)
-
+			if(prob(3))
+				excavate_find(prob(5), finds[1])
 
 	var/list/step_overlays = list("n" = NORTH, "s" = SOUTH, "e" = EAST, "w" = WEST)
 
@@ -296,8 +297,12 @@
 				if(istype(get_step(T, step_overlays[next_direction]),/turf/simulated/mineral))
 					T.overlays += image('icons/turf/walls.dmi', "rock_side", dir = step_overlays[next_direction])
 
+	if(rand(1,500) == 1)
+		visible_message("<span class='notice'>An old dusty crate was buried within!</span>")
+		new /obj/structure/closet/crate/secure/loot(src)
+
 	if(istype(N))
-		N.overlay_detail = "asteroid[rand(0,9)]"
+		N.overlay_detail = rand(0,9)
 		N.updateMineralOverlays(1)
 
 /turf/simulated/mineral/proc/excavate_find(var/prob_clean = 0, var/datum/find/F)
@@ -369,13 +374,21 @@
 
 /turf/simulated/mineral/random
 	name = "Mineral deposit"
-	var/mineralSpawnChanceList = list("Uranium" = 5, "Platinum" = 5, "Iron" = 35, "Coal" = 35, "Diamond" = 1, "Gold" = 5, "Silver" = 5, "Phoron" = 10)
-	var/mineralChance = 100 //10 //means 10% chance of this plot changing to a mineral deposit
+	var/mineralSpawnChanceList = list(
+		ORE_URANIUM = 5, 
+		ORE_PLATINUM = 5, 
+		ORE_IRON = 35, 
+		ORE_COAL = 35, 
+		ORE_DIAMOND = 1, 
+		ORE_GOLD = 5, 
+		ORE_SILVER = 5, 
+		ORE_PHORON = 10
+	)
+	var/mineralChance = 10 //means 10% chance of this plot changing to a mineral deposit
 
 /turf/simulated/mineral/random/New()
 	if (prob(mineralChance) && !mineral)
 		var/mineral_name = pickweight(mineralSpawnChanceList) //temp mineral name
-		mineral_name = lowertext(mineral_name)
 		if (mineral_name && (mineral_name in ore_data))
 			mineral = ore_data[mineral_name]
 			UpdateMineral()
@@ -383,8 +396,17 @@
 	. = ..()
 
 /turf/simulated/mineral/random/high_chance
-	mineralChance = 100 //25
-	mineralSpawnChanceList = list("Uranium" = 10, "Platinum" = 10, "Iron" = 20, "Coal" = 20, "Diamond" = 2, "Gold" = 10, "Silver" = 10, "Phoron" = 20)
+	mineralChance = 25
+	mineralSpawnChanceList = list(
+		ORE_URANIUM = 10, 
+		ORE_PLATINUM = 10, 
+		ORE_IRON = 20, 
+		ORE_COAL = 20, 
+		ORE_DIAMOND = 2, 
+		ORE_GOLD = 10, 
+		ORE_SILVER = 10, 
+		ORE_PHORON = 20
+	)
 
 
 /**********************Asteroid**************************/
@@ -406,13 +428,14 @@
 	temperature = TCMB
 	var/dug = 0       //0 = has not yet been dug, 1 = has already been dug
 	var/overlay_detail
+	var/static/list/overlay_cache
 	has_resources = 1
 	footstep_sound = "gravelstep"
 
 /turf/simulated/floor/asteroid/New()
 
 	if(prob(20))
-		overlay_detail = "asteroid[rand(0,9)]"
+		overlay_detail = rand(0,9)
 
 /turf/simulated/floor/asteroid/ex_act(severity)
 	switch(severity)
@@ -531,8 +554,14 @@
 		if(istype(get_step(src, step_overlays[direction]), /turf/simulated/mineral))
 			overlays += image('icons/turf/walls.dmi', "rock_side", dir = step_overlays[direction])
 
-	//todo cache
-	if(overlay_detail) overlays |= image(icon = 'icons/turf/flooring/decals.dmi', icon_state = overlay_detail)
+	if (!overlay_cache)
+		overlay_cache = list()
+		overlay_cache.len = 10
+		for (var/i = 1; i <= overlay_cache.len; i++)
+			overlay_cache[i] = image('icons/turf/flooring/decals.dmi', "asteroid[i - 1]")
+
+	if(overlay_detail) 
+		overlays += overlay_cache[overlay_detail + 1]
 
 	if(update_neighbors)
 		var/list/all_step_directions = list(NORTH,NORTHEAST,EAST,SOUTHEAST,SOUTH,SOUTHWEST,WEST,NORTHWEST)

code/modules/mining/ore_datum.dm

@@ -24,7 +24,7 @@ var/global/list/ore_data = list()
 		display_name = name
 
 /ore/uranium
-	name = "uranium"
+	name = ORE_URANIUM
 	display_name = "pitchblende"
 	smelts_to = "uranium"
 	result_amount = 5
@@ -38,7 +38,7 @@ var/global/list/ore_data = list()
 	xarch_source_mineral = "potassium"
 
 /ore/hematite
-	name = "hematite"
+	name = ORE_IRON
 	display_name = "hematite"
 	smelts_to = "iron"
 	alloy = 1
@@ -48,7 +48,7 @@ var/global/list/ore_data = list()
 	scan_icon = "mineral_common"
 
 /ore/coal
-	name = "carbon"
+	name = ORE_COAL
 	display_name = "raw carbon"
 	smelts_to = "plastic"
 	alloy = 1
@@ -58,13 +58,13 @@ var/global/list/ore_data = list()
 	scan_icon = "mineral_common"
 
 /ore/glass
-	name = "sand"
+	name = ORE_SAND
 	display_name = "sand"
 	smelts_to = "glass"
 	compresses_to = "sandstone"
 
 /ore/phoron
-	name = "phoron"
+	name = ORE_PHORON
 	display_name = "phoron crystals"
 	compresses_to = "phoron"
 	//smelts_to = something that explodes violently on the conveyor, huhuhuhu
@@ -81,7 +81,7 @@ var/global/list/ore_data = list()
 	xarch_source_mineral = "phoron"
 
 /ore/silver
-	name = "silver"
+	name = ORE_SILVER
 	display_name = "native silver"
 	smelts_to = "silver"
 	result_amount = 5
@@ -90,7 +90,7 @@ var/global/list/ore_data = list()
 	scan_icon = "mineral_uncommon"
 
 /ore/gold
-	smelts_to = "gold"
+	smelts_to = ORE_GOLD
 	name = "gold"
 	display_name = "native gold"
 	result_amount = 5
@@ -105,7 +105,7 @@ var/global/list/ore_data = list()
 		)
 
 /ore/diamond
-	name = "diamond"
+	name = ORE_DIAMOND
 	display_name = "diamond"
 	compresses_to = "diamond"
 	result_amount = 5
@@ -115,7 +115,7 @@ var/global/list/ore_data = list()
 	xarch_source_mineral = "nitrogen"
 
 /ore/platinum
-	name = "platinum"
+	name = ORE_PLATINUM
 	display_name = "raw platinum"
 	smelts_to = "platinum"
 	compresses_to = "osmium"
@@ -126,8 +126,8 @@ var/global/list/ore_data = list()
 	scan_icon = "mineral_rare"
 
 /ore/hydrogen
-	name = "mhydrogen"
+	name = ORE_HYDROGEN
 	display_name = "metallic hydrogen"
 	smelts_to = "tritium"
 	compresses_to = "mhydrogen"
-	scan_icon = "mineral_rare"
+	scan_icon = "mineral_rare"