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

code/modules/mining/abandonedcrates_vr.dm

@@ -170,6 +170,6 @@
 	)
 
 /obj/item/storage/backpack/sport/hyd/catchemall/Initialize() //gotta have your starter 'mon too (or an improved way to catch one)
-	..()
+	. = ..()
 	var/path = pick(subtypesof(/obj/item/capture_crystal))
 	contents += new path()

code/modules/mining/mine_turfs.dm

@@ -327,7 +327,7 @@ var/list/mining_overlay_cache = list()
 	if(!density)
 		return .
 
-	if(istype(AM,/mob/living/carbon/human))
+	if(ishuman(AM))
 		var/mob/living/carbon/human/H = AM
 		var/obj/item/pickaxe/P = H.get_inactive_hand()
 		if(istype(P))

code/modules/mining/ore.dm

@@ -175,7 +175,7 @@
 	name = "ore chunk"
 	desc = "A conglomerate of ore."
 	icon = 'icons/obj/mining_ore_vr.dmi'
-	icon_state = "strange"
+	icon_state = "ore2"
 	randpixel = 8
 	w_class = ITEMSIZE_SMALL
 	var/list/stored_ore = list(

code/modules/mining/shelter_atoms_vr.dm

@@ -244,8 +244,8 @@ GLOBAL_LIST_EMPTY(unique_deployable)
 	icon = 'icons/obj/survival_pod.dmi'
 	icon_state = "bed"
 
-/obj/structure/bed/pod/New(var/newloc)
-	..(newloc,MAT_STEEL,"cotton")
+/obj/structure/bed/pod/Initialize(var/newloc)
+	. = ..(newloc, MAT_STEEL, MAT_COTTON)
 
 //Survival Storage Unit
 /obj/machinery/smartfridge/survival_pod