Merge remote-tracking branch 'upstream/master' into pixel-shift

code/game/objects/structures/trash_pile_vr.dm

@@ -251,6 +251,7 @@
 					prob(1);/obj/item/weapon/material/knife/tacknife,
 					prob(1);/obj/item/weapon/storage/box/survival/space,
 					prob(1);/obj/item/weapon/storage/secure/briefcase/trashmoney,
+					prob(1);/obj/item/device/survivalcapsule/popcabin,
 					prob(1);/obj/item/weapon/reagent_containers/syringe/steroid)
 
 	var/obj/item/I = new path()

code/modules/mining/shelter_atoms_vr.dm

@@ -119,6 +119,11 @@ GLOBAL_LIST_EMPTY(unique_deployable)
 	unique_id = "shelter_5"
 	is_ship = TRUE
 
+/obj/item/device/survivalcapsule/popcabin
+	name = "pop-out cabin shelter capsule"
+	desc = "A cozy cabin; crammed into a survival capsule."
+	template_id = "shelter_cab"
+
 /obj/item/device/survivalcapsule/dropship
 	name = "dropship surfluid shelter capsule"
 	desc = "A military dropship in a capsule. Contains everything an assault squad would need, minus the squad itself. This capsule is significantly larger than most. There's a license for use printed on the bottom."

code/modules/mining/shelters_vr.dm

@@ -96,6 +96,12 @@
 		for escaping a dying ship as soon as possible."
 	mappath = "maps/offmap_vr/om_ships/shelter_5.dmm"
 
+/datum/map_template/shelter/cabin
+	name = "Shelter Cabin"
+	shelter_id = "shelter_cab"
+	description = "A small cabin; turned into a shelter capsule. Includes dorm amenities, and a nice dinner."
+	mappath = "maps/submaps/shelters/shelter_cab.dmm"
+
 /datum/map_template/shelter/zeta
 	name = "Shelter Zeta"
 	shelter_id = "shelter_zeta"