Merge branch 'master' into upstream-merge-5654

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
@@ -123,7 +128,7 @@
 	basestate = "pwindow"
 
 //The windows have diagonal versions, and will never be a full window
-/obj/structure/window/reinforced/survival_pod/is_full_window()
+/obj/structure/window/reinforced/survival_pod/is_fulltile()
 	return FALSE
 
 /obj/structure/window/reinforced/survival_pod/update_icon()
@@ -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"
@@ -209,25 +217,13 @@
 	light_power = 1.2
 	light_color = "#DDFFD3"
 	pixel_y = -4
-	max_n_of_items = 10
-	var/empty = FALSE
+	max_n_of_items = 100
 
-/obj/machinery/smartfridge/survival_pod/initialize(mapload)
+/obj/machinery/smartfridge/survival_pod/initialize()
 	. = ..()
-	if(empty)
-		return
-	for(var/i in 1 to 5)
-		var/obj/item/weapon/reagent_containers/food/snacks/liquidfood/W = new(src)
-		stock(W)
-	for(var/i in 1 to 2)
-		var/obj/item/device/fbp_backup_cell/W = new(src)
-		stock(W)
-	if(prob(50))
-		var/obj/item/weapon/storage/pill_bottle/dice/D = new(src)
-		stock(D)
-	else
-		var/obj/item/device/instrument/violin/V = new(src)
-		stock(V)
+	for(var/obj/item/O in loc)
+		if(accept_check(O))
+			stock(O)
 
 /obj/machinery/smartfridge/survival_pod/accept_check(obj/item/O)
 	return isitem(O)
@@ -235,7 +231,6 @@
 /obj/machinery/smartfridge/survival_pod/empty
 	name = "dusty survival pod storage"
 	desc = "A heated storage unit. This one's seen better days."
-	empty = TRUE
 
 //Fans
 /obj/structure/fans

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()