From 08566dbe87429eea0762ed9b806c222f6ae55aff Mon Sep 17 00:00:00 2001
From: shellspeed1 <omegashellspeed1@gmail.com>
Date: Sun, 21 Aug 2022 01:17:08 -0700
Subject: [PATCH 01/18] Update shelter_5.dmm

penthouse pod update
---
 _maps/templates/shelter_5.dmm | 413 +++++++++++++++++++---------------
 1 file changed, 230 insertions(+), 183 deletions(-)

diff --git a/_maps/templates/shelter_5.dmm b/_maps/templates/shelter_5.dmm
index 643f744fb9..289f5d2f39 100644
--- a/_maps/templates/shelter_5.dmm
+++ b/_maps/templates/shelter_5.dmm
@@ -1,63 +1,79 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "cc" = (
-/obj/machinery/vending/boozeomat,
-/turf/open/floor/pod/dark,
+/obj/machinery/vending/games,
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "dH" = (
-/obj/structure/chair/sofa/corp,
-/obj/machinery/light{
-	dir = 1
+/obj/machinery/chem_dispenser/drinks/beer{
+	pixel_y = 30;
+	CanAtmosPass = -1;
+	CanAtmosPassVertical = -1s
 	},
-/turf/open/floor/pod/dark,
+/obj/structure/table/plasmaglass,
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "fp" = (
-/obj/machinery/smartfridge,
-/turf/closed/wall/mineral/titanium/survival/pod,
+/obj/structure/chair/office/dark{
+	dir = 4
+	},
+/turf/open/floor/carpet/royalblue,
 /area/survivalpod/nonpowered)
 "fC" = (
-/obj/structure/table/reinforced,
-/obj/machinery/chem_dispenser/drinks,
-/turf/open/floor/pod/dark,
+/obj/structure/bookcase/random,
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "fM" = (
-/obj/structure/table/survival_pod,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/storage/bag/plants/portaseeder,
-/obj/item/shovel/spade,
-/obj/item/cultivator,
-/obj/item/reagent_containers/spray/weedspray,
+/obj/machinery/recharge_station/fullupgrade,
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "fN" = (
-/obj/structure/table/reinforced,
-/obj/item/kitchen/knife,
-/obj/item/kitchen/rollingpin,
-/obj/machinery/reagentgrinder,
-/turf/open/floor/pod/dark,
+/obj/machinery/door/airlock/survival_pod/glass,
+/turf/open/floor/noslip,
 /area/survivalpod/nonpowered)
 "gr" = (
 /obj/machinery/vending/wallmed,
 /turf/closed/wall/mineral/titanium/survival/pod,
 /area/survivalpod/nonpowered)
+"gG" = (
+/obj/structure/chair/comfy/black{
+	dir = 8
+	},
+/turf/open/floor/festive/wooden/wooden1,
+/area/survivalpod/nonpowered)
 "hr" = (
-/obj/structure/table/reinforced,
-/obj/machinery/chem_dispenser/drinks/beer,
-/turf/open/floor/pod/dark,
+/obj/machinery/door/airlock/survival_pod/glass,
+/obj/machinery/poweredfans,
+/turf/closed/wall/mineral/titanium/survival/pod,
 /area/survivalpod/nonpowered)
 "iu" = (
 /obj/structure/curtain,
-/obj/machinery/poweredfans,
-/turf/open/floor/pod/dark,
+/obj/structure/window/reinforced/survival_pod{
+	dir = 4
+	},
+/obj/structure/window/plasma/reinforced/spawner/north,
+/turf/open/floor/noslip,
 /area/survivalpod/nonpowered)
 "iD" = (
 /obj/item/gps/computer,
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "iY" = (
-/obj/structure/bed/pod,
-/obj/item/bedsheet/nanotrasen,
-/turf/open/floor/pod/dark,
+/obj/structure/bed/double/pod{
+	dir = 4
+	},
+/obj/item/bedsheet/cosmos/double{
+	dir = 1
+	},
+/obj/item/toy/plush/mothplushie,
+/turf/open/floor/festive/wooden/wooden1,
+/area/survivalpod/nonpowered)
+"ko" = (
+/obj/machinery/vending/boozeomat{
+	pixel_y = 32;
+	CanAtmosPass = -1;
+	CanAtmosPassVertical = -1sssssssss
+	},
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "lO" = (
 /obj/machinery/poweredfans,
@@ -68,40 +84,37 @@
 /obj/structure/chair/sofa/corp{
 	dir = 1
 	},
-/turf/open/floor/pod/dark,
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "mC" = (
-/obj/structure/chair/sofa/corp{
+/obj/structure/chair/sofa/corp/right{
 	dir = 8
 	},
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/pod/dark,
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "mN" = (
 /obj/machinery/power/rtg/advanced/fullupgrade,
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "oo" = (
-/obj/machinery/vending/dinnerware,
-/turf/open/floor/pod/dark,
+/obj/structure/table/plasmaglass,
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "pg" = (
-/obj/machinery/shower{
-	dir = 8
-	},
-/turf/open/floor/noslip,
+/obj/structure/chair/comfy/black,
+/turf/open/floor/carpet/royalblue,
 /area/survivalpod/nonpowered)
 "pF" = (
-/obj/machinery/modular_computer/console/preset/civilian{
-	dir = 8
-	},
-/turf/open/floor/pod/dark,
+/obj/structure/closet/cabinet,
+/obj/item/clothing/under/misc/bathrobe,
+/obj/structure/closet/cabinet,
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "qE" = (
-/obj/machinery/washing_machine,
-/turf/open/floor/pod/dark,
+/obj/structure/sink{
+	pixel_y = 18
+	},
+/turf/open/floor/mineral/silver,
 /area/survivalpod/nonpowered)
 "rL" = (
 /obj/structure/mirror,
@@ -111,132 +124,165 @@
 /obj/structure/chair/sofa/corp/corner{
 	dir = 8
 	},
-/turf/open/floor/pod/dark,
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "rZ" = (
-/obj/structure/sink{
-	pixel_y = 18
+/obj/machinery/washing_machine,
+/turf/open/floor/mineral/silver,
+/area/survivalpod/nonpowered)
+"sD" = (
+/obj/machinery/camera{
+	dir = 5
 	},
-/turf/open/floor/pod/dark,
+/turf/open/floor/carpet/royalblue,
 /area/survivalpod/nonpowered)
 "sN" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/structure/sink/kitchen{
-	dir = 4;
-	pixel_x = -10
-	},
+/obj/structure/rack,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/storage/toolbox/electrical,
+/obj/item/pickaxe,
+/obj/item/shovel,
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "td" = (
-/obj/machinery/hydroponics/constructable/automagic,
-/turf/open/floor/pod/dark,
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/structure/easel,
+/obj/item/canvas/twentythreeXtwentythree,
+/obj/item/storage/crayons,
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "um" = (
-/obj/structure/table/wood/fancy/monochrome,
-/turf/open/floor/pod/dark,
+/obj/structure/table/wood/fancy/royalblack,
+/obj/item/reagent_containers/food/drinks/bottle/lizardwine,
+/turf/open/floor/carpet/royalblue,
 /area/survivalpod/nonpowered)
 "uR" = (
 /obj/machinery/light,
-/turf/open/floor/pod/dark,
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "vU" = (
 /obj/machinery/sleeper/survival_pod,
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "wv" = (
-/obj/structure/table/reinforced,
-/obj/machinery/microwave,
-/turf/open/floor/pod/dark,
+/obj/machinery/holopad,
+/turf/open/floor/carpet/royalblue,
 /area/survivalpod/nonpowered)
 "wI" = (
-/obj/item/storage/fancy/candle_box,
-/obj/structure/table/wood/fancy/blackred,
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/open/floor/pod/dark,
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "xC" = (
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/open/floor/pod/dark,
+/obj/structure/table/plasmaglass,
+/obj/structure/bedsheetbin/towel,
+/turf/open/floor/mineral/silver,
+/area/survivalpod/nonpowered)
+"zo" = (
+/obj/structure/dresser,
+/turf/open/floor/carpet/royalblue,
 /area/survivalpod/nonpowered)
 "zW" = (
-/obj/machinery/vending/hydroseeds,
-/turf/open/floor/pod/dark,
+/obj/structure/sign/painting/library,
+/turf/closed/wall/mineral/titanium/survival/pod,
 /area/survivalpod/nonpowered)
 "BI" = (
-/obj/structure/chair/sofa/corp/corner{
-	dir = 4
+/obj/machinery/chem_dispenser/drinks{
+	pixel_y = 30
 	},
-/turf/open/floor/pod/dark,
+/obj/structure/table/plasmaglass{
+	CanAtmosPass = -1
+	},
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "Cj" = (
-/obj/structure/chair/sofa/corp/right{
-	dir = 8
-	},
+/turf/open/floor/festive/wooden/wooden1,
+/area/survivalpod/nonpowered)
+"Cq" = (
+/obj/machinery/poweredfans,
+/obj/structure/window/shuttle/survival_pod,
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "EV" = (
-/obj/structure/bed/pod,
-/obj/item/bedsheet/nanotrasen,
-/obj/item/toy/plush/mothplushie,
-/turf/open/floor/pod/dark,
+/obj/structure/table/plasmaglass,
+/obj/item/modular_computer/laptop/preset/civilian,
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "Fo" = (
 /obj/machinery/smartfridge/survival_pod,
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "Fw" = (
-/obj/structure/chair/sofa/corp{
+/obj/structure/chair/sofa/corp/left{
 	dir = 4
 	},
-/turf/open/floor/pod/dark,
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "FE" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/pod/dark,
+/obj/machinery/light,
+/turf/open/floor/noslip,
 /area/survivalpod/nonpowered)
 "FZ" = (
 /turf/closed/wall/mineral/titanium/survival/pod,
 /area/survivalpod/nonpowered)
+"JE" = (
+/obj/structure/table/wood/fancy/royalblack,
+/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/food/drinks/drinkingglass,
+/turf/open/floor/carpet/royalblue,
+/area/survivalpod/nonpowered)
 "JL" = (
-/obj/machinery/door/window/survival_pod{
-	dir = 8
-	},
-/turf/open/floor/pod/dark,
+/turf/open/floor/mineral/silver,
 /area/survivalpod/nonpowered)
 "Lv" = (
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "Ng" = (
-/obj/structure/chair/wood/normal,
-/turf/open/floor/pod/dark,
+/obj/machinery/modular_computer/console/preset/civilian{
+	dir = 8
+	},
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "Qr" = (
-/obj/effect/spawner/structure/window/hollow/survival_pod,
+/obj/structure/window/shuttle/survival_pod,
+/obj/machinery/poweredfans,
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
+"QT" = (
+/obj/structure/rack,
+/obj/item/clothing/shoes/sandal,
+/obj/machinery/light,
+/turf/open/floor/festive/wooden/wooden1,
+/area/survivalpod/nonpowered)
 "Ro" = (
 /obj/structure/chair/comfy/black{
 	dir = 4
 	},
-/turf/open/floor/pod/dark,
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "Ry" = (
-/obj/structure/chair/sofa/corp/left,
-/turf/open/floor/pod/dark,
+/obj/structure/fireplace,
+/obj/item/stack/sheet/mineral/wood/fifty,
+/turf/open/floor/festive/wooden/wooden1,
+/area/survivalpod/nonpowered)
+"RH" = (
+/obj/machinery/shower{
+	pixel_y = 18
+	},
+/obj/structure/window/plasma/reinforced/spawner/east,
+/turf/open/floor/noslip,
 /area/survivalpod/nonpowered)
 "Tc" = (
-/obj/machinery/light{
-	dir = 1
+/obj/structure/toilet/secret/high_loot{
+	dir = 4
 	},
-/turf/open/floor/pod/dark,
+/turf/open/floor/mineral/silver,
 /area/survivalpod/nonpowered)
 "TQ" = (
 /obj/structure/fans,
@@ -246,20 +292,25 @@
 /obj/structure/chair/sofa/corp/corner{
 	dir = 1
 	},
-/turf/open/floor/pod/dark,
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "Vp" = (
-/obj/structure/table/reinforced,
-/obj/machinery/dish_drive,
-/turf/open/floor/pod/dark,
+/turf/open/floor/carpet/royalblue,
 /area/survivalpod/nonpowered)
 "Vv" = (
-/obj/machinery/biogenerator,
-/turf/open/floor/pod/dark,
+/obj/structure/table/plasmaglass,
+/obj/machinery/newscaster{
+	pixel_x = 26
+	},
+/obj/item/paper_bin,
+/obj/item/pen/fountain,
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "Ws" = (
-/obj/structure/dresser,
-/turf/open/floor/pod/dark,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/carpet/royalblue,
 /area/survivalpod/nonpowered)
 "Xh" = (
 /obj/machinery/door/airlock/survival_pod/glass,
@@ -275,11 +326,7 @@
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "YH" = (
-/obj/structure/table/survival_pod,
-/obj/item/shovel,
-/obj/item/pickaxe,
-/obj/item/storage/toolbox/electrical,
-/obj/item/clothing/gloves/color/yellow,
+/obj/machinery/mineral/equipment_vendor,
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 
@@ -300,59 +347,59 @@ FZ
 "}
 (2,1,1) = {"
 FZ
-pg
+RH
 FE
 FZ
-EV
-Ws
+iY
+FZ
 iY
 FZ
 BI
-Fw
+Cj
 Fw
 Ub
-Qr
+Cq
 "}
 (3,1,1) = {"
 FZ
-FZ
-iu
-FZ
 Tc
-Lv
+iu
+zW
+Cj
+zo
 uR
 FZ
 dH
-um
-um
+pg
+JE
 lW
 Qr
 "}
 (4,1,1) = {"
-FZ
+rL
 qE
 JL
-FZ
-Lv
-Lv
-Ro
+fN
+Cj
+Vp
+Cj
 FZ
 Ry
-um
+pg
 um
 lW
 Qr
 "}
 (5,1,1) = {"
-rL
+FZ
 rZ
 xC
-Xh
-Lv
-Lv
+FZ
+pF
+Cj
 pF
 FZ
-Lv
+ko
 Cj
 mC
 rM
@@ -367,37 +414,37 @@ FZ
 Xh
 FZ
 FZ
-Xh
-FZ
-FZ
-FZ
+cc
+Cj
+Cj
+QT
 FZ
 "}
 (7,1,1) = {"
-FZ
-wv
-sN
-Lv
-Xh
-Lv
-Lv
-xC
-Lv
-FE
-Lv
-Lv
+lO
+Cj
+Cj
+Cj
+Cj
+Cj
+Cj
+Cj
+Cj
+Cj
+Cj
+Cj
 lO
 "}
 (8,1,1) = {"
 FZ
-fN
-Lv
-oo
 FZ
 FZ
-Xh
 FZ
 FZ
+Cj
+Cj
+Cj
+FZ
 FZ
 FZ
 Xr
@@ -406,12 +453,12 @@ FZ
 (9,1,1) = {"
 FZ
 fC
-Lv
-cc
-FZ
-fM
-Lv
-td
+sD
+Vp
+Ws
+Vp
+Vp
+Ro
 FZ
 TQ
 vU
@@ -420,28 +467,28 @@ FZ
 "}
 (10,1,1) = {"
 FZ
-hr
-Lv
+fC
 Vp
-FZ
-zW
-Lv
-td
+Vp
+wv
+Vp
+Vp
+EV
 gr
 YH
-Lv
+fM
 Xy
 FZ
 "}
 (11,1,1) = {"
 FZ
-Lv
-Lv
-Lv
+fC
+Vp
+Vp
 fp
-Lv
-Lv
-td
+Vp
+Vp
+gG
 FZ
 Fo
 Lv
@@ -450,16 +497,16 @@ FZ
 "}
 (12,1,1) = {"
 FZ
-Ng
+fC
 wI
 Ng
 Vv
-Lv
-xC
+oo
+Cj
 td
 FZ
 iD
-Lv
+sN
 mN
 FZ
 "}
@@ -469,8 +516,8 @@ Qr
 FZ
 Qr
 FZ
-FZ
-FZ
+Qr
+hr
 FZ
 FZ
 FZ

From f0a448e4e1ec825663837b3b606a6ae6c08fa29d Mon Sep 17 00:00:00 2001
From: shellspeed1 <omegashellspeed1@gmail.com>
Date: Sun, 21 Aug 2022 01:37:55 -0700
Subject: [PATCH 02/18] Update shelter_5.dmm

pod tweaks
---
 _maps/templates/shelter_5.dmm | 37 +++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/_maps/templates/shelter_5.dmm b/_maps/templates/shelter_5.dmm
index 289f5d2f39..4e790d2891 100644
--- a/_maps/templates/shelter_5.dmm
+++ b/_maps/templates/shelter_5.dmm
@@ -5,11 +5,14 @@
 /area/survivalpod/nonpowered)
 "dH" = (
 /obj/machinery/chem_dispenser/drinks/beer{
-	pixel_y = 30;
+	pixel_y = 8;
 	CanAtmosPass = -1;
 	CanAtmosPassVertical = -1s
 	},
 /obj/structure/table/plasmaglass,
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "fp" = (
@@ -19,7 +22,10 @@
 /turf/open/floor/carpet/royalblue,
 /area/survivalpod/nonpowered)
 "fC" = (
-/obj/structure/bookcase/random,
+/obj/structure/bookcase/random{
+	pixel_y = 32;
+	pass_flags = 1
+	},
 /turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "fM" = (
@@ -71,7 +77,8 @@
 /obj/machinery/vending/boozeomat{
 	pixel_y = 32;
 	CanAtmosPass = -1;
-	CanAtmosPassVertical = -1sssssssss
+	CanAtmosPassVertical = -1sssssssss;
+	pass_flags = 1
 	},
 /turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
@@ -134,7 +141,7 @@
 /obj/machinery/camera{
 	dir = 5
 	},
-/turf/open/floor/carpet/royalblue,
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "sN" = (
 /obj/structure/rack,
@@ -194,7 +201,7 @@
 /area/survivalpod/nonpowered)
 "BI" = (
 /obj/machinery/chem_dispenser/drinks{
-	pixel_y = 30
+	pixel_y = 8
 	},
 /obj/structure/table/plasmaglass{
 	CanAtmosPass = -1
@@ -306,11 +313,17 @@
 /obj/item/pen/fountain,
 /turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
+"Wk" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/festive/wooden/wooden1,
+/area/survivalpod/nonpowered)
 "Ws" = (
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/open/floor/carpet/royalblue,
+/turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "Xh" = (
 /obj/machinery/door/airlock/survival_pod/glass,
@@ -365,7 +378,7 @@ FZ
 Tc
 iu
 zW
-Cj
+Wk
 zo
 uR
 FZ
@@ -425,7 +438,7 @@ lO
 Cj
 Cj
 Cj
-Cj
+wI
 Cj
 Cj
 Cj
@@ -441,7 +454,7 @@ FZ
 FZ
 FZ
 FZ
-Cj
+Wk
 Cj
 Cj
 FZ
@@ -454,10 +467,10 @@ FZ
 FZ
 fC
 sD
-Vp
+Cj
 Ws
-Vp
-Vp
+Cj
+Cj
 Ro
 FZ
 TQ

From 7e9f76017788405f63dd501b015ff9bff9debd41 Mon Sep 17 00:00:00 2001
From: shellspeed1 <omegashellspeed1@gmail.com>
Date: Sun, 21 Aug 2022 03:31:04 -0700
Subject: [PATCH 03/18] Update shelter_5.dmm

cleaning up a mistake
---
 _maps/templates/shelter_5.dmm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/_maps/templates/shelter_5.dmm b/_maps/templates/shelter_5.dmm
index 4e790d2891..61535f1641 100644
--- a/_maps/templates/shelter_5.dmm
+++ b/_maps/templates/shelter_5.dmm
@@ -5,9 +5,7 @@
 /area/survivalpod/nonpowered)
 "dH" = (
 /obj/machinery/chem_dispenser/drinks/beer{
-	pixel_y = 8;
-	CanAtmosPass = -1;
-	CanAtmosPassVertical = -1s
+	pixel_y = 8
 	},
 /obj/structure/table/plasmaglass,
 /obj/machinery/light{
@@ -76,8 +74,6 @@
 "ko" = (
 /obj/machinery/vending/boozeomat{
 	pixel_y = 32;
-	CanAtmosPass = -1;
-	CanAtmosPassVertical = -1sssssssss;
 	pass_flags = 1
 	},
 /turf/open/floor/festive/wooden/wooden1,
@@ -165,6 +161,13 @@
 /obj/item/reagent_containers/food/drinks/bottle/lizardwine,
 /turf/open/floor/carpet/royalblue,
 /area/survivalpod/nonpowered)
+"uo" = (
+/obj/structure/bookcase/random{
+	pixel_y = 32;
+	pass_flags = 1
+	},
+/turf/closed/wall/mineral/titanium/survival/pod,
+/area/survivalpod/nonpowered)
 "uR" = (
 /obj/machinery/light,
 /turf/open/floor/festive/wooden/wooden1,
@@ -411,7 +414,7 @@ FZ
 pF
 Cj
 pF
-FZ
+uo
 ko
 Cj
 mC

From 1ea6e3210edef89548cba6c37cd92d462b2a80b0 Mon Sep 17 00:00:00 2001
From: shellspeed1 <omegashellspeed1@gmail.com>
Date: Sun, 21 Aug 2022 04:59:59 -0700
Subject: [PATCH 04/18] Additional fixes, some cleanup

---
 _maps/templates/shelter_5.dmm | 40 +++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/_maps/templates/shelter_5.dmm b/_maps/templates/shelter_5.dmm
index 61535f1641..2ddb58391a 100644
--- a/_maps/templates/shelter_5.dmm
+++ b/_maps/templates/shelter_5.dmm
@@ -38,6 +38,10 @@
 /obj/machinery/vending/wallmed,
 /turf/closed/wall/mineral/titanium/survival/pod,
 /area/survivalpod/nonpowered)
+"gC" = (
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/festive/wooden/wooden1,
+/area/survivalpod/nonpowered)
 "gG" = (
 /obj/structure/chair/comfy/black{
 	dir = 8
@@ -47,7 +51,7 @@
 "hr" = (
 /obj/machinery/door/airlock/survival_pod/glass,
 /obj/machinery/poweredfans,
-/turf/closed/wall/mineral/titanium/survival/pod,
+/turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "iu" = (
 /obj/structure/curtain,
@@ -97,6 +101,9 @@
 /area/survivalpod/nonpowered)
 "mN" = (
 /obj/machinery/power/rtg/advanced/fullupgrade,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "oo" = (
@@ -110,7 +117,6 @@
 "pF" = (
 /obj/structure/closet/cabinet,
 /obj/item/clothing/under/misc/bathrobe,
-/obj/structure/closet/cabinet,
 /turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "qE" = (
@@ -161,13 +167,6 @@
 /obj/item/reagent_containers/food/drinks/bottle/lizardwine,
 /turf/open/floor/carpet/royalblue,
 /area/survivalpod/nonpowered)
-"uo" = (
-/obj/structure/bookcase/random{
-	pixel_y = 32;
-	pass_flags = 1
-	},
-/turf/closed/wall/mineral/titanium/survival/pod,
-/area/survivalpod/nonpowered)
 "uR" = (
 /obj/machinery/light,
 /turf/open/floor/festive/wooden/wooden1,
@@ -198,6 +197,12 @@
 /obj/structure/dresser,
 /turf/open/floor/carpet/royalblue,
 /area/survivalpod/nonpowered)
+"zp" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/pod/dark,
+/area/survivalpod/nonpowered)
 "zW" = (
 /obj/structure/sign/painting/library,
 /turf/closed/wall/mineral/titanium/survival/pod,
@@ -219,6 +224,12 @@
 /obj/structure/window/shuttle/survival_pod,
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
+"Ec" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/under/misc/bathrobe,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/festive/wooden/wooden1,
+/area/survivalpod/nonpowered)
 "EV" = (
 /obj/structure/table/plasmaglass,
 /obj/item/modular_computer/laptop/preset/civilian,
@@ -339,6 +350,9 @@
 "Xy" = (
 /obj/machinery/light,
 /obj/machinery/power/apc/auto_name/south,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "YH" = (
@@ -411,10 +425,10 @@ FZ
 rZ
 xC
 FZ
-pF
+Ec
 Cj
 pF
-uo
+FZ
 ko
 Cj
 mC
@@ -445,7 +459,7 @@ wI
 Cj
 Cj
 Cj
-Cj
+gC
 Cj
 Cj
 Cj
@@ -508,7 +522,7 @@ gG
 FZ
 Fo
 Lv
-Lv
+zp
 FZ
 "}
 (12,1,1) = {"

From f030d0038fdabdb847f0fe9b8fb8cff14c314385 Mon Sep 17 00:00:00 2001
From: shellspeed1 <omegashellspeed1@gmail.com>
Date: Sun, 21 Aug 2022 05:00:26 -0700
Subject: [PATCH 05/18] New garden pod

---
 _maps/templates/shelter_6.dmm                 | 492 ++++++++++++++++++
 code/modules/mining/equipment/survival_pod.dm |   8 +-
 code/modules/mining/machine_vending.dm        |   3 +-
 code/modules/mining/shelters.dm               |  11 +
 4 files changed, 511 insertions(+), 3 deletions(-)
 create mode 100644 _maps/templates/shelter_6.dmm

diff --git a/_maps/templates/shelter_6.dmm b/_maps/templates/shelter_6.dmm
new file mode 100644
index 0000000000..941535bb3b
--- /dev/null
+++ b/_maps/templates/shelter_6.dmm
@@ -0,0 +1,492 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"bn" = (
+/obj/machinery/vending/dinnerware,
+/turf/open/floor/plasteel/freezer,
+/area/survivalpod/nonpowered)
+"by" = (
+/obj/machinery/power/rtg/advanced/fullupgrade,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel/freezer,
+/area/survivalpod/nonpowered)
+"cp" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/sheet/mineral/coal/ten,
+/obj/item/stack/sheet/mineral/coal/ten,
+/turf/open/floor/mineral/titanium/white,
+/area/survivalpod/nonpowered)
+"cA" = (
+/obj/machinery/computer/arcade/orion_trail{
+	dir = 4
+	},
+/turf/open/floor/festive/wooden/wooden2,
+/area/survivalpod/nonpowered)
+"dV" = (
+/obj/machinery/processor,
+/turf/open/floor/mineral/titanium/white,
+/area/survivalpod/nonpowered)
+"ei" = (
+/obj/machinery/power/apc/auto_name/north,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plasteel/freezer,
+/area/survivalpod/nonpowered)
+"eP" = (
+/obj/structure/chair/brass{
+	dir = 4
+	},
+/turf/open/floor/festive/wooden/wooden2,
+/area/survivalpod/nonpowered)
+"hM" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/rack,
+/obj/item/kitchen/knife,
+/obj/item/kitchen/knife/scimitar,
+/obj/item/kitchen/knife/butcher,
+/turf/open/floor/mineral/titanium/white,
+/area/survivalpod/nonpowered)
+"iB" = (
+/obj/structure/table/plasmaglass,
+/obj/machinery/smartfridge/disks,
+/turf/open/floor/grass,
+/area/survivalpod/nonpowered)
+"iU" = (
+/obj/structure/table/reinforced,
+/obj/item/clothing/head/chefhat,
+/turf/open/floor/mineral/titanium/white,
+/area/survivalpod/nonpowered)
+"kX" = (
+/obj/machinery/icecream_vat,
+/turf/open/floor/plasteel/freezer,
+/area/survivalpod/nonpowered)
+"mv" = (
+/obj/structure/chair/comfy/black{
+	dir = 1
+	},
+/turf/open/floor/festive/wooden/wooden2,
+/area/survivalpod/nonpowered)
+"no" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/freezer,
+/area/survivalpod/nonpowered)
+"ru" = (
+/obj/structure/flora/ausbushes/ppflowers,
+/turf/open/floor/grass,
+/area/survivalpod/nonpowered)
+"tg" = (
+/obj/structure/closet/secure_closet/hydroponics,
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/grass,
+/area/survivalpod/nonpowered)
+"ue" = (
+/obj/machinery/hydroponics/constructable/automagic,
+/turf/open/floor/grass,
+/area/survivalpod/nonpowered)
+"uk" = (
+/obj/structure/table/plasmaglass,
+/obj/machinery/plantgenes,
+/turf/open/floor/grass,
+/area/survivalpod/nonpowered)
+"uC" = (
+/obj/machinery/vending/boozeomat,
+/turf/open/floor/pod/dark,
+/area/survivalpod/nonpowered)
+"vb" = (
+/turf/closed/wall/mineral/titanium/survival,
+/area/survivalpod/nonpowered)
+"wB" = (
+/obj/structure/chair/comfy/black{
+	dir = 8
+	},
+/turf/open/floor/festive/wooden/wooden2,
+/area/survivalpod/nonpowered)
+"AN" = (
+/turf/open/floor/plasteel/freezer,
+/area/survivalpod/nonpowered)
+"AO" = (
+/obj/structure/table/reinforced/brass,
+/obj/item/reagent_containers/food/snacks/soup/wingfangchu,
+/turf/open/floor/pod/dark,
+/area/survivalpod/nonpowered)
+"AW" = (
+/obj/machinery/grill,
+/turf/open/floor/mineral/titanium/white,
+/area/survivalpod/nonpowered)
+"Bk" = (
+/obj/structure/flora/ausbushes/lavendergrass,
+/turf/open/floor/grass,
+/area/survivalpod/nonpowered)
+"Ci" = (
+/obj/structure/closet/secure_closet/freezer/fridge,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/freezer,
+/area/survivalpod/nonpowered)
+"Cq" = (
+/turf/open/floor/glass/reinforced,
+/area/survivalpod/nonpowered)
+"CP" = (
+/obj/machinery/light,
+/turf/open/floor/pod/dark,
+/area/survivalpod/nonpowered)
+"Gc" = (
+/obj/structure/table/reinforced,
+/obj/machinery/microwave,
+/turf/open/floor/mineral/titanium/white,
+/area/survivalpod/nonpowered)
+"Gn" = (
+/obj/structure/window/shuttle/survival_pod,
+/obj/machinery/poweredfans,
+/turf/open/floor/pod/dark,
+/area/survivalpod/nonpowered)
+"Gt" = (
+/obj/structure/closet/secure_closet/freezer/fridge,
+/turf/open/floor/plasteel/freezer,
+/area/survivalpod/nonpowered)
+"HZ" = (
+/obj/structure/kitchenspike,
+/turf/open/floor/plasteel/freezer,
+/area/survivalpod/nonpowered)
+"JL" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel/freezer,
+/area/survivalpod/nonpowered)
+"JP" = (
+/obj/structure/flora/ausbushes/brflowers,
+/turf/open/floor/grass,
+/area/survivalpod/nonpowered)
+"Kp" = (
+/obj/machinery/vending/hydroseeds,
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/grass,
+/area/survivalpod/nonpowered)
+"KL" = (
+/obj/structure/table/reinforced,
+/turf/open/floor/mineral/titanium/white,
+/area/survivalpod/nonpowered)
+"LV" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/festive/wooden/wooden2,
+/area/survivalpod/nonpowered)
+"MX" = (
+/obj/machinery/computer/arcade/battle{
+	dir = 4
+	},
+/turf/open/floor/festive/wooden/wooden2,
+/area/survivalpod/nonpowered)
+"Nl" = (
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/festive/wooden/wooden2,
+/area/survivalpod/nonpowered)
+"Oi" = (
+/obj/structure/flora/ausbushes/ywflowers,
+/turf/open/floor/grass,
+/area/survivalpod/nonpowered)
+"Oq" = (
+/obj/machinery/hydroponics/constructable/automagic,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/grass,
+/area/survivalpod/nonpowered)
+"OV" = (
+/turf/open/floor/pod/dark,
+/area/survivalpod/nonpowered)
+"Qv" = (
+/obj/structure/table/reinforced,
+/obj/machinery/chem_dispenser/drinks/beer/fullupgrade,
+/turf/open/floor/mineral/titanium/white,
+/area/survivalpod/nonpowered)
+"QY" = (
+/obj/machinery/smartfridge/food,
+/turf/open/floor/pod/dark,
+/area/survivalpod/nonpowered)
+"Tl" = (
+/obj/machinery/door/airlock/survival_pod,
+/turf/open/floor/mineral/plastitanium,
+/area/survivalpod/nonpowered)
+"Tv" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/bag/tray/bluespace,
+/turf/open/floor/mineral/titanium/white,
+/area/survivalpod/nonpowered)
+"TA" = (
+/obj/structure/table/reinforced,
+/obj/machinery/chem_dispenser/drinks/fullupgrade,
+/turf/open/floor/mineral/titanium/white,
+/area/survivalpod/nonpowered)
+"Ue" = (
+/obj/machinery/door/airlock/survival_pod,
+/obj/machinery/poweredfans,
+/turf/open/floor/pod/dark,
+/area/survivalpod/nonpowered)
+"Uv" = (
+/obj/machinery/vending/hydronutrients,
+/turf/open/floor/grass,
+/area/survivalpod/nonpowered)
+"UK" = (
+/obj/structure/rack,
+/obj/item/storage/box/ingredients/wildcard,
+/obj/item/storage/box/ingredients/wildcard,
+/obj/item/storage/box/ingredients/wildcard,
+/obj/item/storage/box/ingredients/vegetarian,
+/obj/item/storage/box/ingredients/exotic,
+/obj/item/storage/box/ingredients/delights,
+/obj/item/storage/toolbox/electrical,
+/obj/item/clothing/gloves/color/yellow,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel/freezer,
+/area/survivalpod/nonpowered)
+"UW" = (
+/turf/open/floor/mineral/titanium/white,
+/area/survivalpod/nonpowered)
+"Vt" = (
+/obj/machinery/biogenerator,
+/turf/open/floor/pod/dark,
+/area/survivalpod/nonpowered)
+"VM" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/autolathe,
+/turf/open/floor/mineral/titanium/white,
+/area/survivalpod/nonpowered)
+"We" = (
+/obj/structure/table/reinforced/brass,
+/turf/open/floor/pod/dark,
+/area/survivalpod/nonpowered)
+"WU" = (
+/turf/open/floor/festive/wooden/wooden2,
+/area/survivalpod/nonpowered)
+"XT" = (
+/obj/item/book/manual/chef_recipes,
+/obj/item/book/manual/wiki/cooking_to_serve_man{
+	pixel_x = 4;
+	pixel_y = 3
+	},
+/obj/structure/table/reinforced,
+/turf/open/floor/mineral/titanium/white,
+/area/survivalpod/nonpowered)
+"Ys" = (
+/turf/open/floor/grass,
+/area/survivalpod/nonpowered)
+"ZU" = (
+/obj/structure/table/reinforced/brass,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/pod/dark,
+/area/survivalpod/nonpowered)
+
+(1,1,1) = {"
+vb
+Gn
+Gn
+Gn
+Gn
+vb
+Ue
+vb
+Gn
+Gn
+Gn
+Gn
+vb
+"}
+(2,1,1) = {"
+Gn
+Nl
+mv
+MX
+cA
+LV
+OV
+Oq
+ue
+ue
+ue
+ue
+Gn
+"}
+(3,1,1) = {"
+Gn
+wB
+Cq
+Cq
+Cq
+WU
+OV
+Ys
+Ys
+Ys
+Ys
+Bk
+Gn
+"}
+(4,1,1) = {"
+Gn
+WU
+Cq
+Cq
+Cq
+WU
+OV
+ru
+Ys
+JP
+Ys
+uk
+Gn
+"}
+(5,1,1) = {"
+Gn
+eP
+eP
+eP
+eP
+WU
+OV
+Ys
+Ys
+Ys
+Ys
+iB
+Gn
+"}
+(6,1,1) = {"
+vb
+ZU
+We
+We
+AO
+uC
+OV
+Bk
+ru
+Ys
+Oi
+Bk
+Gn
+"}
+(7,1,1) = {"
+Ue
+UW
+UW
+UW
+UW
+UW
+OV
+tg
+Ys
+Ys
+Uv
+Kp
+vb
+"}
+(8,1,1) = {"
+vb
+AW
+UW
+XT
+Tv
+UW
+CP
+vb
+QY
+Vt
+vb
+vb
+vb
+"}
+(9,1,1) = {"
+vb
+cp
+UW
+Gc
+KL
+UW
+OV
+Tl
+AN
+AN
+UK
+HZ
+vb
+"}
+(10,1,1) = {"
+vb
+hM
+UW
+KL
+KL
+UW
+OV
+vb
+kX
+AN
+AN
+HZ
+vb
+"}
+(11,1,1) = {"
+vb
+Qv
+UW
+UW
+UW
+UW
+OV
+vb
+ei
+no
+JL
+AN
+vb
+"}
+(12,1,1) = {"
+vb
+TA
+KL
+VM
+iU
+dV
+CP
+vb
+Ci
+Gt
+by
+bn
+vb
+"}
+(13,1,1) = {"
+vb
+vb
+vb
+vb
+vb
+vb
+Ue
+vb
+vb
+vb
+vb
+vb
+vb
+"}
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index ba4b02fcf4..d4c4b581d8 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -91,9 +91,13 @@
 	template_id = "shelter_delta"
 
 /obj/item/survivalcapsule/luxury/penthouse
-	name = "penthouse bluespace sheler capsule"
-	desc = "The absolute pinnacle of luxury in terms of survival capsules. While exuberantly expensive it has everything needed to make a small home in lavaland."
+	name = "penthouse bluespace shelter capsule"
+	desc = "The absolute pinnacle of luxury in terms of survival capsules. While exuberantly expensive it has everything needed to survive in luxury."
 	template_id = "shelter_epsilon"
+/obj/item/survivalcapsule/luxury/garden
+	name = "garden & kitchen bluespace shelter capsule"
+	desc = "Everything someone needs to make a home cooked meal while surviving the depths of hell... or space."
+	template_id = "shelter_Zeta"
 //Pod objects
 
 //Window
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index c7ddaebe2d..3d19a769a6 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -57,7 +57,8 @@
 		new /datum/data/mining_equipment("Luxury Shelter Capsule",		/obj/item/survivalcapsule/luxury,									3000),
 		new /datum/data/mining_equipment("Luxury Bar Capsule",			/obj/item/survivalcapsule/luxury/elitebar,							10000),
 		new /datum/data/mining_equipment("Empty Capsule",				/obj/item/survivalcapsule/luxury/empty,								5000),
-		new /datum/data/mining_equipment("Penthouse Capsule",			/obj/item/survivalcapsule/luxury/penthouse,							15000),
+		new /datum/data/mining_equipment("Penthouse Capsule",			/obj/item/survivalcapsule/luxury/penthouse,							7500),
+		new /datum/data/mining_equipment("garden & kitchen Capsule",	/obj/item/survivalcapsule/luxury/garden,							7500),
 		new /datum/data/mining_equipment("Nanotrasen Minebot",			/mob/living/simple_animal/hostile/mining_drone,						800),
 		new /datum/data/mining_equipment("Minebot Melee Upgrade",		/obj/item/mine_bot_upgrade,											400),
 		new /datum/data/mining_equipment("Minebot Armor Upgrade",		/obj/item/mine_bot_upgrade/health,									400),
diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm
index 83a8412ca8..2b1aa968da 100644
--- a/code/modules/mining/shelters.dm
+++ b/code/modules/mining/shelters.dm
@@ -96,3 +96,14 @@
 	. = ..()
 	whitelisted_turfs = typecacheof(/turf/closed/mineral)
 	banned_objects = typecacheof(/obj/structure/stone_tile)
+
+/datum/map_template/shelter/zeta
+	name = "Shelter Zeta"
+	shelter_id = "shelter_Zeta"
+	description = "A survival capsule with a garden and kitchen. Used wildly by space fast food joints everywhere."
+	mappath = "_maps/templates/shelter_6.dmm"
+
+/datum/map_template/shelter/zeta/New()
+	. = ..()
+	whitelisted_turfs = typecacheof(/turf/closed/mineral)
+	banned_objects = typecacheof(/obj/structure/stone_tile)

From 937393dfdbc7b9451d3edce60fd28dda7bdb984d Mon Sep 17 00:00:00 2001
From: shellspeed1 <omegashellspeed1@gmail.com>
Date: Sun, 21 Aug 2022 23:04:39 -0700
Subject: [PATCH 06/18] made bookshelves passable

---
 _maps/templates/shelter_5.dmm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/_maps/templates/shelter_5.dmm b/_maps/templates/shelter_5.dmm
index 2ddb58391a..bc39ed9dd8 100644
--- a/_maps/templates/shelter_5.dmm
+++ b/_maps/templates/shelter_5.dmm
@@ -22,7 +22,8 @@
 "fC" = (
 /obj/structure/bookcase/random{
 	pixel_y = 32;
-	pass_flags = 1
+	pass_flags = 1;
+	density = 0
 	},
 /turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
@@ -78,7 +79,8 @@
 "ko" = (
 /obj/machinery/vending/boozeomat{
 	pixel_y = 32;
-	pass_flags = 1
+	pass_flags = -1;
+	density = 0
 	},
 /turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
@@ -107,7 +109,9 @@
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "oo" = (
-/obj/structure/table/plasmaglass,
+/obj/structure/table/plasmaglass{
+	density = s
+	},
 /turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "pg" = (

From 4de90f71d8531d89e04e16594e8aa74ec3aa92fc Mon Sep 17 00:00:00 2001
From: shellspeed1 <omegashellspeed1@gmail.com>
Date: Sun, 21 Aug 2022 23:10:31 -0700
Subject: [PATCH 07/18] forgot to add this.

---
 _maps/templates/shelter_5.dmm | 2 +-
 _maps/templates/shelter_6.dmm | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/_maps/templates/shelter_5.dmm b/_maps/templates/shelter_5.dmm
index bc39ed9dd8..1853136bb6 100644
--- a/_maps/templates/shelter_5.dmm
+++ b/_maps/templates/shelter_5.dmm
@@ -79,7 +79,7 @@
 "ko" = (
 /obj/machinery/vending/boozeomat{
 	pixel_y = 32;
-	pass_flags = -1;
+	pass_flags = 1;
 	density = 0
 	},
 /turf/open/floor/festive/wooden/wooden1,
diff --git a/_maps/templates/shelter_6.dmm b/_maps/templates/shelter_6.dmm
index 941535bb3b..effb311748 100644
--- a/_maps/templates/shelter_6.dmm
+++ b/_maps/templates/shelter_6.dmm
@@ -39,6 +39,10 @@
 	},
 /turf/open/floor/festive/wooden/wooden2,
 /area/survivalpod/nonpowered)
+"hv" = (
+/obj/machinery/seed_extractor,
+/turf/open/floor/grass,
+/area/survivalpod/nonpowered)
 "hM" = (
 /obj/machinery/light{
 	dir = 1
@@ -365,7 +369,7 @@ WU
 OV
 Ys
 Ys
-Ys
+hv
 Ys
 iB
 Gn

From 98658fe14aa9e37105318becb96383df4bf9aea6 Mon Sep 17 00:00:00 2001
From: shellspeed1 <omegashellspeed1@gmail.com>
Date: Sun, 21 Aug 2022 23:18:02 -0700
Subject: [PATCH 08/18] a

---
 _maps/templates/shelter_5.dmm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/_maps/templates/shelter_5.dmm b/_maps/templates/shelter_5.dmm
index 1853136bb6..16f1fee861 100644
--- a/_maps/templates/shelter_5.dmm
+++ b/_maps/templates/shelter_5.dmm
@@ -22,7 +22,6 @@
 "fC" = (
 /obj/structure/bookcase/random{
 	pixel_y = 32;
-	pass_flags = 1;
 	density = 0
 	},
 /turf/open/floor/festive/wooden/wooden1,
@@ -78,9 +77,8 @@
 /area/survivalpod/nonpowered)
 "ko" = (
 /obj/machinery/vending/boozeomat{
-	pixel_y = 32;
-	pass_flags = 1;
-	density = 0
+	density = null;
+	pixel_y = 32
 	},
 /turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)

From 3afb008bd6132e51202c2ac0392df5f729976353 Mon Sep 17 00:00:00 2001
From: shellspeed1 <omegashellspeed1@gmail.com>
Date: Sun, 21 Aug 2022 23:19:38 -0700
Subject: [PATCH 09/18] fixes loose variable

---
 _maps/templates/shelter_5.dmm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_maps/templates/shelter_5.dmm b/_maps/templates/shelter_5.dmm
index 16f1fee861..fe0660fe24 100644
--- a/_maps/templates/shelter_5.dmm
+++ b/_maps/templates/shelter_5.dmm
@@ -108,7 +108,7 @@
 /area/survivalpod/nonpowered)
 "oo" = (
 /obj/structure/table/plasmaglass{
-	density = s
+	density = 1
 	},
 /turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)

From 3888cf602ee1ca20a84faf62c7809f800d80b417 Mon Sep 17 00:00:00 2001
From: shellspeed1 <omegashellspeed1@gmail.com>
Date: Wed, 24 Aug 2022 15:12:27 -0700
Subject: [PATCH 10/18] removed duplicate stack of coal from garden pod

---
 _maps/templates/shelter_6.dmm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/_maps/templates/shelter_6.dmm b/_maps/templates/shelter_6.dmm
index effb311748..569c0e0957 100644
--- a/_maps/templates/shelter_6.dmm
+++ b/_maps/templates/shelter_6.dmm
@@ -13,7 +13,6 @@
 "cp" = (
 /obj/structure/table/reinforced,
 /obj/item/stack/sheet/mineral/coal/ten,
-/obj/item/stack/sheet/mineral/coal/ten,
 /turf/open/floor/mineral/titanium/white,
 /area/survivalpod/nonpowered)
 "cA" = (

From 2f82dfed9d58c9d2d4fc4dc9f91efe902712ae87 Mon Sep 17 00:00:00 2001
From: shellspeed1 <omegashellspeed1@gmail.com>
Date: Wed, 24 Aug 2022 15:13:01 -0700
Subject: [PATCH 11/18] fixes missing windoor

---
 _maps/templates/shelter_5.dmm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_maps/templates/shelter_5.dmm b/_maps/templates/shelter_5.dmm
index fe0660fe24..b2d2d40d41 100644
--- a/_maps/templates/shelter_5.dmm
+++ b/_maps/templates/shelter_5.dmm
@@ -55,10 +55,10 @@
 /area/survivalpod/nonpowered)
 "iu" = (
 /obj/structure/curtain,
-/obj/structure/window/reinforced/survival_pod{
+/obj/structure/window/plasma/reinforced/spawner/north,
+/obj/machinery/door/window/survival_pod{
 	dir = 4
 	},
-/obj/structure/window/plasma/reinforced/spawner/north,
 /turf/open/floor/noslip,
 /area/survivalpod/nonpowered)
 "iD" = (

From d175b4d247fd990c406464ac8490fea1f80a6c8d Mon Sep 17 00:00:00 2001
From: shellspeed1 <omegashellspeed1@gmail.com>
Date: Wed, 24 Aug 2022 15:13:19 -0700
Subject: [PATCH 12/18] capitalization stuff

---
 code/modules/mining/equipment/survival_pod.dm | 2 +-
 code/modules/mining/machine_vending.dm        | 2 +-
 code/modules/mining/shelters.dm               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index d4c4b581d8..17dc2969dd 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -97,7 +97,7 @@
 /obj/item/survivalcapsule/luxury/garden
 	name = "garden & kitchen bluespace shelter capsule"
 	desc = "Everything someone needs to make a home cooked meal while surviving the depths of hell... or space."
-	template_id = "shelter_Zeta"
+	template_id = "shelter_zeta"
 //Pod objects
 
 //Window
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index 3d19a769a6..25feb62d33 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -58,7 +58,7 @@
 		new /datum/data/mining_equipment("Luxury Bar Capsule",			/obj/item/survivalcapsule/luxury/elitebar,							10000),
 		new /datum/data/mining_equipment("Empty Capsule",				/obj/item/survivalcapsule/luxury/empty,								5000),
 		new /datum/data/mining_equipment("Penthouse Capsule",			/obj/item/survivalcapsule/luxury/penthouse,							7500),
-		new /datum/data/mining_equipment("garden & kitchen Capsule",	/obj/item/survivalcapsule/luxury/garden,							7500),
+		new /datum/data/mining_equipment("Garden & Kitchen Capsule",	/obj/item/survivalcapsule/luxury/garden,							7500),
 		new /datum/data/mining_equipment("Nanotrasen Minebot",			/mob/living/simple_animal/hostile/mining_drone,						800),
 		new /datum/data/mining_equipment("Minebot Melee Upgrade",		/obj/item/mine_bot_upgrade,											400),
 		new /datum/data/mining_equipment("Minebot Armor Upgrade",		/obj/item/mine_bot_upgrade/health,									400),
diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm
index 2b1aa968da..ce8499fd96 100644
--- a/code/modules/mining/shelters.dm
+++ b/code/modules/mining/shelters.dm
@@ -98,8 +98,8 @@
 	banned_objects = typecacheof(/obj/structure/stone_tile)
 
 /datum/map_template/shelter/zeta
-	name = "Shelter Zeta"
-	shelter_id = "shelter_Zeta"
+	name = "Shelter zeta"
+	shelter_id = "shelter_zeta"
 	description = "A survival capsule with a garden and kitchen. Used wildly by space fast food joints everywhere."
 	mappath = "_maps/templates/shelter_6.dmm"
 

From 2e6ff742a987079f184cbe8af42bd35519ed226f Mon Sep 17 00:00:00 2001
From: shellspeed1 <omegashellspeed1@gmail.com>
Date: Wed, 24 Aug 2022 15:15:36 -0700
Subject: [PATCH 13/18] minor change to map template description.

---
 code/modules/mining/shelters.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm
index ce8499fd96..3da0c0a2c7 100644
--- a/code/modules/mining/shelters.dm
+++ b/code/modules/mining/shelters.dm
@@ -100,7 +100,7 @@
 /datum/map_template/shelter/zeta
 	name = "Shelter zeta"
 	shelter_id = "shelter_zeta"
-	description = "A survival capsule with a garden and kitchen. Used wildly by space fast food joints everywhere."
+	description = "A survival capsule with a garden and kitchen. Commonly used by space fast food joints everywhere."
 	mappath = "_maps/templates/shelter_6.dmm"
 
 /datum/map_template/shelter/zeta/New()

From e628f17e7a64001206e088fc1c2536493d176be9 Mon Sep 17 00:00:00 2001
From: shellspeed1 <omegashellspeed1@gmail.com>
Date: Wed, 24 Aug 2022 15:28:51 -0700
Subject: [PATCH 14/18] minor tweak to penthouse bathroom mirror

---
 _maps/templates/shelter_5.dmm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/_maps/templates/shelter_5.dmm b/_maps/templates/shelter_5.dmm
index b2d2d40d41..bfcc177d9c 100644
--- a/_maps/templates/shelter_5.dmm
+++ b/_maps/templates/shelter_5.dmm
@@ -123,14 +123,13 @@
 /area/survivalpod/nonpowered)
 "qE" = (
 /obj/structure/sink{
-	pixel_y = 18
+	pixel_y = 24
+	},
+/obj/structure/mirror{
+	pixel_y = 34
 	},
 /turf/open/floor/mineral/silver,
 /area/survivalpod/nonpowered)
-"rL" = (
-/obj/structure/mirror,
-/turf/closed/wall/mineral/titanium/survival/pod,
-/area/survivalpod/nonpowered)
 "rM" = (
 /obj/structure/chair/sofa/corp/corner{
 	dir = 8
@@ -408,7 +407,7 @@ lW
 Qr
 "}
 (4,1,1) = {"
-rL
+FZ
 qE
 JL
 fN

From bbffaa61df36917e576fbae304f50e8e283fc254 Mon Sep 17 00:00:00 2001
From: shellspeed1 <omegashellspeed1@gmail.com>
Date: Wed, 24 Aug 2022 15:49:05 -0700
Subject: [PATCH 15/18] removed access restriction on hydroponics locker

---
 _maps/templates/shelter_6.dmm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/_maps/templates/shelter_6.dmm b/_maps/templates/shelter_6.dmm
index 569c0e0957..0f6aaf4c1d 100644
--- a/_maps/templates/shelter_6.dmm
+++ b/_maps/templates/shelter_6.dmm
@@ -83,7 +83,9 @@
 /turf/open/floor/grass,
 /area/survivalpod/nonpowered)
 "tg" = (
-/obj/structure/closet/secure_closet/hydroponics,
+/obj/structure/closet/secure_closet/hydroponics{
+	req_access = null
+	},
 /obj/machinery/light{
 	dir = 4
 	},

From cade664a0c0cadd12e3486d5b0f1ddd3e7bff3bc Mon Sep 17 00:00:00 2001
From: shellspeed1 <omegashellspeed1@gmail.com>
Date: Wed, 24 Aug 2022 16:08:41 -0700
Subject: [PATCH 16/18] removed insulated gloves and electric toolbox as they
 are no longer needed

---
 _maps/templates/shelter_5.dmm | 10 +---------
 _maps/templates/shelter_6.dmm | 32 ++++++++++++++++++++++----------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/_maps/templates/shelter_5.dmm b/_maps/templates/shelter_5.dmm
index bfcc177d9c..72a0eccfb4 100644
--- a/_maps/templates/shelter_5.dmm
+++ b/_maps/templates/shelter_5.dmm
@@ -146,14 +146,6 @@
 	},
 /turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
-"sN" = (
-/obj/structure/rack,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/storage/toolbox/electrical,
-/obj/item/pickaxe,
-/obj/item/shovel,
-/turf/open/floor/pod/dark,
-/area/survivalpod/nonpowered)
 "td" = (
 /obj/machinery/light{
 	dir = 4
@@ -537,7 +529,7 @@ Cj
 td
 FZ
 iD
-sN
+Lv
 mN
 FZ
 "}
diff --git a/_maps/templates/shelter_6.dmm b/_maps/templates/shelter_6.dmm
index 0f6aaf4c1d..864b8aafad 100644
--- a/_maps/templates/shelter_6.dmm
+++ b/_maps/templates/shelter_6.dmm
@@ -16,10 +16,9 @@
 /turf/open/floor/mineral/titanium/white,
 /area/survivalpod/nonpowered)
 "cA" = (
-/obj/machinery/computer/arcade/orion_trail{
-	dir = 4
-	},
-/turf/open/floor/festive/wooden/wooden2,
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/item/reagent_containers/glass/bucket,
+/turf/open/floor/grass,
 /area/survivalpod/nonpowered)
 "dV" = (
 /obj/machinery/processor,
@@ -60,6 +59,7 @@
 "iU" = (
 /obj/structure/table/reinforced,
 /obj/item/clothing/head/chefhat,
+/obj/machinery/reagentgrinder,
 /turf/open/floor/mineral/titanium/white,
 /area/survivalpod/nonpowered)
 "kX" = (
@@ -113,6 +113,11 @@
 	},
 /turf/open/floor/festive/wooden/wooden2,
 /area/survivalpod/nonpowered)
+"zq" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/box/beakers/bluespace,
+/turf/open/floor/mineral/titanium/white,
+/area/survivalpod/nonpowered)
 "AN" = (
 /turf/open/floor/plasteel/freezer,
 /area/survivalpod/nonpowered)
@@ -155,6 +160,7 @@
 /area/survivalpod/nonpowered)
 "Gt" = (
 /obj/structure/closet/secure_closet/freezer/fridge,
+/obj/machinery/airalarm/directional/east,
 /turf/open/floor/plasteel/freezer,
 /area/survivalpod/nonpowered)
 "HZ" = (
@@ -186,8 +192,16 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/machinery/computer/arcade/orion_trail{
+	dir = 4
+	},
 /turf/open/floor/festive/wooden/wooden2,
 /area/survivalpod/nonpowered)
+"Ma" = (
+/obj/structure/table/reinforced,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/mineral/titanium/white,
+/area/survivalpod/nonpowered)
 "MX" = (
 /obj/machinery/computer/arcade/battle{
 	dir = 4
@@ -252,8 +266,6 @@
 /obj/item/storage/box/ingredients/vegetarian,
 /obj/item/storage/box/ingredients/exotic,
 /obj/item/storage/box/ingredients/delights,
-/obj/item/storage/toolbox/electrical,
-/obj/item/clothing/gloves/color/yellow,
 /obj/machinery/light{
 	dir = 8
 	},
@@ -319,8 +331,8 @@ vb
 Gn
 Nl
 mv
+WU
 MX
-cA
 LV
 OV
 Oq
@@ -342,7 +354,7 @@ Ys
 Ys
 Ys
 Ys
-Bk
+cA
 Gn
 "}
 (4,1,1) = {"
@@ -425,7 +437,7 @@ vb
 cp
 UW
 Gc
-KL
+zq
 UW
 OV
 Tl
@@ -468,7 +480,7 @@ vb
 (12,1,1) = {"
 vb
 TA
-KL
+Ma
 VM
 iU
 dV

From aa107bdce1e5b4ff29fb51320bfe27e80b53fd12 Mon Sep 17 00:00:00 2001
From: shellspeed1 <omegashellspeed1@gmail.com>
Date: Wed, 24 Aug 2022 22:32:17 -0700
Subject: [PATCH 17/18] tweaks based on testing and feedback.

---
 _maps/templates/shelter_5.dmm | 150 ++++++++++++++++++++++++++--------
 _maps/templates/shelter_6.dmm | 120 +++++++++++++++++++++------
 2 files changed, 211 insertions(+), 59 deletions(-)

diff --git a/_maps/templates/shelter_5.dmm b/_maps/templates/shelter_5.dmm
index 72a0eccfb4..1826682834 100644
--- a/_maps/templates/shelter_5.dmm
+++ b/_maps/templates/shelter_5.dmm
@@ -1,15 +1,24 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"bG" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/festive/wooden/wooden1,
+/area/survivalpod/nonpowered)
 "cc" = (
-/obj/machinery/vending/games,
+/obj/machinery/vending/games{
+	pixel_y = 29;
+	density = 0
+	},
 /turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "dH" = (
 /obj/machinery/chem_dispenser/drinks/beer{
-	pixel_y = 8
-	},
-/obj/structure/table/plasmaglass,
-/obj/machinery/light{
-	dir = 1
+	pixel_y = 30;
+	density = 0
 	},
 /turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
@@ -35,11 +44,19 @@
 /turf/open/floor/noslip,
 /area/survivalpod/nonpowered)
 "gr" = (
-/obj/machinery/vending/wallmed,
-/turf/closed/wall/mineral/titanium/survival/pod,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/power/rtg/advanced/fullupgrade,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "gC" = (
-/obj/machinery/airalarm/directional/east,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
 "gG" = (
@@ -51,14 +68,19 @@
 "hr" = (
 /obj/machinery/door/airlock/survival_pod/glass,
 /obj/machinery/poweredfans,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "iu" = (
 /obj/structure/curtain,
-/obj/structure/window/plasma/reinforced/spawner/north,
 /obj/machinery/door/window/survival_pod{
 	dir = 4
 	},
+/obj/structure/window/reinforced/tinted{
+	dir = 1
+	},
 /turf/open/floor/noslip,
 /area/survivalpod/nonpowered)
 "iD" = (
@@ -75,9 +97,18 @@
 /obj/item/toy/plush/mothplushie,
 /turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
+"jA" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/festive/wooden/wooden1,
+/area/survivalpod/nonpowered)
 "ko" = (
 /obj/machinery/vending/boozeomat{
-	density = null;
+	density = 0;
 	pixel_y = 32
 	},
 /turf/open/floor/festive/wooden/wooden1,
@@ -85,6 +116,9 @@
 "lO" = (
 /obj/machinery/poweredfans,
 /obj/machinery/door/airlock/survival_pod/glass,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "lW" = (
@@ -166,6 +200,9 @@
 /area/survivalpod/nonpowered)
 "vU" = (
 /obj/machinery/sleeper/survival_pod,
+/obj/machinery/vending/wallmed{
+	pixel_x = -26
+	},
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "wv" = (
@@ -202,10 +239,7 @@
 /area/survivalpod/nonpowered)
 "BI" = (
 /obj/machinery/chem_dispenser/drinks{
-	pixel_y = 8
-	},
-/obj/structure/table/plasmaglass{
-	CanAtmosPass = -1
+	pixel_y = 30
 	},
 /turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
@@ -242,9 +276,25 @@
 /obj/machinery/light,
 /turf/open/floor/noslip,
 /area/survivalpod/nonpowered)
+"FT" = (
+/obj/machinery/airalarm/directional/east,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/festive/wooden/wooden1,
+/area/survivalpod/nonpowered)
 "FZ" = (
 /turf/closed/wall/mineral/titanium/survival/pod,
 /area/survivalpod/nonpowered)
+"Gd" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/festive/wooden/wooden1,
+/area/survivalpod/nonpowered)
 "JE" = (
 /obj/structure/table/wood/fancy/royalblack,
 /obj/item/reagent_containers/food/drinks/drinkingglass,
@@ -285,15 +335,23 @@
 /obj/item/stack/sheet/mineral/wood/fifty,
 /turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
+"RD" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/festive/wooden/wooden1,
+/area/survivalpod/nonpowered)
 "RH" = (
 /obj/machinery/shower{
 	pixel_y = 18
 	},
-/obj/structure/window/plasma/reinforced/spawner/east,
+/obj/structure/window/reinforced/tinted{
+	dir = 4
+	},
 /turf/open/floor/noslip,
 /area/survivalpod/nonpowered)
 "Tc" = (
-/obj/structure/toilet/secret/high_loot{
+/obj/structure/toilet{
 	dir = 4
 	},
 /turf/open/floor/mineral/silver,
@@ -320,6 +378,12 @@
 /obj/item/pen/fountain,
 /turf/open/floor/festive/wooden/wooden1,
 /area/survivalpod/nonpowered)
+"VJ" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/carpet/royalblue,
+/area/survivalpod/nonpowered)
 "Wk" = (
 /obj/machinery/light{
 	dir = 1
@@ -338,6 +402,9 @@
 /area/survivalpod/nonpowered)
 "Xr" = (
 /obj/machinery/door/airlock/survival_pod,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "Xy" = (
@@ -346,8 +413,19 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
+"YC" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/machinery/telecomms/relay/preset/station,
+/obj/item/multitool,
+/turf/open/floor/festive/wooden/wooden1,
+/area/survivalpod/nonpowered)
 "YH" = (
 /obj/machinery/mineral/equipment_vendor,
 /turf/open/floor/pod/dark,
@@ -445,17 +523,17 @@ FZ
 "}
 (7,1,1) = {"
 lO
-Cj
-Cj
-Cj
-wI
-Cj
-Cj
-Cj
 gC
-Cj
-Cj
-Cj
+gC
+gC
+bG
+gC
+Gd
+gC
+gC
+FT
+gC
+jA
 lO
 "}
 (8,1,1) = {"
@@ -464,8 +542,8 @@ FZ
 FZ
 FZ
 FZ
-Wk
-Cj
+YC
+RD
 Cj
 FZ
 FZ
@@ -480,12 +558,12 @@ sD
 Cj
 Ws
 Cj
-Cj
+RD
 Ro
 FZ
 TQ
 vU
-Lv
+zp
 FZ
 "}
 (10,1,1) = {"
@@ -495,9 +573,9 @@ Vp
 Vp
 wv
 Vp
-Vp
+VJ
 EV
-gr
+FZ
 YH
 fM
 Xy
@@ -510,12 +588,12 @@ Vp
 Vp
 fp
 Vp
-Vp
+VJ
 gG
 FZ
 Fo
 Lv
-zp
+gr
 FZ
 "}
 (12,1,1) = {"
@@ -525,7 +603,7 @@ wI
 Ng
 Vv
 oo
-Cj
+RD
 td
 FZ
 iD
diff --git a/_maps/templates/shelter_6.dmm b/_maps/templates/shelter_6.dmm
index 864b8aafad..63c6c5d4de 100644
--- a/_maps/templates/shelter_6.dmm
+++ b/_maps/templates/shelter_6.dmm
@@ -1,7 +1,9 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "bn" = (
-/obj/machinery/vending/dinnerware,
-/turf/open/floor/plasteel/freezer,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/mineral/titanium/white,
 /area/survivalpod/nonpowered)
 "by" = (
 /obj/machinery/power/rtg/advanced/fullupgrade,
@@ -11,8 +13,7 @@
 /turf/open/floor/plasteel/freezer,
 /area/survivalpod/nonpowered)
 "cp" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/sheet/mineral/coal/ten,
+/obj/machinery/vending/dinnerware,
 /turf/open/floor/mineral/titanium/white,
 /area/survivalpod/nonpowered)
 "cA" = (
@@ -32,11 +33,34 @@
 /turf/open/floor/plasteel/freezer,
 /area/survivalpod/nonpowered)
 "eP" = (
-/obj/structure/chair/brass{
+/obj/structure/chair/bronze{
 	dir = 4
 	},
 /turf/open/floor/festive/wooden/wooden2,
 /area/survivalpod/nonpowered)
+"eS" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/pod/dark,
+/area/survivalpod/nonpowered)
+"fM" = (
+/obj/structure/cable{
+	icon_state = "4-9"
+	},
+/turf/open/floor/plasteel/freezer,
+/area/survivalpod/nonpowered)
+"gO" = (
+/obj/machinery/door/airlock/survival_pod,
+/obj/machinery/poweredfans,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/pod/dark,
+/area/survivalpod/nonpowered)
 "hv" = (
 /obj/machinery/seed_extractor,
 /turf/open/floor/grass,
@@ -47,8 +71,9 @@
 	},
 /obj/structure/rack,
 /obj/item/kitchen/knife,
-/obj/item/kitchen/knife/scimitar,
 /obj/item/kitchen/knife/butcher,
+/obj/item/kitchen/rollingpin,
+/obj/item/stack/sheet/mineral/coal/ten,
 /turf/open/floor/mineral/titanium/white,
 /area/survivalpod/nonpowered)
 "iB" = (
@@ -73,6 +98,18 @@
 /turf/open/floor/festive/wooden/wooden2,
 /area/survivalpod/nonpowered)
 "no" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel/freezer,
+/area/survivalpod/nonpowered)
+"oW" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -122,8 +159,8 @@
 /turf/open/floor/plasteel/freezer,
 /area/survivalpod/nonpowered)
 "AO" = (
-/obj/structure/table/reinforced/brass,
 /obj/item/reagent_containers/food/snacks/soup/wingfangchu,
+/obj/structure/table/bronze,
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "AW" = (
@@ -146,8 +183,25 @@
 /area/survivalpod/nonpowered)
 "CP" = (
 /obj/machinery/light,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
+"DU" = (
+/obj/machinery/door/airlock/survival_pod,
+/obj/machinery/poweredfans,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/pod/dark,
+/area/survivalpod/nonpowered)
+"ET" = (
+/obj/structure/cable{
+	icon_state = "1-6"
+	},
+/turf/open/floor/plasteel/freezer,
+/area/survivalpod/nonpowered)
 "Gc" = (
 /obj/structure/table/reinforced,
 /obj/machinery/microwave,
@@ -224,6 +278,18 @@
 /turf/open/floor/grass,
 /area/survivalpod/nonpowered)
 "OV" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/pod/dark,
+/area/survivalpod/nonpowered)
+"Pi" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "Qv" = (
@@ -235,8 +301,16 @@
 /obj/machinery/smartfridge/food,
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
+"Ss" = (
+/obj/machinery/telecomms/relay/preset/station,
+/obj/item/multitool,
+/turf/open/floor/festive/wooden/wooden2,
+/area/survivalpod/nonpowered)
 "Tl" = (
 /obj/machinery/door/airlock/survival_pod,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/survivalpod/nonpowered)
 "Tv" = (
@@ -286,7 +360,7 @@
 /turf/open/floor/mineral/titanium/white,
 /area/survivalpod/nonpowered)
 "We" = (
-/obj/structure/table/reinforced/brass,
+/obj/structure/table/bronze,
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 "WU" = (
@@ -305,10 +379,10 @@
 /turf/open/floor/grass,
 /area/survivalpod/nonpowered)
 "ZU" = (
-/obj/structure/table/reinforced/brass,
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/structure/table/bronze,
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
 
@@ -331,7 +405,7 @@ vb
 Gn
 Nl
 mv
-WU
+Ss
 MX
 LV
 OV
@@ -403,13 +477,13 @@ Bk
 Gn
 "}
 (7,1,1) = {"
-Ue
-UW
-UW
-UW
-UW
-UW
-OV
+gO
+bn
+bn
+bn
+bn
+bn
+Pi
 tg
 Ys
 Ys
@@ -439,9 +513,9 @@ UW
 Gc
 zq
 UW
-OV
+eS
 Tl
-AN
+ET
 AN
 UK
 HZ
@@ -457,7 +531,7 @@ UW
 OV
 vb
 kX
-AN
+fM
 AN
 HZ
 vb
@@ -473,8 +547,8 @@ OV
 vb
 ei
 no
+oW
 JL
-AN
 vb
 "}
 (12,1,1) = {"
@@ -489,7 +563,7 @@ vb
 Ci
 Gt
 by
-bn
+by
 vb
 "}
 (13,1,1) = {"
@@ -499,7 +573,7 @@ vb
 vb
 vb
 vb
-Ue
+DU
 vb
 vb
 vb

From 288320029ad9ef33080e7e9f1a19018883986770 Mon Sep 17 00:00:00 2001
From: shellspeed1 <omegashellspeed1@gmail.com>
Date: Thu, 25 Aug 2022 22:30:36 -0700
Subject: [PATCH 18/18] adds a sink to the kitchen

---
 _maps/templates/shelter_6.dmm | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/_maps/templates/shelter_6.dmm b/_maps/templates/shelter_6.dmm
index 63c6c5d4de..4297652286 100644
--- a/_maps/templates/shelter_6.dmm
+++ b/_maps/templates/shelter_6.dmm
@@ -93,7 +93,7 @@
 /area/survivalpod/nonpowered)
 "mv" = (
 /obj/structure/chair/comfy/black{
-	dir = 1
+	dir = 4
 	},
 /turf/open/floor/festive/wooden/wooden2,
 /area/survivalpod/nonpowered)
@@ -165,6 +165,9 @@
 /area/survivalpod/nonpowered)
 "AW" = (
 /obj/machinery/grill,
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/open/floor/mineral/titanium/white,
 /area/survivalpod/nonpowered)
 "Bk" = (
@@ -292,6 +295,16 @@
 	},
 /turf/open/floor/pod/dark,
 /area/survivalpod/nonpowered)
+"Pw" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/sink/kitchen{
+	dir = 4;
+	pixel_x = -11
+	},
+/turf/open/floor/mineral/titanium/white,
+/area/survivalpod/nonpowered)
 "Qv" = (
 /obj/structure/table/reinforced,
 /obj/machinery/chem_dispenser/drinks/beer/fullupgrade,
@@ -380,10 +393,9 @@
 /area/survivalpod/nonpowered)
 "ZU" = (
 /obj/machinery/light{
-	dir = 1
+	dir = 4
 	},
-/obj/structure/table/bronze,
-/turf/open/floor/pod/dark,
+/turf/open/floor/festive/wooden/wooden2,
 /area/survivalpod/nonpowered)
 
 (1,1,1) = {"
@@ -403,8 +415,8 @@ vb
 "}
 (2,1,1) = {"
 Gn
-Nl
 mv
+WU
 Ss
 MX
 LV
@@ -418,7 +430,7 @@ Gn
 "}
 (3,1,1) = {"
 Gn
-wB
+Nl
 Cq
 Cq
 Cq
@@ -433,7 +445,7 @@ Gn
 "}
 (4,1,1) = {"
 Gn
-WU
+wB
 Cq
 Cq
 Cq
@@ -448,7 +460,7 @@ Gn
 "}
 (5,1,1) = {"
 Gn
-eP
+ZU
 eP
 eP
 eP
@@ -463,7 +475,7 @@ Gn
 "}
 (6,1,1) = {"
 vb
-ZU
+vb
 We
 We
 AO
@@ -478,7 +490,7 @@ Gn
 "}
 (7,1,1) = {"
 gO
-bn
+Pw
 bn
 bn
 bn