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

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,8 +54,13 @@
 
 /obj/machinery/mining/drill/Initialize()
 	. = ..()
+	if(ispath(cell))
+		cell = new cell(src)
 	default_apply_parts()
 
+/obj/machinery/mining/drill/loaded
+	cell = /obj/item/weapon/cell/high
+
 /obj/machinery/mining/drill/process()
 
 	if(need_player_check)
@@ -236,7 +241,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/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