Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update

# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved

code/modules/mining/coins.dm

@@ -3,6 +3,7 @@
 /obj/item/weapon/coin
 	icon = 'icons/obj/items.dmi'
 	name = "Coin"
+	desc = "A simple coin you can flip."
 	icon_state = "coin"
 	force = 0.0
 	throwforce = 0.0

code/modules/mining/machine_stacking.dm

@@ -130,7 +130,7 @@
 			S.amount = stack_amt
 			stack_storage[sheet] -= stack_amt
 			S.update_icon()
-
+	
 	if(console)
 		console.updateUsrDialog()
 	return