[MIRROR] Big Fucking Shelter Capsule Update... TWO!!! (#11873)

Co-authored-by: Ryumi <ghosttehspychecka@gmail.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>

code/game/objects/structures/window.dm

@@ -106,6 +106,9 @@
 	qdel(src)
 	return
 
+/obj/structure/window/proc/can_glasspassers_pass()
+	PROTECTED_PROC(TRUE)
+	return TRUE
 
 /obj/structure/window/bullet_act(var/obj/item/projectile/Proj)
 
@@ -141,7 +144,7 @@
 
 /obj/structure/window/CanPass(atom/movable/mover, turf/target)
 	if(istype(mover) && mover.checkpass(PASSGLASS))
-		return TRUE
+		return can_glasspassers_pass()
 	if(is_fulltile())
 		return FALSE	//full tile window, you can't move into it!
 	if(get_dir(mover, target) == GLOB.reverse_dir[dir]) // From elsewhere to here, can't move against our dir
@@ -589,6 +592,11 @@
 	fulltile = TRUE
 	flags = NONE
 
+/obj/structure/window/reinforced/polarized/can_glasspassers_pass()
+	// If the windows are currently tinted, they're blocking light from passing.
+	// So, they should block stuff like lasers at that time.
+	return opacity
+
 /obj/structure/window/reinforced/polarized/attackby(obj/item/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/multitool) && !anchored) // Only allow programming if unanchored!
 		var/obj/item/multitool/MT = W
@@ -612,9 +620,11 @@
 	if(opacity)
 		animate(src, color="#FFFFFF", time=5)
 		set_opacity(0)
+		AddElement(/datum/element/light_blocking)
 	else
 		animate(src, color="#222222", time=5)
 		set_opacity(1)
+		RemoveElement(/datum/element/light_blocking)
 	var/turf/T = get_turf(src)
 	T.recalculate_directional_opacity()
 

code/modules/mining/ore_redemption_machine/equipment_vendor.dm

