Fuck this shit

Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme

code/modules/mining/coins.dm

@@ -12,6 +12,7 @@
 	slot_flags = SLOT_EARS
 	var/string_attached
 	var/sides = 2
+	drop_sound = 'sound/items/drop/ring.ogg'
 
 /obj/item/weapon/coin/New()
 	randpixel_xy()

code/modules/mining/drilling/drill.dm

@@ -1,7 +1,7 @@
 /obj/machinery/mining
 	icon = 'icons/obj/mining_drill.dmi'
 	anchored = 0
-	use_power = 0 //The drill takes power directly from a cell.
+	use_power = USE_POWER_OFF //The drill takes power directly from a cell.
 	density = 1
 	layer = MOB_LAYER+0.1 //So it draws over mobs in the tile north of it.
 

code/modules/mining/machine_unloading.dm

@@ -11,17 +11,16 @@
 	var/obj/machinery/mineral/output = null
 
 
-/obj/machinery/mineral/unloading_machine/New()
-	..()
-	spawn( 5 )
-		for (var/dir in cardinal)
-			src.input = locate(/obj/machinery/mineral/input, get_step(src, dir))
-			if(src.input) break
-		for (var/dir in cardinal)
-			src.output = locate(/obj/machinery/mineral/output, get_step(src, dir))
-			if(src.output) break
-		return
-	return
+/obj/machinery/mineral/unloading_machine/Initialize()
+	. = ..()
+	for(var/dir in cardinal)
+		input = locate(/obj/machinery/mineral/input, get_step(src, dir))
+		if(input)
+			break
+	for(var/dir in cardinal)
+		output = locate(/obj/machinery/mineral/output, get_step(src, dir))
+		if(output)
+			break
 
 /obj/machinery/mineral/unloading_machine/process()
 	if (src.output && src.input)

code/modules/mining/mine_items.dm

@@ -23,7 +23,7 @@
 	var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
 	origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
 	attack_verb = list("hit", "pierced", "sliced", "attacked")
-	var/drill_sound = 'sound/weapons/Genhit.ogg'
+	var/drill_sound = "pickaxe"
 	var/drill_verb = "drilling"
 	sharp = 1
 

code/modules/mining/mine_turfs.dm

@@ -221,6 +221,9 @@ turf/simulated/mineral/floor/light_corner
 				if(istype(get_step(src, direction), /turf/simulated/mineral))
 					var/turf/simulated/mineral/M = get_step(src, direction)
 					M.update_icon()
+				if(istype(get_step(src, direction), /turf/simulated/wall/solidrock))
+					var/turf/simulated/wall/solidrock/M = get_step(src, direction)
+					M.update_icon()
 
 /turf/simulated/mineral/ex_act(severity)
 

code/modules/mining/mint.dm

@@ -1,6 +1,4 @@
 /**********************Mint**************************/
-
-
 /obj/machinery/mineral/mint
 	name = "Coin press"
 	icon = 'icons/obj/stationobjs.dmi'
@@ -21,43 +19,43 @@
 	var/coinsToProduce = 10
 
 
-/obj/machinery/mineral/mint/New()
-	..()
-	spawn( 5 )
-		for (var/dir in cardinal)
-			src.input = locate(/obj/machinery/mineral/input, get_step(src, dir))
-			if(src.input) break
-		for (var/dir in cardinal)
-			src.output = locate(/obj/machinery/mineral/output, get_step(src, dir))
-			if(src.output) break
-		START_PROCESSING(SSobj, src)
-		return
-	return
-
+/obj/machinery/mineral/mint/Initialize()
+	. = ..()
+	for (var/dir in cardinal)
+		input = locate(/obj/machinery/mineral/input, get_step(src, dir))
+		if(input)
+			break
+	for (var/dir in cardinal)
+		output = locate(/obj/machinery/mineral/output, get_step(src, dir))
+		if(output)
+			break
 
 /obj/machinery/mineral/mint/process()
-	if ( src.input)
-		var/obj/item/stack/O
-		O = locate(/obj/item/stack, input.loc)
-		if(O)
-			var/processed = 1
-			switch(O.get_material_name())
-				if("gold")
-					amt_gold += 100 * O.get_amount()
-				if("silver")
-					amt_silver += 100 * O.get_amount()
-				if("diamond")
-					amt_diamond += 100 * O.get_amount()
-				if("phoron")
-					amt_phoron += 100 * O.get_amount()
-				if("uranium")
-					amt_uranium += 100 * O.get_amount()
-				if(DEFAULT_WALL_MATERIAL)
-					amt_iron += 100 * O.get_amount()
-				else
-					processed = 0
-			if(processed)
-				qdel(O)
+	if(!input)
+		return
+
+	var/obj/item/stack/O = locate(/obj/item/stack, input.loc)
+	if(!O)
+		return
+
+	var/processed = 1
+	switch(O.get_material_name())
+		if("gold")
+			amt_gold += 100 * O.get_amount()
+		if("silver")
+			amt_silver += 100 * O.get_amount()
+		if("diamond")
+			amt_diamond += 100 * O.get_amount()
+		if("phoron")
+			amt_phoron += 100 * O.get_amount()
+		if("uranium")
+			amt_uranium += 100 * O.get_amount()
+		if(DEFAULT_WALL_MATERIAL)
+			amt_iron += 100 * O.get_amount()
+		else
+			processed = 0
+	if(processed)
+		qdel(O)
 
 /obj/machinery/mineral/mint/attack_hand(user as mob)
 

