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