Merge remote-tracking branch 'upstream/master'

code/modules/mining/shelter_atoms.dm

@@ -87,6 +87,11 @@
 	desc = "An exorbitantly expensive luxury suite programmed into construction nanomachines. There's a license for use printed on the bottom."
 	template_id = "shelter_beta"
 
+/obj/item/device/survivalcapsule/tabiranth
+	name = "silver-trimmed surfluid shelter capsule"
+	desc = "An exorbitantly expensive luxury suite programmed into construction nanomachines. This one is a particularly rare and expensive model. There's a license for use printed on the bottom."
+	template_id = "shelter_gamma"
+
 //Pod objects
 //Walls
 /turf/simulated/shuttle/wall/voidcraft/survival
@@ -197,6 +202,9 @@
 	icon = 'icons/obj/survival_pod.dmi'
 	icon_state = "bed"
 
+/obj/structure/bed/pod/New(var/newloc)
+	..(newloc,DEFAULT_WALL_MATERIAL,"cotton")
+
 //Survival Storage Unit
 /obj/machinery/smartfridge/survival_pod
 	name = "survival pod storage"

code/modules/mining/shelters.dm

@@ -70,3 +70,18 @@
 	whitelisted_turfs = typecacheof(/turf/simulated/mineral)
 	banned_objects = list()
 
+/datum/map_template/shelter/gamma
+	name = "Shelter Gamma"
+	shelter_id = "shelter_gamma"
+	description = "An heavily modified variant of the luxury shelter, \
+		this particular model has extra food, drinks, and other supplies. \
+		Originally designed for use by colonists on worlds with little to \
+		to no contact, the expense of these shelters have prevented them \
+		from seeing common use."
+	mappath = "maps/submaps/shelters/shelter_3.dmm"
+	roof = "roof_beta"
+
+/datum/map_template/shelter/gamma/New()
+	. = ..()
+	whitelisted_turfs = typecacheof(/turf/simulated/mineral)
+	banned_objects = list()