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

# Conflicts:
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/security.dm
#	code/game/area/Space Station 13 areas.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm

code/modules/mining/drilling/drill.dm

@@ -269,7 +269,7 @@
 					resource_field += mine_turf
 
 	if(!resource_field.len)
-		system_error("resources depleted")
+		system_error("Resources depleted.")
 
 /obj/machinery/mining/drill/proc/use_cell_power()
 	if(!cell) return 0

code/modules/mining/machine_stacking.dm

@@ -59,6 +59,7 @@
 			var/obj/item/stack/material/S = new stacktype (get_turf(machine.output))
 			S.amount = machine.stack_storage[href_list["release_stack"]]
 			machine.stack_storage[href_list["release_stack"]] = 0
+			S.update_icon()
 
 	src.add_fingerprint(usr)
 	src.updateUsrDialog()
@@ -128,6 +129,7 @@
 			var/obj/item/stack/material/S = new stacktype (get_turf(output))
 			S.amount = stack_amt
 			stack_storage[sheet] -= stack_amt
+			S.update_icon()
 
 	console.updateUsrDialog()
 	return

code/modules/mining/ore_datum.dm

@@ -108,6 +108,7 @@ var/global/list/ore_data = list()
 /ore/diamond
 	name = "diamond"
 	display_name = "diamond"
+	alloy = 1
 	compresses_to = "diamond"
 	result_amount = 5
 	spread_chance = 10