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"

maps/offmap_vr/om_ships/gecko_cr_wreck.dmm

@@ -479,7 +479,7 @@
 	icon_state = "door_open";
 	opacity = 0
 	},
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/airless,
 /area/shuttle/gecko_cr_cockpit_wreck)
 "kn" = (
 /obj/effect/floor_decal/industrial/warning{
@@ -2909,7 +2909,7 @@
 	opacity = 0
 	},
 /obj/structure/grille/broken,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/airless,
 /area/shuttle/gecko_cr_cockpit_wreck)
 "Zb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{

maps/offmap_vr/om_ships/salamander_wreck.dmm

@@ -38,7 +38,7 @@
 /obj/machinery/power/pointdefense{
 	id_tag = "salamander_wreck_pd"
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/airless,
 /area/shuttle/salamander_wreck_q2)
 "br" = (
 /obj/structure/window/reinforced/tinted,
@@ -1274,7 +1274,7 @@
 /obj/machinery/power/pointdefense{
 	id_tag = "salamander_wreck_pd"
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/airless,
 /area/shuttle/salamander_wreck_engineering)
 "tL" = (
 /obj/structure/girder,
@@ -1525,7 +1525,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/airless,
 /area/shuttle/salamander_wreck_cockpit)
 "Il" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{

maps/submaps/shelters/shelter_cab.dmm

@@ -0,0 +1,203 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod)
+"b" = (
+/obj/structure/bed/chair/comfy/brown{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"f" = (
+/obj/structure/table/woodentable,
+/obj/item/weapon/reagent_containers/food/drinks/bottle/wine,
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{
+	pixel_x = 4
+	},
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{
+	pixel_x = -4
+	},
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"m" = (
+/obj/structure/table/woodentable,
+/obj/machinery/status_display{
+	pixel_y = 32
+	},
+/obj/item/weapon/reagent_containers/food/snacks/pastatomato,
+/obj/item/weapon/reagent_containers/food/snacks/pastatomato,
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"u" = (
+/obj/structure/bed/double/padded,
+/obj/item/weapon/bedsheet/browndouble,
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"v" = (
+/obj/structure/window/reinforced/survival_pod{
+	dir = 8
+	},
+/obj/machinery/washing_machine,
+/turf/simulated/floor/tiled/white,
+/area/survivalpod)
+"w" = (
+/obj/machinery/door/airlock/voidcraft/survival_pod{
+	destroy_hits = 100;
+	glass = 0;
+	id_tag = "shelter_gamma"
+	},
+/obj/effect/floor_decal/industrial/danger/full,
+/obj/structure/fans/tiny,
+/turf/simulated/shuttle/floor/voidcraft,
+/area/survivalpod)
+"x" = (
+/obj/structure/bed/chair/comfy/brown{
+	dir = 8
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"z" = (
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 11
+	},
+/obj/structure/mirror{
+	dir = 4;
+	pixel_x = 24
+	},
+/obj/structure/window/reinforced/survival_pod{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/white,
+/area/survivalpod)
+"F" = (
+/obj/machinery/door/window/survival_pod{
+	dir = 8
+	},
+/obj/machinery/door/window/survival_pod{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/white,
+/area/survivalpod)
+"M" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/structure/closet/secure_closet/personal,
+/obj/item/weapon/towel/random,
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"N" = (
+/obj/structure/table/woodentable,
+/obj/item/weapon/storage/box/donkpockets,
+/obj/item/weapon/storage/box/donkpockets{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/obj/machinery/button/remote/airlock/survival_pod{
+	dir = 10;
+	id = "shelter_gamma";
+	pixel_y = -24
+	},
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"P" = (
+/obj/structure/bed/chair/comfy/brown{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"Q" = (
+/obj/machinery/shower{
+	dir = 1
+	},
+/obj/structure/curtain,
+/obj/random/soap,
+/turf/simulated/floor/tiled/white,
+/area/survivalpod)
+"R" = (
+/obj/structure/table/woodentable,
+/obj/item/toy/plushie/kitten,
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"S" = (
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"V" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"W" = (
+/obj/structure/table/woodentable,
+/obj/machinery/microwave,
+/turf/simulated/floor/wood,
+/area/survivalpod)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+b
+b
+V
+S
+W
+a
+"}
+(3,1,1) = {"
+a
+m
+f
+S
+S
+N
+a
+"}
+(4,1,1) = {"
+a
+x
+P
+S
+S
+S
+w
+"}
+(5,1,1) = {"
+a
+S
+S
+S
+F
+v
+a
+"}
+(6,1,1) = {"
+a
+R
+u
+M
+z
+Q
+a
+"}
+(7,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+"}