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

# Conflicts:
#	code/_helpers/unsorted.dm

code/modules/mining/mine_turfs.dm

@@ -571,7 +571,7 @@ var/list/mining_overlay_cache = list()
 				new /obj/item/stack/material/uranium(src, rand(5,25))
 
 /turf/simulated/mineral/proc/make_ore(var/rare_ore)
-	if(mineral)
+	if(mineral || ignore_mapgen) //VOREStation Edit - Makes sense, doesn't it?
 		return
 
 	var/mineral_name

code/modules/mining/shelter_atoms.dm

@@ -118,6 +118,7 @@
 
 //Sleeper
 /obj/machinery/sleeper/survival_pod
+	desc = "A limited functionality sleeper, all it can do is put patients into stasis. It lacks the medication and configuration of the larger units."
 	icon = 'icons/obj/survival_pod.dmi'
 	icon_state = "sleeper"
 	stasis_level = 100 //Just one setting