Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull

code/modules/mining/abandonedcrates.dm

@@ -1,9 +1,7 @@
 /obj/structure/closet/crate/secure/loot
 	name = "abandoned crate"
 	desc = "What could be inside?"
-	icon_state = "securecrate"
-	icon_opened = "securecrateopen"
-	icon_closed = "securecrate"
+	closet_appearance = /decl/closet_appearance/crate/secure
 	var/list/code = list()
 	var/list/lastattempt = list()
 	var/attempts = 10
@@ -65,7 +63,7 @@
 		if(57 to 58)
 			new/obj/item/toy/syndicateballoon(src)
 		if(59 to 60)
-			new/obj/item/weapon/rig(src)
+			new/obj/item/weapon/rig/industrial(src)
 		if(61 to 62)
 			for(var/i = 0, i < 12, ++i)
 				new/obj/item/clothing/head/kitty(src)
@@ -164,7 +162,7 @@
 		to_chat(user, "<span class='notice'>You leave the crate alone.</span>")
 	else if(check_input(input))
 		to_chat(user, "<span class='notice'>The crate unlocks!</span>")
-		playsound(user, 'sound/machines/lockreset.ogg', 50, 1)
+		playsound(src, 'sound/machines/lockreset.ogg', 50, 1)
 		set_locked(0)
 	else
 		visible_message("<span class='warning'>A red light on \the [src]'s control panel flashes briefly.</span>")

code/modules/mining/alloys_vr.dm

@@ -18,7 +18,7 @@
 	product = /obj/item/stack/material/glass/titanium
 
 /datum/alloy/plastiglass
-	metaltag = MAT_PLASTANIUMGLASS
+	metaltag = MAT_PLASTITANIUMGLASS
 	requires = list(
 		"rutile" = 1,
 		"sand" = 2,

code/modules/mining/drilling/drill.dm

@@ -54,7 +54,16 @@
 
 /obj/machinery/mining/drill/Initialize()
 	. = ..()
+	if(ispath(cell))
+		cell = new cell(src)
 	default_apply_parts()
+	cell = default_use_hicell()
+
+/obj/machinery/mining/drill/loaded
+	cell = /obj/item/weapon/cell/high
+
+/obj/machinery/mining/drill/get_cell()
+	return cell	
 
 /obj/machinery/mining/drill/process()
 
@@ -166,7 +175,7 @@
 			to_chat(user, "The drill already has a cell installed.")
 		else
 			user.drop_item()
-			O.loc = src
+			O.forceMove(src)
 			cell = O
 			component_parts += O
 			to_chat(user, "You install \the [O].")
@@ -178,7 +187,7 @@
 
 	if (panel_open && cell && user.Adjacent(src))
 		to_chat(user, "You take out \the [cell].")
-		cell.loc = get_turf(user)
+		cell.forceMove(get_turf(user))
 		component_parts -= cell
 		cell = null
 		return
@@ -236,7 +245,7 @@
 			capacity = 200 * P.rating
 		if(istype(P, /obj/item/weapon/stock_parts/capacitor))
 			charge_use -= 10 * P.rating
-	cell = locate(/obj/item/weapon/cell) in component_parts
+	cell = locate(/obj/item/weapon/cell) in src
 
 /obj/machinery/mining/drill/proc/check_supports()
 

code/modules/mining/drilling/scanner.dm

@@ -10,7 +10,7 @@
 
 /obj/item/weapon/mining_scanner/attack_self(mob/user as mob)
 	to_chat(user, "<span class='notice'>You begin sweeping \the [src] about, scanning for metal deposits.</span>")
-	playsound(loc, 'sound/items/goggles_charge.ogg', 50, 1, -6)
+	playsound(src, 'sound/items/goggles_charge.ogg', 50, 1, -6)
 
 	if(!do_after(user, scan_time))
 		return

code/modules/mining/fulton.dm

@@ -93,7 +93,7 @@ var/global/list/total_extraction_beacons = list()
 			balloon.appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
 			holder_obj.cut_overlay(balloon2)
 			holder_obj.add_overlay(balloon)
-			playsound(holder_obj.loc, 'sound/items/fulext_deploy.wav', 50, 1, -3)
+			playsound(holder_obj, 'sound/items/fulext_deploy.wav', 50, 1, -3)
 			animate(holder_obj, pixel_z = 10, time = 20)
 			sleep(20)
 			animate(holder_obj, pixel_z = 15, time = 10)
@@ -104,7 +104,7 @@ var/global/list/total_extraction_beacons = list()
 			sleep(10)
 			animate(holder_obj, pixel_z = 10, time = 10)
 			sleep(10)
-			playsound(holder_obj.loc, 'sound/items/fultext_launch.wav', 50, 1, -3)
+			playsound(holder_obj, 'sound/items/fultext_launch.wav', 50, 1, -3)
 			animate(holder_obj, pixel_z = 1000, time = 30)
 			if(ishuman(A))
 				var/mob/living/carbon/human/L = A

code/modules/mining/mine_items.dm

@@ -138,11 +138,8 @@
 /obj/structure/closet/crate/miningcar
 	desc = "A mining car. This one doesn't work on rails, but has to be dragged."
 	name = "Mining car (not for rails)"
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "miningcar"
+	icon = 'icons/obj/closets/miningcar.dmi'
 	density = 1
-	icon_opened = "miningcaropen"
-	icon_closed = "miningcar"
 
 // Flags.
 

code/modules/mining/mine_turfs.dm

@@ -337,7 +337,7 @@ turf/simulated/mineral/floor/light_corner
 				return
 
 			to_chat(user, "<span class='notice'>You start digging.</span>")
-			playsound(user.loc, 'sound/effects/rustle1.ogg', 50, 1)
+			playsound(user, 'sound/effects/rustle1.ogg', 50, 1)
 
 			if(!do_after(user,30)) return //YAWN change. 30 from 40
 

code/modules/mining/ore.dm

@@ -125,12 +125,12 @@
 
 //VOREStation Add
 /obj/item/weapon/ore/attack(mob/living/M as mob, mob/living/user as mob)
-	if(M.handle_eat_ore(src, user))
+	if(M.handle_eat_minerals(src, user))
 		return
 	..()
 
 /obj/item/weapon/ore/attack_generic(var/mob/living/user) //Allow adminbussed mobs to eat ore if they click it while NOT on help intent.
-	if(user.handle_eat_ore(src))
+	if(user.handle_eat_minerals(src))
 		return
 	..()
 //VOREStation Add End

code/modules/mining/shelter_atoms_vr.dm

@@ -87,7 +87,7 @@ GLOBAL_LIST_EMPTY(unique_deployable)
 		smoke.start()
 		sleep(4 SECONDS)
 
-		playsound(get_turf(src), 'sound/effects/phasein.ogg', 100, 1)
+		playsound(src, 'sound/effects/phasein.ogg', 100, 1)
 
 		log_and_message_admins("[key_name_admin(usr)] activated a bluespace capsule at [get_area(T)]!")
 		if(above_location)