@@ -133,10 +133,14 @@
 	)
 	prize_list["Shelter Capsules"] = list(
 		EQUIPMENT("Shelter Capsule - Shelter (5x5)",				/obj/item/survivalcapsule,									500),
+		EQUIPMENT("Shelter Capsule - Pocket Dorm (5x5)",			/obj/item/survivalcapsule/pocketdorm,						500),
+		EQUIPMENT("Shelter Capsule - Kitchen (7x7)",				/obj/item/survivalcapsule/kitchen,							3100),
 		EQUIPMENT("Shelter Capsule - Luxury Shelter (7x7)",			/obj/item/survivalcapsule/luxury,							3100),
+		EQUIPMENT("Shelter Capsule - Alt. Luxury Shelter (7x7)",	/obj/item/survivalcapsule/luxuryalt,						3100),
 		EQUIPMENT("Shelter Capsule - Redspace (7x7)",				/obj/item/survivalcapsule/randomized,						5000),
-		EQUIPMENT("Shelter Capsule - Sauna (7x7)",					/obj/item/survivalcapsule/sauna,							5000),
-		EQUIPMENT("Shelter Capsule - Rec Room + Cards Table (9x9)",	/obj/item/survivalcapsule/recroom,							7500),
+		EQUIPMENT("Shelter Capsule - Sauna (7x7)",					/obj/item/survivalcapsule/sauna,							3100),
+		EQUIPMENT("Shelter Capsule - Rec Room + Cards Table (9x9)",	/obj/item/survivalcapsule/recroom,							5000),
+		EQUIPMENT("Shelter Capsule - Luxury Rec Room (11x11)",		/obj/item/survivalcapsule/luxuryrecroom,					10000),
 		EQUIPMENT("Shelter Capsule - Bar (11x11)",					/obj/item/survivalcapsule/luxurybar,						10000),
 		EQUIPMENT("Shelter Capsule - Deluxe Cabin (11x11)",			/obj/item/survivalcapsule/luxurycabin,						10000),
 		EQUIPMENT("Shelter Capsule - Cafe (11x11)",					/obj/item/survivalcapsule/cafe,								10000),

code/modules/mining/ore_redemption_machine/survey_vendor.dm

@@ -86,10 +86,14 @@
 	)
 	prize_list["Shelter Capsules"] = list(
 		EQUIPMENT("Shelter Capsule - Shelter (5x5)",				/obj/item/survivalcapsule,									50),
+		EQUIPMENT("Shelter Capsule - Pocket Dorm (5x5)",			/obj/item/survivalcapsule/pocketdorm,						50),
+		EQUIPMENT("Shelter Capsule - Kitchen (7x7)",				/obj/item/survivalcapsule/kitchen,							310),
 		EQUIPMENT("Shelter Capsule - Luxury Shelter (7x7)",			/obj/item/survivalcapsule/luxury,							310),
+		EQUIPMENT("Shelter Capsule - Alt. Luxury Shelter (7x7)",	/obj/item/survivalcapsule/luxuryalt,						310),
 		EQUIPMENT("Shelter Capsule - Redspace (7x7)",				/obj/item/survivalcapsule/randomized,						500),
-		EQUIPMENT("Shelter Capsule - Sauna (7x7)",					/obj/item/survivalcapsule/sauna,							500),
-		EQUIPMENT("Shelter Capsule - Rec Room + Cards Table (9x9)",	/obj/item/survivalcapsule/recroom,							750),
+		EQUIPMENT("Shelter Capsule - Sauna (7x7)",					/obj/item/survivalcapsule/sauna,							310),
+		EQUIPMENT("Shelter Capsule - Rec Room + Cards Table (9x9)",	/obj/item/survivalcapsule/recroom,							500),
+		EQUIPMENT("Shelter Capsule - Luxury Rec Room (11x11)",		/obj/item/survivalcapsule/luxuryrecroom,					1000),
 		EQUIPMENT("Shelter Capsule - Bar (11x11)",					/obj/item/survivalcapsule/luxurybar,						1000),
 		EQUIPMENT("Shelter Capsule - Deluxe Cabin (11x11)",			/obj/item/survivalcapsule/luxurycabin,						1000),
 		EQUIPMENT("Shelter Capsule - Cafe (11x11)",					/obj/item/survivalcapsule/cafe,								1000),

code/modules/mining/shelter_atoms_vr.dm

@@ -65,6 +65,48 @@ GLOBAL_LIST_EMPTY(unique_deployable)
 		ret += "This capsule has an unknown template stored."
 	return ret
 
+/// Creates and shows to the user a preview of the pod's shape, like the admin load template verb does. However, this one shows valid deploy turfs in blue, and invalid turfs in red.
+/obj/item/survivalcapsule/proc/preview_template(var/mob/user, var/turf/deploy_turf, var/show_doors = FALSE)
+	if(!deploy_turf)
+		return
+	var/preview_render = list()
+	template.preload_size(template.mappath)
+	// Get origin (bottom-left) of shelter template relative to where we are on the map
+	var/turf/origin = locate(user.x - round((template.width)/2) , user.y - round((template.height)/2) , user.z)
+	var/turf/topright = locate(user.x + round((template.width)/2) , user.y + round((template.height)/2) , user.z)
+	if(!origin || !topright)
+		return
+	for(var/turf/S in template.get_affected_turfs(deploy_turf, centered = TRUE))
+		if(template.get_turf_deployability(S, is_ship) != SHELTER_DEPLOY_ALLOWED)
+			preview_render += image('icons/misc/debug_group.dmi',S ,"red")
+		else if(show_doors)
+			var/is_door_here = FALSE
+			for(var/list/door_coord in template.door_locations)
+				// If we're at a spot where a door is going to appear, display a green spot!
+				var/dX = origin.x + door_coord[1] - 1
+				var/dY = origin.y + door_coord[2] - 1
+				if(S.x == dX && S.y == dY)
+					preview_render += image('icons/misc/debug_group.dmi',S ,"green")
+					is_door_here = TRUE
+					break
+			if(!is_door_here)
+				preview_render += image('icons/misc/debug_group.dmi',S ,"blue")
+		else
+			preview_render += image('icons/misc/debug_group.dmi',S ,"blue")
+	user.client.images += preview_render
+	return preview_render
+
+/obj/item/survivalcapsule/proc/remove_preview(var/mob/user, var/list/preview_render, var/fade_time = 1 SECOND)
+	if(fade_time > 0)
+		for(var/image/I in preview_render)
+			animate(I, alpha = 0, fade_time)
+		addtimer(CALLBACK(src, PROC_REF(delete_preview_render), user, preview_render), fade_time, TIMER_DELETE_ME)
+	else
+		delete_preview_render(user, preview_render)
+
+/obj/item/survivalcapsule/proc/delete_preview_render(var/mob/user, var/list/preview_render)
+	user.client.images -= preview_render
+
 /obj/item/survivalcapsule/proc/can_deploy(var/turf/deploy_location, var/turf/above_location)
 	var/status = template.check_deploy(deploy_location, is_ship)
 	switch(status)
@@ -150,19 +192,50 @@ GLOBAL_LIST_EMPTY(unique_deployable)
 			return
 		var/turf/deploy_location = get_turf(src)
 		// Warn the user in advance if the capsule can't work from where they're standing.
-		if(!can_deploy(get_turf(src), GetAbove(deploy_location)))
+		var/preview_render = preview_template(user, deploy_location)
+		// If there's no preview render, that means it couldn't get the bottom-left or top-right corner of the shelter template area
+		// So this is prooooobably somewhere outside the map bounds!
+		if(!preview_render)
+			loc.visible_message(span_warning("\The [src] is too close to the edge of this map to deploy!"))
 			return
-		loc.visible_message(span_warning("\The [src] begins to shake. Stand back!"))
-		user.drop_from_inventory(src)
-		used = TRUE
+		if(!can_deploy(get_turf(src), GetAbove(deploy_location)))
+			addtimer(CALLBACK(src, PROC_REF(remove_preview), user, preview_render), 1 SECONDS, TIMER_DELETE_ME)
+			return
+		// We only show where the doors will be on a successful deploy check to avoid player confusion.
+		remove_preview(user, preview_render, 0)
+		preview_render = preview_template(user, deploy_location, show_doors = TRUE)
+		if(tgui_alert(usr,"Confirm location. (The shelter's exterior doors are highlighted in green!)", "Shelter Deploy Confirm",list("No","Yes")) == "Yes")
+			// We might have moved since the last check, so we check again!
+			if(!can_deploy(deploy_location, GetAbove(deploy_location)))
+				used = FALSE
+				return
+			loc.visible_message(span_warning("\The [src] begins to shake. Stand back!"))
+			user.drop_from_inventory(src)
+			used = TRUE
 
-		addtimer(CALLBACK(src, PROC_REF(deploy_step_one), user), 5 SECONDS, TIMER_DELETE_ME)
+			addtimer(CALLBACK(src, PROC_REF(deploy_step_one), user), 5 SECONDS, TIMER_DELETE_ME)
+		remove_preview(user, preview_render, 0)
 
 /obj/item/survivalcapsule/luxury
 	name = "luxury surfluid shelter capsule"
 	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/survivalcapsule/luxuryalt
+	name = "luxury alt surfluid shelter capsule"
+	desc = "An exorbitantly expensive luxury suite programmed into construction nanomachines. There's a license for use printed on the bottom."
+	template_id = "shelter_luxury_alt"
+
+/obj/item/survivalcapsule/pocketdorm
+	name = "pocket dorm surfluid shelter capsule"
+	desc = "A little dorm programmed into construction nanomachines. There's a license for use printed on the bottom."
+	template_id = "shelter_pocket_dorm"
+
+/obj/item/survivalcapsule/kitchen
+	name = "pocket dorm surfluid shelter capsule"
+	desc = "A kitchen programmed into construction nanomachines. There's a license for use printed on the bottom."
+	template_id = "shelter_kitchen"
+
 /obj/item/survivalcapsule/luxurybar
 	name = "luxury surfluid bar capsule"
 	desc = "A luxury bar in a capsule. " + JOB_BARTENDER + " required and not included. There's a license for use printed on the bottom."
@@ -178,6 +251,11 @@ GLOBAL_LIST_EMPTY(unique_deployable)
 	desc = "A luxury cafe in a capsule. There's a license for use printed on the bottom."
 	template_id = "shelter_cafe"
 
+/obj/item/survivalcapsule/luxuryrecroom
+	name = "luxury rec room cafe capsule"
+	desc = "A luxury rec room in a capsule. There's a license for use printed on the bottom."
+	template_id = "shelter_luxury_recroom"
+
 /obj/item/survivalcapsule/military
 	name = "military surfluid shelter capsule"
 	desc = "A prefabricated firebase in a capsule. Contains basic weapons, building materials, and combat suits. There's a license for use printed on the bottom."

code/modules/mining/shelters_vr.dm

@@ -4,30 +4,39 @@
 	var/blacklisted_turfs
 	var/banned_areas
 	var/banned_objects
+	var/list/door_locations = list() /// Where the door (or doors) are located in XY coordinates, so the capsule deploy preview can show where the doors will be.
 
 /datum/map_template/shelter/New()
 	. = ..()
-	blacklisted_turfs = typecacheof(list(/turf/unsimulated, /turf/simulated/floor/tiled))
+	blacklisted_turfs = typecacheof(list(/turf/unsimulated))
 	banned_areas = typecacheof(/area/shuttle)
 	banned_objects = list()
 
+/// Checks all turfs within the area of the given deploy location to see if it is a valid shelter area.
 /datum/map_template/shelter/proc/check_deploy(turf/deploy_location, var/is_ship)
 	var/affected = get_affected_turfs(deploy_location, centered=TRUE)
 	for(var/turf/T in affected)
-		var/area/A = get_area(T)
-		if(is_type_in_typecache(A, banned_areas) || (A.flags & AREA_BLOCK_INSTANT_BUILDING))
-			return SHELTER_DEPLOY_BAD_AREA
+		var/shelter_status = get_turf_deployability(T)
+		if(shelter_status != SHELTER_DEPLOY_ALLOWED)
+			return shelter_status
+	return SHELTER_DEPLOY_ALLOWED
 
-		var/banned = is_type_in_typecache(T, blacklisted_turfs)
-		if(banned || T.density)
-			return SHELTER_DEPLOY_BAD_TURFS
-		//Ships can only deploy in space (bacause their base turf is always turf/space)
-		if(is_ship && !is_type_in_typecache(T, typecacheof(/turf/space)))
-			return SHELTER_DEPLOY_SHIP_SPACE
+/// Checks a single given turf to see if it is a valid turf to deploy a shelter onto.
+/datum/map_template/shelter/proc/get_turf_deployability(var/turf/T, var/is_ship)
+	var/area/A = get_area(T)
+	if(is_type_in_typecache(A, banned_areas) || (A.flags & AREA_BLOCK_INSTANT_BUILDING))
+		return SHELTER_DEPLOY_BAD_AREA
 
-		for(var/obj/O in T)
-			if((O.density && O.anchored) || is_type_in_typecache(O, banned_objects))
-				return SHELTER_DEPLOY_ANCHORED_OBJECTS
+	var/banned = is_type_in_typecache(T, blacklisted_turfs)
+	if(banned || T.density)
+		return SHELTER_DEPLOY_BAD_TURFS
+	//Ships can only deploy in space (because their base turf is always turf/space)
+	if(is_ship && !is_type_in_typecache(T, typecacheof(/turf/space)))
+		return SHELTER_DEPLOY_SHIP_SPACE
+
+	for(var/obj/O in T)
+		if((O.density && O.anchored) || is_type_in_typecache(O, banned_objects))
+			return SHELTER_DEPLOY_ANCHORED_OBJECTS
 	return SHELTER_DEPLOY_ALLOWED
 
 /datum/map_template/shelter/proc/add_roof(turf/deploy_location)
@@ -57,7 +66,8 @@
 		built-in navigation, entertainment, medical facilities and a \
 		sleeping area! Order now, and we'll throw in a TINY FAN, \
 		absolutely free!"
-	mappath = "maps/submaps/shelters/shelter_1.dmm"
+	mappath = "maps/submaps/shelters/5x5/shelter_1.dmm"
+	door_locations = list(list(3,1))
 
 /datum/map_template/shelter/beta
 	name = "Shelter Beta"
@@ -67,7 +77,8 @@
 		running water, a gourmet three course meal, cooking facilities, \
 		and a deluxe companion to keep you from getting lonely during \
 		an ash storm."
-	mappath = "maps/submaps/shelters/shelter_2.dmm"
+	mappath = "maps/submaps/shelters/7x7/shelter_2.dmm"
+	door_locations = list(list(4,1))
 
 /datum/map_template/shelter/gamma
 	name = "Shelter Gamma"
@@ -77,7 +88,11 @@
 		also has a sink. This isn't a survival capsule and so you can \
 		expect that this won't save you if you're bleeding out to \
 		death."
-	mappath = "maps/submaps/shelters/shelter_3.dmm"
+	mappath = "maps/submaps/shelters/11x11/shelter_3.dmm"
+	door_locations = list(
+		list(6,1),
+		list(1,6),
+		list(1,9))
 
 /datum/map_template/shelter/delta
 	name = "Shelter Delta"
@@ -87,7 +102,11 @@
 		supplies allow it to hold out for an extended period of time\
 		and a built in medical facility allows field treatment to be \
 		possible."
-	mappath = "maps/submaps/shelters/shelter_4.dmm"
+	mappath = "maps/submaps/shelters/11x11/shelter_4.dmm"
+	door_locations = list(
+		list(1,6),
+		list(6,1),
+		list(11,6))
 
 /datum/map_template/shelter/epsilon
 	name = "Shelter Epsilon"
@@ -95,12 +114,14 @@
 	description = "(10x5) An escape pod, with a mediocre amount of supplies \
 		for escaping a dying ship as soon as possible."
 	mappath = "maps/offmap_vr/om_ships/shelter_5.dmm"
+	door_locations = list(list(10,3))
 
 /datum/map_template/shelter/cabin
 	name = "Shelter Cabin"
 	shelter_id = "shelter_cab"
 	description = "(7x7) A small cabin; turned into a shelter capsule. Includes dorm amenities, and a nice dinner."
-	mappath = "maps/submaps/shelters/shelter_cab.dmm"
+	mappath = "maps/submaps/shelters/7x7/shelter_cab.dmm"
+	door_locations = list(list(4,1))
 
 /datum/map_template/shelter/cabin_deluxe
 	name = "Shelter Deluxe Cabin"
@@ -109,7 +130,12 @@
 		Includes a private dormitory, bathroom, dining room, and a very \
 		compactly designed kitchen. Designed for a comfortable extended \
 		stay in isolated wilderness survival scenarios."
-	mappath = "maps/submaps/shelters/shelter_luxury_cabin.dmm"
+	mappath = "maps/submaps/shelters/11x11/shelter_luxury_cabin.dmm"
+	door_locations = list(
+		list(1,3),
+		list(6,11),
+		list(6,1)
+		)
 
 /datum/map_template/shelter/phi
 	name = "Shelter Phi"
@@ -119,7 +145,8 @@
 		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_a.dmm"
+	mappath = "maps/submaps/shelters/7x7/shelter_a.dmm"
+	door_locations = list(list(4,1))
 
 /datum/map_template/shelter/chi
 	name = "Shelter Chi"
@@ -128,49 +155,113 @@
 	capsule. Many of the survival utilities have been stripped away in favor \
 	of recreational facilities and a more comfortable living quarters. The \
 	definition of \"form over function,\" in capsule form!"
-	mappath = "maps/submaps/shelters/shelter_h.dmm"
+	mappath = "maps/submaps/shelters/7x8/shelter_h.dmm"
+	door_locations = list(list(4,1),list(7,4))
 
 /datum/map_template/shelter/rec
 	name = "Shelter Rec Room"
 	shelter_id = "shelter_recroom"
 	description = "(9x9) A recreational room in a pocket, offering a gaming table with poker chips, dice, and cards to host group gaming activities, as well as a small arcade for more individual experiences. While offering absolutely nothing that will help someone survive physically aside from a safely isolated atmosphere, the intellectual stimulation provided from the gaming facilities within have been chosen to assist and keep one's mind sharp."
-	mappath = "maps/submaps/shelters/shelter_recroom.dmm"
+	mappath = "maps/submaps/shelters/9x9/shelter_recroom.dmm"
+	door_locations = list(
+		list(1,5),
+		list(4,9),
+		list(5,1),
+		list(9,4),
+		)
 
 /datum/map_template/shelter/sauna
 	name = "Shelter Sauna"
 	shelter_id = "shelter_sauna"
 	description = "(7x7) A luxurious sauna in your pocket. Complete with privacy features, a changing and locker room, and of course a decently spacious sauna room with three benches to rest on."
-	mappath = "maps/submaps/shelters/shelter_sauna.dmm"
+	mappath = "maps/submaps/shelters/7x7/shelter_sauna.dmm"
+	door_locations = list(list(4,1))
 
 /datum/map_template/shelter/cafe
 	name = "Shelter Cafe"
 	shelter_id = "shelter_cafe"
 	description = "(11x11) A fully stocked and equipped cafe in your pocket. While this won't save you if you're dying, it will ensure that you and anyone who happens to be with you will never suffer from caffeine withdrawal!"
-	mappath = "maps/submaps/shelters/shelter_cafe.dmm"
+	mappath = "maps/submaps/shelters/11x11/shelter_cafe.dmm"
+	door_locations = list(
+		list(1,6),
+		list(6,1),
+		list(11,6),
+		list(11,9)
+		)
+
+/datum/map_template/shelter/luxuryrecroom
+	name = "Shelter Luxury Rec Room"
+	shelter_id = "shelter_luxury_recroom"
+	description = "(11x11) The surfluid within this capsule is a carefully programmed monument to hedonism. Unlike its smaller cousin, this rec room variant  sports a larger gambling table supporting up to seven players, more vending machines for players' needs, and even a small private dorm room. If you have any desire for a fully private, self-contained gambling room completely isolated from the world outside, this is your perfect answer."
+	mappath = "maps/submaps/shelters/11x11/shelter_luxury_recroom.dmm"
+	door_locations = list(
+		list(6,1),
+		list(6,11),
+		list(11,6)
+		)
+
+/datum/map_template/shelter/kitchen
+	name = "Shelter Kitchen"
+	shelter_id = "shelter_kitchen"
+	description = "(7x7) A fully stocked, functional kitchen in your pocket, equipped with an oven, fryer, grill, oven, microwave, and blender. It even comes with a pre-stocked storage of basic ingredients, to make starting your culinary pursuits easier to begin as soon as you pop open the capsule!"
+	mappath = "maps/submaps/shelters/7x7/shelter_kitchen.dmm"
+	door_locations = list(
+		list(4,1),
+		list(1,4),
+		list(7,4)
+		)
+
+/datum/map_template/shelter/iota
+	name = "Shelter Iota"
+	shelter_id = "shelter_pocket_dorm"
+	description = "(5x5) An alternate configuration of Shelter Alpha. This one is more spatially efficient and supports two people inside it, but compromises some shelter equipment to make room for it."
+	mappath = "maps/submaps/shelters/5x5/shelter_pocket_dorm.dmm"
+	door_locations = list(list(3,1))
+
+/datum/map_template/shelter/zeta
+	name = "Shelter Zeta"
+	shelter_id = "shelter_luxury_alt"
+	description = "(7x7) An alternate configuration of Shelter Beta, prominently featuring both a windowed view of the exterior as well as the means to tint the windows for superior privacy."
+	mappath = "maps/submaps/shelters/7x7/shelter_luxury_alt.dmm"
+	door_locations = list(list(4,1))
 
 /datum/map_template/shelter/loss_1
 	name = "Shelter L1"
 	shelter_id = "shelter_loss1"
 	description = "(5x5) North-west quadrant."
-	mappath = "maps/submaps/shelters/shelter_loss_1.dmm"
+	mappath = "maps/submaps/shelters/5x5/shelter_loss_1.dmm"
+	door_locations = list(
+		list(1,3),
+		list(3,5),
+		list(3,1),
+		list(5,3))
 
 /datum/map_template/shelter/loss_2
 	name = "Shelter L2"
 	shelter_id = "shelter_loss2"
 	description = "(5x5) North-east quadrant."
-	mappath = "maps/submaps/shelters/shelter_loss_2.dmm"
+	mappath = "maps/submaps/shelters/5x5/shelter_loss_2.dmm"
+	door_locations = list(
+		list(1,3),
+		list(3,1))
 
 /datum/map_template/shelter/loss_3
 	name = "Shelter L3"
 	shelter_id = "shelter_loss3"
 	description = "(5x5) South-west quadrant."
-	mappath = "maps/submaps/shelters/shelter_loss_3.dmm"
+	mappath = "maps/submaps/shelters/5x5/shelter_loss_3.dmm"
+	door_locations = list(
+		list(3,5),
+		list(5,3))
 
 /datum/map_template/shelter/loss_4
 	name = "Shelter L4"
 	shelter_id = "shelter_loss4"
 	description = "(5x5) South-east quadrant."
-	mappath = "maps/submaps/shelters/shelter_loss_4.dmm"
+	mappath = "maps/submaps/shelters/5x5/shelter_loss_4.dmm"
+	door_locations = list(
+		list(1,3),
+		list(3,5))
 
 // EXTREMELY DANGEROUS ADMIN-ONLY SHELTERS I BEG YOU DO NOT SPAWN THESE EXCEPT FOR A DISASTROUS BIT
 
@@ -178,76 +269,94 @@
 	name = "Shelter Tesla"
 	description = "(11x11) A whole tesla engine setup, complete with a fully charged SMES cell ready to power the emitters. Using this is probably an exceptionally terrible idea."
 	shelter_id = "shelter_tesla"
-	mappath = "maps/submaps/shelters/shelter_tesla.dmm"
+	mappath = "maps/submaps/shelters/11x11/shelter_tesla.dmm"
+	door_locations = list(
+		list(1,6),
+		list(6,1),
+		list(6,11))
 
 //Redspace capsule shelters - here be weird shit.
 
 /datum/map_template/shelter/nerd_dungeon_evil
 	name = "Shelter Nerd Dungeon Evil"
 	shelter_id = "shelter_nerd_dungeon_evil"
-	mappath = "maps/submaps/shelters/randomshelters/shelter_nerd_dungeon_evil.dmm"
+	mappath = "maps/submaps/shelters/randomshelters/7x7/shelter_nerd_dungeon_evil.dmm"
+	door_locations = list(list(1,4))
 
 /datum/map_template/shelter/nerd_dungeon_good
 	name = "Shelter Nerd Dungeon Good"
 	shelter_id = "shelter_nerd_dungeon_good"
-	mappath = "maps/submaps/shelters/randomshelters/shelter_nerd_dungeon_good.dmm"
+	mappath = "maps/submaps/shelters/randomshelters/7x7/shelter_nerd_dungeon_good.dmm"
+	door_locations = list(list(1,4))
 
 /datum/map_template/shelter/dangerous_pool
 	name = "Shelter Dangerous Pool"
 	shelter_id = "shelter_dangerous_pool"
-	mappath = "maps/submaps/shelters/randomshelters/shelter_dangerous_pool.dmm"
+	mappath = "maps/submaps/shelters/randomshelters/7x7/shelter_dangerous_pool.dmm"
+	door_locations = list(list(1,4))
 
 /datum/map_template/shelter/pizza_kitchen
 	name = "Shelter Pizza Kitchen"
 	shelter_id = "shelter_pizza_kitchen"
-	mappath = "maps/submaps/shelters/randomshelters/shelter_pizza.dmm"
+	mappath = "maps/submaps/shelters/randomshelters/7x7/shelter_pizza.dmm"
+	door_locations = list(list(1,4))
 
 /datum/map_template/shelter/tiny_space
 	name = "Shelter Smole Space"
 	shelter_id = "shelter_tiny_space"
-	mappath = "maps/submaps/shelters/randomshelters/shelter_tiny_space.dmm"
+	mappath = "maps/submaps/shelters/randomshelters/7x7/shelter_tiny_space.dmm"
+	door_locations = list(list(1,4))
 
 /datum/map_template/shelter/christmas
 	name = "Shelter Christmas"
 	shelter_id = "shelter_christmas"
-	mappath = "maps/submaps/shelters/randomshelters/shelter_christmas.dmm"
+	mappath = "maps/submaps/shelters/randomshelters/7x7/shelter_christmas.dmm"
+	door_locations = list(list(1,4))
 
 /datum/map_template/shelter/methlab
 	name = "Shelter Meth Lab"
 	shelter_id = "shelter_methlab"
-	mappath = "maps/submaps/shelters/randomshelters/shelter_methlab.dmm"
+	mappath = "maps/submaps/shelters/randomshelters/7x7/shelter_methlab.dmm"
+	door_locations = list(list(1,4))
 
 /datum/map_template/shelter/blacksmith
 	name = "Shelter Blacksmith"
 	shelter_id = "shelter_blacksmith"
-	mappath = "maps/submaps/shelters/randomshelters/shelter_blacksmith.dmm"
+	mappath = "maps/submaps/shelters/randomshelters/7x7/shelter_blacksmith.dmm"
+	door_locations = list(list(1,4))
 
 /datum/map_template/shelter/gallery
 	name = "Shelter Art Gallery"
 	shelter_id = "shelter_gallery"
-	mappath = "maps/submaps/shelters/randomshelters/shelter_gallery.dmm"
+	mappath = "maps/submaps/shelters/randomshelters/7x7/shelter_gallery.dmm"
+	door_locations = list(list(1,4))
 
 /datum/map_template/shelter/garden
 	name = "Shelter Garden"
 	shelter_id = "shelter_garden"
-	mappath = "maps/submaps/shelters/randomshelters/shelter_garden.dmm"
+	mappath = "maps/submaps/shelters/randomshelters/7x7/shelter_garden.dmm"
+	door_locations = list(list(1,4))
 
 /datum/map_template/shelter/mimic_hell
 	name = "Shelter Mimic Hell"
 	shelter_id = "shelter_mimic_hell"
-	mappath = "maps/submaps/shelters/randomshelters/shelter_mimic_hell.dmm"
+	mappath = "maps/submaps/shelters/randomshelters/7x7/shelter_mimic_hell.dmm"
+	door_locations = list(list(1,4))
 
 /datum/map_template/shelter/off_color_bedrooms
 	name = "Shelter Off-Color Bedrooms"
 	shelter_id = "shelter_off_color"
-	mappath = "maps/submaps/shelters/randomshelters/shelter_off_color.dmm"
+	mappath = "maps/submaps/shelters/randomshelters/7x7/shelter_off_color.dmm"
+	door_locations = list(list(1,4))
 
 /datum/map_template/shelter/living_room
 	name = "Shelter Living Room"
 	shelter_id = "shelter_living_room"
-	mappath = "maps/submaps/shelters/randomshelters/shelter_living_room.dmm"
+	mappath = "maps/submaps/shelters/randomshelters/7x7/shelter_living_room.dmm"
+	door_locations = list(list(1,4))
 
 /datum/map_template/shelter/candlelit_dinner
 	name = "Shelter Candlelit Dinner"
 	shelter_id = "shelter_candlelit_dinner"
-	mappath = "maps/submaps/shelters/randomshelters/shelter_candlelit_dinner.dmm"
+	mappath = "maps/submaps/shelters/randomshelters/7x7/shelter_candlelit_dinner.dmm"
+	door_locations = list(list(1,4))

code/modules/research/tg/designs/misc_designs.dm

@@ -174,15 +174,51 @@
 	desc = "A capsule filled with pre-programmed nanites that can generate a small, fully atmosphere-protected shelter in seconds. Do not put in mouth."
 	id = "shelter_capsule_sauna"
 	build_type = PROTOLATHE
-	materials = list(MAT_STEEL = 40000, MAT_GLASS = 40000, MAT_TITANIUM = 5000, MAT_DURASTEEL = 5000, MAT_DIAMOND = 500, MAT_URANIUM = 1000)
+	materials = list(MAT_STEEL = 35000, MAT_GLASS = 35000, MAT_TITANIUM = 5000, MAT_DURASTEEL = 5000, MAT_DIAMOND = 500, MAT_URANIUM = 1000)
 	build_path = /obj/item/survivalcapsule/sauna
 	category = list(
 		RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE
 	)
 	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO
 
+/datum/design_techweb/shelter_capsule_luxuryalt
+	name = "Bluespace Shelter Capsule - Alt. Luxury (7x7)"
+	desc = "A capsule filled with pre-programmed nanites that can generate a small, fully atmosphere-protected shelter in seconds. Do not put in mouth."
+	id = "shelter_capsule_luxuryalt"
+	build_type = PROTOLATHE
+	materials = list(MAT_STEEL = 35000, MAT_GLASS = 35000, MAT_TITANIUM = 5000, MAT_DURASTEEL = 5000, MAT_DIAMOND = 500, MAT_URANIUM = 1000)
+	build_path = /obj/item/survivalcapsule/luxuryalt
+	category = list(
+		RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO
+
+/datum/design_techweb/shelter_capsule_kitchen
+	name = "Bluespace Shelter Capsule - Kitchen (7x7)"
+	desc = "A capsule filled with pre-programmed nanites that can generate a small, fully atmosphere-protected shelter in seconds. Do not put in mouth."
+	id = "shelter_capsule_kitchen"
+	build_type = PROTOLATHE
+	materials = list(MAT_STEEL = 35000, MAT_GLASS = 35000, MAT_TITANIUM = 5000, MAT_DURASTEEL = 5000, MAT_DIAMOND = 500, MAT_URANIUM = 1000)
+	build_path = /obj/item/survivalcapsule/kitchen
+	category = list(
+		RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO
+
+/datum/design_techweb/shelter_capsule_pocketdorm
+	name = "Bluespace Shelter Capsule - Pocket Dorm (5x5)"
+	desc = "A capsule filled with pre-programmed nanites that can generate a small, fully atmosphere-protected shelter in seconds. Do not put in mouth."
+	id = "shelter_capsule_pocketdorm"
+	build_type = PROTOLATHE
+	materials = list(MAT_STEEL = 25000, MAT_GLASS = 25000, MAT_TITANIUM = 2500, MAT_DURASTEEL = 1000, MAT_DIAMOND = 200, MAT_URANIUM = 500)
+	build_path = /obj/item/survivalcapsule/pocketdorm
+	category = list(
+		RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO
+
 /datum/design_techweb/shelter_capsule_recroom
-	name = "Bluespace Shelter Capsule - Rec Room + Gaming Table (9x9)"
+	name = "Bluespace Shelter Capsule - Rec Room + Cards Table (9x9)"
 	desc = "A capsule filled with pre-programmed nanites that can generate a small, fully atmosphere-protected shelter in seconds. Do not put in mouth."
 	id = "shelter_capsule_recroom"
 	build_type = PROTOLATHE
@@ -228,3 +264,15 @@
 		RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE
 	)
 	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO
+
+/datum/design_techweb/shelter_capsule_luxuryrecroom
+	name = "Bluespace Shelter Capsule - Luxury Rec Room (11x11)"
+	desc = "A capsule filled with pre-programmed nanites that can generate a small, fully atmosphere-protected shelter in seconds. Do not put in mouth."
+	id = "shelter_capsule_luxuryrecroom"
+	build_type = PROTOLATHE
+	materials = list(MAT_STEEL = 50000, MAT_GLASS = 50000, MAT_TITANIUM = 6000, MAT_DURASTEEL = 3000, MAT_DIAMOND = 750, MAT_URANIUM = 1500) // These are 11x11 rooms in a pocket. They NEED to be expensive!
+	build_path = /obj/item/survivalcapsule/luxuryrecroom
+	category = list(
+		RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO

code/modules/research/tg/techwebs/nodes/research_nodes.dm

@@ -59,6 +59,10 @@
 		"shelter_capsule_luxurybar",
 		"shelter_capsule_luxurycabin",
 		"shelter_capsule_cafe",
+		"shelter_capsule_luxuryalt",
+		"shelter_capsule_kitchen",
+		"shelter_capsule_pocketdorm",
+		"shelter_capsule_luxuryrecroom",
 		// "ore_silo",
 		// "plumbing_receiver",
 		// "adv_watering_can",

maps/submaps/shelters/11x11/shelter_3.dmm

@@ -167,17 +167,22 @@
 /turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
 /area/survivalpod)
 "C" = (
-/obj/structure/window/reinforced/survival_pod{
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "barpod_w";
 	dir = 8
 	},
-/obj/structure/window/reinforced/survival_pod{
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "barpod_w";
 	dir = 4
 	},
-/obj/structure/window/reinforced/survival_pod{
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "barpod_w";
 	dir = 1
 	},
-/obj/structure/window/reinforced/survival_pod,
-/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "barpod_w"
+	},
 /turf/simulated/shuttle/floor/voidcraft/dark,
 /area/survivalpod)
 "D" = (
@@ -277,6 +282,38 @@
 /obj/effect/floor_decal/industrial/danger/full,
 /turf/simulated/shuttle/floor/voidcraft/dark,
 /area/survivalpod)
+"T" = (
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	pixel_y = -24;
+	pixel_x = -23
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod)
+"U" = (
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	dir = 8;
+	pixel_x = -24;
+	pixel_y = 23
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod)
+"V" = (
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	dir = 8;
+	pixel_x = -24;
+	pixel_y = 23
+	},
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod)
+"W" = (
+/obj/machinery/button/windowtint{
+	pixel_x = 27;
+	id = "barpod_w";
+	pixel_y = -24;
+	range = 5
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod)
 
 (1,1,1) = {"
 a
@@ -294,10 +331,10 @@ a
 (2,1,1) = {"
 b
 j
-q
+V
 s
 x
-y
+U
 D
 F
 K
@@ -349,11 +386,11 @@ i
 q
 t
 x
+W
 y
 y
 y
-y
-y
+T
 p
 "}
 (7,1,1) = {"

maps/submaps/shelters/11x11/shelter_cafe.dmm

@@ -9,6 +9,72 @@
 /obj/machinery/holoplant,
 /turf/simulated/floor/wood,
 /area/survivalpod)
+"ac" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "cafepod_w";
+	dir = 8
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "cafepod_w";
+	dir = 1
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "cafepod_w"
+	},
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod)
+"ad" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "cafepod_w";
+	dir = 1
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "cafepod_w"
+	},
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod)
+"ae" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "cafepod_w";
+	dir = 4
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "cafepod_w";
+	dir = 1
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "cafepod_w"
+	},
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod)
+"af" = (
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	pixel_y = 23;
+	pixel_x = -23;
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"ag" = (
+/obj/machinery/button/windowtint{
+	pixel_x = -38;
+	id = "cafepod_w";
+	pixel_y = -22;
+	range = 5
+	},
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"ah" = (
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	pixel_y = 23;
+	pixel_x = 23;
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/survivalpod)
 "bZ" = (
 /obj/machinery/door/airlock/voidcraft/survival_pod/vertical,
 /obj/effect/floor_decal/industrial/danger/full,
@@ -30,17 +96,22 @@
 /turf/simulated/floor/carpet/brown,
 /area/survivalpod)
 "fW" = (
-/obj/structure/window/reinforced/survival_pod{
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "cafepod_w";
 	dir = 8
 	},
-/obj/structure/window/reinforced/survival_pod{
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "cafepod_w";
 	dir = 4
 	},
-/obj/structure/window/reinforced/survival_pod{
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "cafepod_w";
 	dir = 1
 	},
-/obj/structure/window/reinforced/survival_pod,
-/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "cafepod_w"
+	},
 /turf/simulated/shuttle/floor/voidcraft/dark,
 /area/survivalpod)
 "gw" = (
@@ -184,6 +255,10 @@
 	dir = 4;
 	pixel_x = -30
 	},
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	pixel_y = -23;
+	pixel_x = 21
+	},
 /turf/simulated/floor/wood,
 /area/survivalpod)
 "xN" = (
@@ -535,12 +610,12 @@ II
 uO
 VR
 ab
-tZ
+af
 Oy
 Ji
 QU
 ET
-Oy
+ac
 "}
 (3,1,1) = {"
 NM
@@ -553,7 +628,7 @@ NJ
 gw
 QU
 Te
-NJ
+ad
 "}
 (4,1,1) = {"
 pc
@@ -566,7 +641,7 @@ EM
 tB
 QU
 QW
-EM
+ae
 "}
 (5,1,1) = {"
 NM
@@ -587,7 +662,7 @@ Od
 uO
 PD
 wQ
-tZ
+ag
 GF
 YK
 tZ
@@ -639,7 +714,7 @@ JD
 uO
 po
 PW
-tZ
+ah
 qD
 ta
 Ku

maps/submaps/shelters/11x11/shelter_luxury_cabin.dmm

@@ -157,6 +157,21 @@
 	},
 /turf/simulated/shuttle/wall/voidcraft/survival,
 /area/survivalpod/dorms/bathroom)
+"ax" = (
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	pixel_y = -23;
+	pixel_x = 21
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod)
+"ay" = (
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	pixel_y = -23;
+	pixel_x = -23;
+	dir = 8
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod)
 "aD" = (
 /obj/structure/disposalpipe/junction/yjunction{
 	dir = 4
@@ -273,9 +288,7 @@
 	pixel_y = 38;
 	pixel_x = -6
 	},
-/obj/machinery/door/window/survival_pod{
-	icon_state = "windoor"
-	},
+/obj/machinery/door/window/survival_pod,
 /turf/simulated/shuttle/floor/voidcraft/light,
 /area/survivalpod/dorms/bathroom)
 "tj" = (
@@ -318,6 +331,11 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	pixel_y = 8;
+	pixel_x = -21;
+	dir = 1
+	},
 /turf/simulated/shuttle/floor/voidcraft/dark,
 /area/survivalpod)
 "yc" = (
@@ -421,17 +439,22 @@
 /turf/simulated/shuttle/floor/voidcraft/dark,
 /area/survivalpod)
 "Ft" = (
-/obj/structure/window/reinforced/survival_pod{
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "luxcabinpod_w";
 	dir = 8
 	},
-/obj/structure/window/reinforced/survival_pod{
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "luxcabinpod_w";
 	dir = 4
 	},
-/obj/structure/window/reinforced/survival_pod{
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "luxcabinpod_w";
 	dir = 1
 	},
-/obj/structure/window/reinforced/survival_pod,
-/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "luxcabinpod_w"
+	},
 /turf/simulated/shuttle/floor/voidcraft/dark,
 /area/survivalpod)
 "Gh" = (
@@ -519,6 +542,12 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/button/windowtint{
+	pixel_x = -8;
+	id = "luxcabinpod_w";
+	pixel_y = 26;
+	range = 6
+	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/survivalpod)
 "Pb" = (
@@ -610,7 +639,7 @@ ua
 LC
 gf
 Zb
-PY
+ay
 Am
 zW
 "}
@@ -663,7 +692,7 @@ ah
 ab
 PY
 PY
-PY
+ax
 dp
 "}
 (7,1,1) = {"
@@ -677,7 +706,7 @@ ac
 OU
 PY
 fz
-Ft
+Jj
 "}
 (8,1,1) = {"
 aw

maps/submaps/shelters/11x11/shelter_luxury_recroom.dmm

@@ -0,0 +1,713 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/structure/sign/mining,
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod/dorms)
+"ab" = (
+/obj/structure/table/gamblingtable,
+/obj/effect/floor_decal/spline/plain{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/survivalpod)
+"ac" = (
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/survivalpod)
+"ad" = (
+/obj/structure/table/gamblingtable,
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/obj/effect/floor_decal/spline/plain{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/survivalpod)
+"ae" = (
+/obj/structure/bed/chair/bay/comfy/black{
+	dir = 8
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/carpet/blue2,
+/area/survivalpod)
+"af" = (
+/obj/structure/table/gamblingtable,
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
+	},
+/obj/effect/floor_decal/spline/plain{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/survivalpod)
+"ag" = (
+/obj/structure/table/standard,
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"ah" = (
+/obj/structure/bed/chair/sofa/corp/left,
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"aE" = (
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	pixel_y = -23;
+	pixel_x = 23;
+	dir = 4
+	},
+/turf/simulated/floor/carpet/brown,
+/area/survivalpod)
+"cE" = (
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod)
+"df" = (
+/obj/machinery/door/airlock/voidcraft/survival_pod,
+/obj/structure/fans/tiny,
+/obj/effect/floor_decal/industrial/danger/full,
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod)
+"dq" = (
+/obj/machinery/vending/loadout/loadout_misc,
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"dD" = (
+/obj/structure/bed/chair/comfy/brown{
+	dir = 1
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod/dorms)
+"dI" = (
+/obj/structure/bed/chair/sofa/corp/right,
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"ep" = (
+/obj/machinery/door/airlock/voidcraft/survival_pod/vertical,
+/obj/structure/fans/tiny,
+/obj/effect/floor_decal/industrial/danger/full,
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod)
+"hq" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"hz" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapoddorm_w";
+	dir = 8
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapoddorm_w";
+	dir = 4
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapoddorm_w";
+	dir = 1
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapoddorm_w"
+	},
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod/dorms)
+"iU" = (
+/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
+/area/survivalpod/dorms)
+"jc" = (
+/obj/random/vendordrink{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"kq" = (
+/obj/structure/bed/chair/comfy/rounded/green{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_light,
+/area/survivalpod)
+"ls" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapod_w";
+	dir = 8
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapod_w";
+	dir = 4
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapod_w";
+	dir = 1
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod)
+"lw" = (
+/obj/structure/sign/mining/survival{
+	dir = 4
+	},
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod)
+"lJ" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapod_w";
+	dir = 8
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapod_w";
+	dir = 4
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapod_w"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod)
+"lT" = (
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/survivalpod)
+"nt" = (
+/obj/structure/bed/double/padded,
+/obj/item/bedsheet/greendouble,
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod/dorms)
+"nT" = (
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	pixel_y = 23;
+	pixel_x = 21;
+	dir = 1
+	},
+/turf/simulated/floor/carpet/brown,
+/area/survivalpod)
+"oa" = (
+/obj/structure/table/woodentable,
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod/dorms)
+"oI" = (
+/obj/machinery/light,
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"oP" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapod_w";
+	dir = 8
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapod_w";
+	dir = 1
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapod_w"
+	},
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod)
+"pS" = (
+/obj/structure/sign/mining/survival{
+	dir = 4
+	},
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod/dorms)
+"qb" = (
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	pixel_y = -9;
+	pixel_x = 21
+	},
+/turf/simulated/floor/carpet/brown,
+/area/survivalpod)
+"sg" = (
+/obj/structure/table/gamblingtable,
+/obj/effect/floor_decal/spline/plain,
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/survivalpod)
+"tP" = (
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"uF" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"wH" = (
+/obj/machinery/door/window/survival_pod{
+	dir = 2
+	},
+/obj/effect/floor_decal/spline/plain,
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/survivalpod)
+"wO" = (
+/obj/machinery/holoplant,
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"xy" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapod_w";
+	dir = 4
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapod_w";
+	dir = 1
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapod_w"
+	},
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod)
+"yp" = (
+/obj/structure/sign/mining/survival{
+	dir = 1
+	},
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod)
+"zh" = (
+/obj/structure/bed/chair/bay/comfy/black{
+	dir = 8
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/carpet/blue2,
+/area/survivalpod)
+"Bu" = (
+/obj/structure/bed/chair/bay/comfy/black,
+/turf/simulated/floor/carpet/blue2,
+/area/survivalpod)
+"Bx" = (
+/obj/structure/bed/chair/bay/comfy/black{
+	dir = 8
+	},
+/turf/simulated/floor/carpet/blue2,
+/area/survivalpod)
+"BU" = (
+/obj/machinery/button/windowtint{
+	pixel_x = 32;
+	id = "gambapod_w";
+	pixel_y = -53;
+	range = 5
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"CR" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/machinery/recharge_station,
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"De" = (
+/obj/random/vendorfood{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"DP" = (
+/obj/structure/closet/cabinet,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod/dorms)
+"Ez" = (
+/obj/machinery/disposal/wall,
+/obj/structure/disposalpipe/trunk{
+	dir = 8
+	},
+/obj/machinery/button/windowtint{
+	id = "gambapoddorm_w";
+	pixel_y = 23;
+	range = 2;
+	pixel_x = -26
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod/dorms)
+"FL" = (
+/obj/structure/disposalpipe/trunk,
+/obj/machinery/disposal/wall{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"Ge" = (
+/obj/structure/table/gamblingtable,
+/obj/effect/floor_decal/spline/plain{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/survivalpod)
+"Gv" = (
+/obj/machinery/holoplant,
+/turf/simulated/floor/carpet/blue2,
+/area/survivalpod)
+"GA" = (
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"HP" = (
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod/dorms)
+"Jd" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapod_w";
+	dir = 8
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapod_w";
+	dir = 4
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapod_w";
+	dir = 1
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapod_w"
+	},
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod)
+"Jf" = (
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"JZ" = (
+/obj/structure/fans,
+/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
+/area/survivalpod/dorms)
+"KT" = (
+/obj/structure/table/darkglass,
+/obj/item/spacecasinocash_fake/c1000{
+	pixel_y = 12;
+	pixel_x = 10
+	},
+/obj/item/spacecasinocash_fake/c1000{
+	pixel_y = 12;
+	pixel_x = 4
+	},
+/obj/item/spacecasinocash_fake/c1000{
+	pixel_y = 7;
+	pixel_x = 10
+	},
+/obj/item/spacecasinocash_fake/c1000{
+	pixel_y = 7;
+	pixel_x = 4
+	},
+/obj/item/spacecasinocash_fake/c1000{
+	pixel_y = 3;
+	pixel_x = 10
+	},
+/obj/item/spacecasinocash_fake/c1000{
+	pixel_y = 3;
+	pixel_x = 4
+	},
+/obj/item/storage/pill_bottle/dice{
+	pixel_y = 12;
+	pixel_x = -7
+	},
+/obj/item/storage/pill_bottle/dice_nerd{
+	pixel_x = -7;
+	pixel_y = 7
+	},
+/obj/item/deck/cards/casino{
+	pixel_x = -6;
+	pixel_y = -1
+	},
+/obj/item/deck/cards/casino/triple{
+	pixel_y = -1;
+	pixel_x = 6
+	},
+/obj/structure/closet/walllocker_double/casino/west,
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/survivalpod)
+"Ma" = (
+/obj/structure/table/gamblingtable,
+/obj/effect/floor_decal/spline/plain{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/survivalpod)
+"MO" = (
+/obj/structure/sign/mining/survival{
+	dir = 8
+	},
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod)
+"Nz" = (
+/obj/structure/sign/mining/survival,
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod)
+"Pb" = (
+/turf/simulated/floor/carpet/turcarpet,
+/area/survivalpod)
+"Pr" = (
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	dir = 8;
+	pixel_x = -10;
+	pixel_y = 23
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/obj/machinery/light_switch/survival_pod{
+	pixel_x = -1;
+	pixel_y = 23
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod/dorms)
+"PR" = (
+/obj/structure/sign/mining/survival,
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod/dorms)
+"Qc" = (
+/turf/simulated/floor/carpet/blue2,
+/area/survivalpod)
+"Ql" = (
+/obj/structure/bed/chair/bay/comfy/black{
+	dir = 1
+	},
+/turf/simulated/floor/carpet/blue2,
+/area/survivalpod)
+"Rk" = (
+/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
+/area/survivalpod)
+"Rp" = (
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/survivalpod)
+"Sd" = (
+/obj/structure/table/darkglass,
+/obj/item/juke_remote,
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/survivalpod)
+"SA" = (
+/obj/machinery/vending/loadout/costume{
+	dir = 8
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/survivalpod)
+"UN" = (
+/obj/structure/disposalpipe/junction/yjunction{
+	dir = 8
+	},
+/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
+/area/survivalpod/dorms)
+"VG" = (
+/obj/machinery/door/airlock/voidcraft/survival_pod/vertical,
+/obj/structure/fans/tiny,
+/obj/effect/floor_decal/industrial/danger/full,
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod/dorms)
+"Wd" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapod_w";
+	dir = 1
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "gambapod_w"
+	},
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod)
+"XD" = (
+/obj/structure/table/gamblingtable,
+/obj/effect/floor_decal/spline/plain{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/survivalpod)
+"Yc" = (
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
+/area/survivalpod/dorms)
+
+(1,1,1) = {"
+cE
+MO
+Jd
+MO
+cE
+ls
+lJ
+MO
+Jd
+MO
+cE
+"}
+(2,1,1) = {"
+yp
+CR
+Gv
+Rk
+KT
+Sd
+ac
+wH
+Qc
+uF
+Nz
+"}
+(3,1,1) = {"
+oP
+tP
+Bu
+Ma
+lT
+kq
+Rp
+sg
+Ql
+tP
+oP
+"}
+(4,1,1) = {"
+Wd
+tP
+Bu
+Ge
+XD
+af
+ad
+ab
+Ql
+tP
+Wd
+"}
+(5,1,1) = {"
+xy
+hq
+Qc
+Qc
+Bx
+zh
+ae
+Qc
+Qc
+oI
+xy
+"}
+(6,1,1) = {"
+df
+nT
+tP
+tP
+tP
+BU
+Jf
+tP
+tP
+qb
+df
+"}
+(7,1,1) = {"
+cE
+dI
+ag
+Pb
+Pb
+Pb
+GA
+Yc
+VG
+iU
+HP
+"}
+(8,1,1) = {"
+yp
+ah
+ag
+Pb
+Pb
+Pb
+FL
+UN
+Pr
+DP
+aa
+"}
+(9,1,1) = {"
+Jd
+tP
+tP
+Pb
+Pb
+Pb
+oI
+iU
+Ez
+dD
+hz
+"}
+(10,1,1) = {"
+yp
+dq
+SA
+De
+jc
+aE
+wO
+JZ
+nt
+oa
+PR
+"}
+(11,1,1) = {"
+cE
+lw
+Jd
+lw
+Jd
+ep
+cE
+pS
+hz
+pS
+HP
+"}

maps/submaps/shelters/5x5/shelter_1.dmm

@@ -48,8 +48,7 @@
 /obj/structure/bed/pod,
 /obj/item/bedsheet/mime,
 /obj/machinery/light/small{
-	dir = 4;
-	pixel_y = 0
+	dir = 4
 	},
 /turf/simulated/shuttle/floor/voidcraft,
 /area/survivalpod)
@@ -68,9 +67,10 @@
 /obj/structure/bed/chair/comfy/black{
 	dir = 8
 	},
-/obj/machinery/button/remote/airlock/survival_pod{
-	dir = 10;
-	pixel_y = -24
+/obj/machinery/light_switch/survival_pod{
+	dir = 1;
+	pixel_x = -9;
+	pixel_y = -23
 	},
 /turf/simulated/shuttle/floor/voidcraft,
 /area/survivalpod)
@@ -88,6 +88,13 @@
 /obj/structure/sign/mining,
 /turf/simulated/shuttle/wall/voidcraft,
 /area/survivalpod)
+"p" = (
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	pixel_y = -24;
+	pixel_x = 32
+	},
+/turf/simulated/shuttle/floor/voidcraft,
+/area/survivalpod)
 
 (1,1,1) = {"
 a
@@ -107,7 +114,7 @@ m
 b
 d
 h
-h
+p
 n
 "}
 (4,1,1) = {"

maps/submaps/shelters/5x5/shelter_pocket_dorm.dmm

@@ -0,0 +1,150 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/shuttle/wall/voidcraft,
+/area/survivalpod)
+"b" = (
+/obj/machinery/button/remote/airlock/survival_pod{
+	dir = 10;
+	pixel_y = -24;
+	pixel_x = 32
+	},
+/turf/simulated/shuttle/floor/voidcraft,
+/area/survivalpod)
+"g" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/voidcraft/survival_pod,
+/obj/effect/floor_decal/industrial/danger/full,
+/turf/simulated/shuttle/floor/voidcraft,
+/area/survivalpod)
+"h" = (
+/obj/item/gps/computer{
+	pixel_y = 0;
+	density = 0
+	},
+/obj/structure/tubes,
+/turf/simulated/shuttle/floor/voidcraft,
+/area/survivalpod)
+"k" = (
+/obj/structure/bed/chair/comfy/black{
+	dir = 1
+	},
+/turf/simulated/shuttle/floor/voidcraft,
+/area/survivalpod)
+"m" = (
+/obj/machinery/smartfridge/survival_pod{
+	pixel_y = 28;
+	density = 0
+	},
+/obj/item/storage/mre/random,
+/obj/item/storage/mre/random,
+/obj/item/storage/mre/random,
+/obj/item/storage/mre/menu11,
+/obj/item/fbp_backup_cell,
+/obj/item/fbp_backup_cell,
+/obj/item/fbp_backup_cell,
+/obj/item/fbp_backup_cell,
+/obj/item/fbp_backup_cell,
+/obj/item/storage/pill_bottle/dice_nerd,
+/obj/item/storage/firstaid/regular,
+/turf/simulated/shuttle/floor/voidcraft,
+/area/survivalpod)
+"q" = (
+/obj/machinery/light_switch/survival_pod{
+	dir = 1;
+	pixel_x = -9;
+	pixel_y = -23
+	},
+/obj/structure/closet/cabinet,
+/turf/simulated/shuttle/floor/voidcraft,
+/area/survivalpod)
+"s" = (
+/obj/structure/sign/mining/survival{
+	dir = 8
+	},
+/turf/simulated/shuttle/wall/voidcraft,
+/area/survivalpod)
+"x" = (
+/obj/machinery/light/small{
+	dir = 4;
+	pixel_y = 19
+	},
+/obj/structure/bed/double/padded,
+/obj/item/bedsheet/hopdouble,
+/turf/simulated/shuttle/floor/voidcraft,
+/area/survivalpod)
+"B" = (
+/obj/structure/sign/mining/survival{
+	dir = 1;
+	layer = 2.8
+	},
+/turf/simulated/shuttle/wall/voidcraft,
+/area/survivalpod)
+"D" = (
+/obj/structure/table/reinforced,
+/obj/item/deck/cards{
+	pixel_y = 4;
+	pixel_x = -4
+	},
+/turf/simulated/shuttle/floor/voidcraft,
+/area/survivalpod)
+"G" = (
+/obj/structure/fans{
+	pixel_y = 32;
+	density = 0
+	},
+/obj/structure/bed/chair/comfy/black,
+/turf/simulated/shuttle/floor/voidcraft,
+/area/survivalpod)
+"J" = (
+/obj/structure/sign/mining/survival,
+/turf/simulated/shuttle/wall/voidcraft,
+/area/survivalpod)
+"O" = (
+/turf/simulated/shuttle/floor/voidcraft,
+/area/survivalpod)
+"Q" = (
+/obj/structure/sign/mining,
+/turf/simulated/shuttle/wall/voidcraft,
+/area/survivalpod)
+"W" = (
+/obj/structure/sign/mining/survival{
+	dir = 4
+	},
+/turf/simulated/shuttle/wall/voidcraft,
+/area/survivalpod)
+
+(1,1,1) = {"
+a
+a
+s
+a
+a
+"}
+(2,1,1) = {"
+a
+G
+D
+k
+J
+"}
+(3,1,1) = {"
+B
+m
+O
+b
+g
+"}
+(4,1,1) = {"
+a
+h
+x
+q
+Q
+"}
+(5,1,1) = {"
+a
+a
+W
+a
+a
+"}

maps/submaps/shelters/7x7/shelter_2.dmm

@@ -97,16 +97,14 @@
 	layer = 2.6
 	},
 /obj/machinery/door/window/survival_pod{
-	dir = 1;
-	icon_state = "windoor"
+	dir = 1
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/survivalpod)
 "o" = (
 /obj/structure/bed/chair/comfy/black,
 /obj/structure/window/reinforced/survival_pod{
-	dir = 1;
-	icon_state = "pwindow"
+	dir = 1
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/survivalpod)
@@ -122,8 +120,7 @@
 /area/survivalpod)
 "r" = (
 /obj/structure/window/reinforced/survival_pod{
-	dir = 8;
-	icon_state = "pwindow"
+	dir = 8
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/survivalpod)
@@ -148,8 +145,7 @@
 	pixel_y = -2
 	},
 /obj/structure/window/reinforced/survival_pod{
-	dir = 1;
-	icon_state = "pwindow"
+	dir = 1
 	},
 /obj/structure/table/steel{
 	pixel_y = -9
@@ -158,15 +154,13 @@
 /area/survivalpod)
 "u" = (
 /obj/machinery/door/window/survival_pod{
-	dir = 1;
-	icon_state = "windoor"
+	dir = 1
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/survivalpod)
 "v" = (
 /obj/structure/window/reinforced/survival_pod{
-	dir = 1;
-	icon_state = "pwindow"
+	dir = 1
 	},
 /obj/machinery/holoplant,
 /turf/simulated/floor/carpet/bcarpet,
@@ -174,8 +168,19 @@
 "w" = (
 /obj/structure/window/reinforced/survival_pod{
 	density = 0;
-	dir = 9;
-	icon_state = "pwindow"
+	dir = 9
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod)
+"x" = (
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	pixel_y = -24;
+	pixel_x = 32
+	},
+/obj/machinery/light_switch/survival_pod{
+	dir = 8;
+	pixel_x = 23;
+	pixel_y = -23
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/survivalpod)
@@ -213,13 +218,6 @@
 /obj/structure/sign/mining,
 /turf/simulated/shuttle/wall/voidcraft/survival,
 /area/survivalpod)
-"S" = (
-/obj/machinery/button/remote/airlock/survival_pod{
-	dir = 10;
-	pixel_y = -24
-	},
-/turf/simulated/floor/carpet/bcarpet,
-/area/survivalpod)
 
 (1,1,1) = {"
 a
@@ -254,7 +252,7 @@ g
 m
 q
 v
-A
+x
 D
 "}
 (5,1,1) = {"
@@ -263,7 +261,7 @@ h
 n
 r
 w
-S
+A
 a
 "}
 (6,1,1) = {"

maps/submaps/shelters/7x7/shelter_kitchen.dmm

@@ -0,0 +1,339 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/sign/mining/survival{
+	dir = 4
+	},
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod)
+"b" = (
+/obj/structure/sign/mining/survival{
+	dir = 8
+	},
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod)
+"d" = (
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod)
+"f" = (
+/obj/structure/closet/secure_closet/freezer/meat,
+/obj/effect/floor_decal/industrial/warning/dust{
+	dir = 10
+	},
+/turf/simulated/shuttle/floor/voidcraft/light,
+/area/survivalpod)
+"g" = (
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled/eris/cafe,
+/area/survivalpod)
+"h" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/voidcraft/survival_pod/vertical,
+/obj/effect/floor_decal/industrial/danger/full,
+/turf/simulated/shuttle/floor/voidcraft,
+/area/survivalpod)
+"i" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled/eris/cafe,
+/area/survivalpod)
+"m" = (
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled/eris/cafe,
+/area/survivalpod)
+"n" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/voidcraft/survival_pod,
+/obj/effect/floor_decal/industrial/danger/full,
+/turf/simulated/shuttle/floor/voidcraft,
+/area/survivalpod)
+"p" = (
+/obj/structure/table/reinforced,
+/obj/machinery/microwave{
+	pixel_y = 6
+	},
+/obj/machinery/light,
+/obj/effect/floor_decal/industrial/warning/dust{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor/voidcraft/light,
+/area/survivalpod)
+"q" = (
+/obj/structure/closet/secure_closet/freezer/fridge,
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/fruitspawner/tomato,
+/obj/fruitspawner/tomato,
+/obj/fruitspawner/tomato,
+/obj/fruitspawner/tomato,
+/obj/fruitspawner/apple,
+/obj/fruitspawner/apple,
+/obj/fruitspawner/apple,
+/obj/fruitspawner/apple,
+/obj/effect/floor_decal/industrial/warning/dust/corner{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor/voidcraft/light,
+/area/survivalpod)
+"r" = (
+/obj/structure/sign/mining,
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod)
+"v" = (
+/obj/machinery/disposal/wall{
+	dir = 1
+	},
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/eris/cafe,
+/area/survivalpod)
+"y" = (
+/obj/structure/table/reinforced,
+/obj/machinery/reagentgrinder{
+	pixel_y = 9
+	},
+/obj/item/reagent_containers/dropper{
+	pixel_y = -9;
+	pixel_x = -3
+	},
+/obj/effect/floor_decal/industrial/warning/dust{
+	dir = 9
+	},
+/turf/simulated/shuttle/floor/voidcraft/light,
+/area/survivalpod)
+"z" = (
+/obj/structure/sink/kitchen{
+	dir = 8;
+	pixel_x = -13
+	},
+/turf/simulated/floor/tiled/eris/cafe,
+/area/survivalpod)
+"A" = (
+/obj/effect/floor_decal/industrial/warning/dust{
+	dir = 5
+	},
+/obj/machinery/vending/dinnerware{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor/voidcraft/light,
+/area/survivalpod)
+"C" = (
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod)
+"D" = (
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	pixel_y = -24;
+	pixel_x = 21
+	},
+/turf/simulated/floor/tiled/eris/cafe,
+/area/survivalpod)
+"F" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod)
+"G" = (
+/obj/structure/table/reinforced,
+/obj/item/material/kitchen/rollingpin{
+	pixel_y = 23;
+	pixel_x = 3
+	},
+/obj/item/reagent_containers/food/condiment/enzyme{
+	layer = 5;
+	pixel_x = -9;
+	pixel_y = 22
+	},
+/obj/item/material/knife/butch{
+	pixel_y = 15;
+	pixel_x = 4
+	},
+/obj/item/book/manual/chef_recipes{
+	pixel_x = -9;
+	pixel_y = -3
+	},
+/obj/item/book/manual/cook_guide{
+	pixel_x = 6;
+	pixel_y = -3
+	},
+/obj/machinery/light,
+/obj/effect/floor_decal/industrial/warning/dust{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor/voidcraft/light,
+/area/survivalpod)
+"H" = (
+/obj/structure/table/reinforced,
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled/eris/cafe,
+/area/survivalpod)
+"I" = (
+/obj/structure/table/reinforced,
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled/eris/cafe,
+/area/survivalpod)
+"J" = (
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	pixel_y = -21;
+	pixel_x = -24;
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/cafe,
+/area/survivalpod)
+"N" = (
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	pixel_y = -21;
+	pixel_x = 24;
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/cafe,
+/area/survivalpod)
+"O" = (
+/turf/simulated/floor/tiled/eris/cafe,
+/area/survivalpod)
+"P" = (
+/obj/effect/floor_decal/industrial/warning/dust,
+/obj/machinery/appliance/cooker/fryer,
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/shuttle/floor/voidcraft/light,
+/area/survivalpod)
+"S" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/food/condiment/carton/flour,
+/obj/item/reagent_containers/food/condiment/carton/flour,
+/obj/item/reagent_containers/food/condiment/carton/flour,
+/obj/item/reagent_containers/food/condiment/carton/flour,
+/obj/item/reagent_containers/food/condiment/carton/flour,
+/obj/item/reagent_containers/food/condiment/carton/flour,
+/obj/item/reagent_containers/food/condiment/carton/flour,
+/obj/item/reagent_containers/food/condiment/carton/flour,
+/obj/item/reagent_containers/food/condiment/spacespice,
+/obj/item/reagent_containers/food/condiment/spacespice,
+/obj/item/reagent_containers/food/condiment/carton/sugar,
+/obj/item/reagent_containers/food/condiment/carton/sugar,
+/obj/item/reagent_containers/food/condiment/small/saltshaker,
+/obj/item/reagent_containers/food/condiment/small/saltshaker,
+/obj/item/reagent_containers/food/condiment/small/peppermill,
+/obj/item/reagent_containers/food/condiment/small/peppermill,
+/obj/random/donkpocketbox,
+/obj/item/storage/box/beakers{
+	name = "box of measuring cups";
+	pixel_x = 2;
+	pixel_y = 3;
+	starts_with = list(/obj/item/reagent_containers/glass/beaker/measuring_cup = 7)
+	},
+/obj/structure/closet/walllocker_double/kitchen/north,
+/obj/effect/floor_decal/industrial/warning/dust,
+/turf/simulated/shuttle/floor/voidcraft/light,
+/area/survivalpod)
+"U" = (
+/obj/structure/sign/mining/survival{
+	dir = 1
+	},
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod)
+"V" = (
+/obj/machinery/appliance/cooker/grill,
+/obj/effect/floor_decal/industrial/warning/dust,
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/shuttle/floor/voidcraft/light,
+/area/survivalpod)
+"Y" = (
+/obj/structure/sign/mining/survival,
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod)
+"Z" = (
+/obj/machinery/appliance/cooker/oven,
+/obj/effect/floor_decal/industrial/warning/dust,
+/turf/simulated/shuttle/floor/voidcraft/light,
+/area/survivalpod)
+
+(1,1,1) = {"
+d
+b
+d
+h
+d
+b
+d
+"}
+(2,1,1) = {"
+U
+Z
+z
+J
+A
+p
+Y
+"}
+(3,1,1) = {"
+F
+V
+i
+g
+i
+v
+d
+"}
+(4,1,1) = {"
+C
+P
+m
+I
+H
+D
+n
+"}
+(5,1,1) = {"
+d
+S
+O
+O
+O
+O
+d
+"}
+(6,1,1) = {"
+U
+q
+f
+N
+y
+G
+r
+"}
+(7,1,1) = {"
+d
+a
+d
+h
+d
+a
+d
+"}

maps/submaps/shelters/7x7/shelter_luxury_alt.dmm

@@ -0,0 +1,388 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod)
+"d" = (
+/obj/structure/sign/mining/survival{
+	dir = 1;
+	layer = 2.9
+	},
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod/dorms)
+"e" = (
+/obj/machinery/recharge_station,
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod)
+"f" = (
+/obj/structure/fans{
+	pixel_y = 32;
+	density = 0
+	},
+/obj/machinery/sleeper/survival_pod,
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod)
+"g" = (
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
+/area/survivalpod/dorms)
+"i" = (
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	pixel_y = -22;
+	pixel_x = 21
+	},
+/obj/machinery/light_switch/survival_pod{
+	dir = 1;
+	pixel_x = 29;
+	pixel_y = -21
+	},
+/turf/simulated/floor/carpet/blue2,
+/area/survivalpod/dorms)
+"k" = (
+/obj/structure/sign/mining/survival{
+	dir = 4
+	},
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod/dorms)
+"o" = (
+/obj/machinery/door/window/survival_pod{
+	dir = 2
+	},
+/obj/structure/sink/kitchen{
+	dir = 4;
+	pixel_x = 13;
+	pixel_y = 9
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod)
+"p" = (
+/obj/machinery/light,
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod)
+"q" = (
+/obj/structure/sign/mining/survival,
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod)
+"r" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
+/area/survivalpod/dorms)
+"s" = (
+/obj/structure/sign/mining/survival{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/structure/sign/mining/survival{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod)
+"t" = (
+/obj/structure/sign/mining/survival{
+	dir = 8
+	},
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod)
+"u" = (
+/obj/machinery/button/remote/airlock/survival_pod/bolts{
+	pixel_y = -24;
+	pixel_x = 23
+	},
+/obj/machinery/light_switch/survival_pod{
+	dir = 8;
+	pixel_x = 33;
+	pixel_y = -23
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod)
+"v" = (
+/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
+/area/survivalpod/dorms)
+"w" = (
+/obj/structure/table/survival_pod,
+/obj/machinery/recharger{
+	pixel_y = 5;
+	pixel_x = -5
+	},
+/obj/structure/window/reinforced/survival_pod,
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod)
+"x" = (
+/obj/structure/bed/chair/comfy/black{
+	dir = 1
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod)
+"y" = (
+/obj/machinery/disposal/wall{
+	dir = 8
+	},
+/obj/structure/disposalpipe/trunk{
+	dir = 4
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod)
+"z" = (
+/obj/structure/table/standard,
+/turf/simulated/floor/carpet/blue2,
+/area/survivalpod/dorms)
+"A" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "podwindows";
+	dir = 8
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "podwindows";
+	dir = 4
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "podwindows";
+	dir = 1
+	},
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod)
+"B" = (
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod/dorms)
+"C" = (
+/obj/structure/disposalpipe/junction/yjunction{
+	dir = 8
+	},
+/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,
+/area/survivalpod/dorms)
+"D" = (
+/obj/machinery/holoplant,
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod)
+"E" = (
+/obj/machinery/smartfridge/survival_pod{
+	pixel_y = 27;
+	density = 0
+	},
+/obj/item/storage/mre/random,
+/obj/item/storage/mre/random,
+/obj/item/storage/mre/random,
+/obj/item/storage/mre/random,
+/obj/item/storage/mre/random,
+/obj/item/storage/mre/random,
+/obj/item/storage/mre/menu9,
+/obj/item/storage/mre/menu9,
+/obj/item/storage/mre/menu10,
+/obj/item/storage/mre/menu10,
+/obj/item/storage/mre/menu11,
+/obj/item/storage/mre/menu11,
+/obj/item/fbp_backup_cell,
+/obj/item/fbp_backup_cell,
+/obj/item/fbp_backup_cell,
+/obj/item/fbp_backup_cell,
+/obj/item/fbp_backup_cell,
+/obj/item/storage/firstaid/fire,
+/obj/item/storage/firstaid/toxin,
+/obj/item/storage/firstaid/o2,
+/obj/item/storage/box/survival/space,
+/obj/item/clothing/accessory/watch/survival,
+/obj/item/emergency_beacon,
+/obj/item/healthanalyzer,
+/obj/item/storage/pill_bottle/dice_nerd,
+/obj/item/deck/cards,
+/obj/item/deck/cards/triple,
+/obj/item/storage/mre/random,
+/obj/item/spacecasinocash_fake/c1000,
+/obj/item/spacecasinocash_fake/c1000,
+/obj/item/storage/mre/random,
+/obj/item/radio{
+	icon_state = "walkietalkiebay";
+	name = "emergency radio"
+	},
+/obj/item/stack/material/steel{
+	amount = 5
+	},
+/obj/item/gps,
+/obj/machinery/light/floortube,
+/obj/item/storage/mre/random,
+/obj/item/storage/mre/random,
+/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod)
+"F" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "podwindows";
+	dir = 8
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "podwindows";
+	dir = 4
+	},
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod)
+"I" = (
+/obj/structure/bed/double/padded,
+/obj/item/bedsheet/yellowdouble,
+/turf/simulated/floor/carpet/blue2,
+/area/survivalpod/dorms)
+"J" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/voidcraft/survival_pod,
+/obj/effect/floor_decal/industrial/danger/full,
+/turf/simulated/shuttle/floor/voidcraft,
+/area/survivalpod)
+"L" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/machinery/disposal/wall{
+	dir = 4
+	},
+/obj/structure/disposalpipe/trunk{
+	dir = 8
+	},
+/turf/simulated/floor/carpet/blue2,
+/area/survivalpod/dorms)
+"M" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/voidcraft/survival_pod,
+/obj/effect/floor_decal/industrial/danger/full,
+/turf/simulated/shuttle/floor/voidcraft,
+/area/survivalpod/dorms)
+"O" = (
+/obj/structure/table/steel_reinforced,
+/obj/item/reagent_containers/food/drinks/bottle/melonliquor{
+	pixel_y = 11;
+	pixel_x = -6
+	},
+/obj/item/reagent_containers/food/drinks/metaglass{
+	pixel_y = 10;
+	pixel_x = 8
+	},
+/obj/item/reagent_containers/food/drinks/metaglass{
+	pixel_y = 5;
+	pixel_x = 3
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod)
+"P" = (
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod)
+"Q" = (
+/obj/structure/bed/chair/comfy/black,
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod)
+"S" = (
+/obj/machinery/button/windowtint{
+	pixel_x = 9;
+	id = "podwindows";
+	pixel_y = 30;
+	range = 3
+	},
+/turf/simulated/floor/carpet/bcarpet,
+/area/survivalpod)
+"X" = (
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/shuttle/wall/voidcraft/survival,
+/area/survivalpod)
+"Y" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "podwindows";
+	dir = 8
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "podwindows";
+	dir = 4
+	},
+/obj/structure/window/reinforced/polarized/survival_pod{
+	id = "podwindows"
+	},
+/turf/simulated/shuttle/floor/voidcraft/dark,
+/area/survivalpod)
+
+(1,1,1) = {"
+P
+t
+P
+A
+F
+Y
+P
+"}
+(2,1,1) = {"
+s
+f
+w
+Q
+O
+x
+q
+"}
+(3,1,1) = {"
+X
+E
+o
+y
+a
+p
+P
+"}
+(4,1,1) = {"
+d
+r
+C
+g
+S
+u
+J
+"}
+(5,1,1) = {"
+B
+L
+i
+M
+a
+a
+P
+"}
+(6,1,1) = {"
+d
+I
+z
+v
+e
+D
+q
+"}
+(7,1,1) = {"
+B
+k
+B
+k
+A
+Y
+P
+"}

maps/submaps/shelters/9x9/shelter_recroom.dmm

@@ -77,27 +77,27 @@
 /obj/structure/closet/walllocker_double/casino/north,
 /obj/item/spacecasinocash_fake/c1000{
 	pixel_y = 12;
-	pixel_x = 12
+	pixel_x = 10
 	},
 /obj/item/spacecasinocash_fake/c1000{
 	pixel_y = 12;
-	pixel_x = 6
+	pixel_x = 4
 	},
 /obj/item/spacecasinocash_fake/c1000{
 	pixel_y = 7;
-	pixel_x = 12
+	pixel_x = 10
 	},
 /obj/item/spacecasinocash_fake/c1000{
 	pixel_y = 7;
-	pixel_x = 6
+	pixel_x = 4
 	},
 /obj/item/spacecasinocash_fake/c1000{
 	pixel_y = 3;
-	pixel_x = 12
+	pixel_x = 10
 	},
 /obj/item/spacecasinocash_fake/c1000{
 	pixel_y = 3;
-	pixel_x = 6
+	pixel_x = 4
 	},
 /obj/item/storage/pill_bottle/dice{
 	pixel_y = 12;
@@ -111,6 +111,10 @@
 	pixel_x = -6;
 	pixel_y = -1
 	},
+/obj/item/deck/cards/casino/triple{
+	pixel_y = -1;
+	pixel_x = 6
+	},
 /turf/simulated/floor/tiled/eris/steel/bar_dance,
 /area/survivalpod)
 "n" = (