code/modules/mining/ore.dm

@@ -121,4 +121,14 @@
 		var/obj/item/device/core_sampler/C = W
 		C.sample_item(src, user)
 	else
-		return ..()
+		return ..()
+
+//VOREStation Add
+/obj/item/weapon/ore/attack(mob/living/M as mob, mob/living/user as mob)
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		if(H.species.eat_ore == 1)
+			H.eat_ore(src)
+			return
+	..()
+//VOREStation Add End

code/modules/mining/ore_datum.dm

@@ -51,6 +51,7 @@ var/global/list/ore_data = list()
 	name = "carbon"
 	display_name = "raw carbon"
 	smelts_to = "plastic"
+	compresses_to = "graphite"
 	alloy = 1
 	result_amount = 5
 	spread_chance = 25

code/modules/mining/ore_datum_vr.dm

@@ -1,2 +0,0 @@
-/ore/coal
-	compresses_to = "carbon"

code/modules/mining/ore_redemption_machine/equipment_vendor.dm

@@ -3,12 +3,13 @@
 /obj/machinery/mineral/equipment_vendor
 	name = "mining equipment vendor"
 	desc = "An equipment vendor for miners, points collected at an ore redemption machine can be spent here."
-	icon = 'icons/obj/machines/mining_machines.dmi'
-	icon_state = "mining"
+	icon = 'icons/obj/vending.dmi'
+	icon_state = "adh-tool"
 	density = TRUE
 	anchored = TRUE
+	var/icon_deny = "adh-tool-deny"
+	var/icon_vend = "adh-tool-vend"
 	circuit = /obj/item/weapon/circuitboard/mining_equipment_vendor
-	var/icon_deny = "mining-deny"
 	var/obj/item/weapon/card/id/inserted_id
 	//VOREStation Edit Start - Heavily modified list
 	var/list/prize_list = list(
@@ -107,7 +108,12 @@
 
 /obj/machinery/mineral/equipment_vendor/update_icon()
 	if(panel_open)
-		icon_state = "[initial(icon_state)]-open"
+		add_overlay("[initial(icon_state)]-panel")
+	else
+		cut_overlay("[initial(icon_state)]-panel")
+
+	if(stat & BROKEN)
+		icon_state = "[initial(icon_state)]-broken"
 	else if(powered())
 		icon_state = initial(icon_state)
 	else
@@ -174,6 +180,7 @@
 				inserted_id.mining_points -= prize.cost
 				to_chat(usr, "<span class='notice'>[src] clanks to life briefly before vending [prize.equipment_name]!</span>")
 				new prize.equipment_path(drop_location())
+				flick(icon_vend, src)
 		else
 			to_chat(usr, "<span class='warning'>Error: Please insert a valid ID!</span>")
 			flick(icon_deny, src)

code/modules/mining/ore_redemption_machine/survey_vendor.dm

@@ -7,7 +7,7 @@
 	anchored = TRUE
 	circuit = /obj/item/weapon/circuitboard/exploration_equipment_vendor
 	icon_deny = "exploration-deny" //VOREStation Edit
-	var/icon_vend = "exploration-vend" //VOREStation Add
+	icon_vend = "exploration-vend" //VOREStation Add
 	//VOREStation Edit Start - Heavily modified list
 	prize_list = list(
 		new /datum/data/mining_equipment("1 Marker Beacon",			/obj/item/stack/marker_beacon,										1),

code/modules/mining/resonator.dm

@@ -63,9 +63,7 @@
 	transform = matrix()*0.75
 	animate(src, transform = matrix()*1.5, time = timetoburst)
 	// Queue the actual bursting
-	spawn(timetoburst)
-		if(!QDELETED(src))
-			burst(creator)
+	addtimer(CALLBACK(src, ./proc/burst, creator), timetoburst)
 
 /obj/effect/resonance/proc/burst(var/creator = null)
 	var/turf/T = get_turf(src)

code/modules/mining/shelter_atoms.dm

@@ -222,9 +222,9 @@
 	name = "survival pod storage"
 	desc = "A heated storage unit."
 	icon_state = "donkvendor"
+	icon_base = "donkvendor"
+	icon_contents = null
 	icon = 'icons/obj/survival_pod_vend.dmi'
-	icon_on = "donkvendor"
-	icon_off = "donkvendor"
 	light_range = 5
 	light_power = 1.2
 	light_color = "#DDFFD3"

code/modules/mining/shelter_atoms_vr.dm

@@ -0,0 +1,13 @@
+/obj/structure/fans/hardlight
+	name = "hardlight shield"
+	desc = "Retains air, allows passage."
+	plane = TURF_PLANE
+	layer = ABOVE_TURF_LAYER
+	density = FALSE
+	icon = 'icons/effects/effects_vr.dmi'
+	icon_state = "hardlight"
+	buildstackamount = 2
+
+	light_range = 3
+	light_power = 1
+	light_color = "#FFFFFF"