diff --git a/_maps/map_files/coyote_bayou/Newboston-Upper.dmm b/_maps/map_files/coyote_bayou/Newboston-Upper.dmm
index df7eea8a07..e2e9500e23 100644
--- a/_maps/map_files/coyote_bayou/Newboston-Upper.dmm
+++ b/_maps/map_files/coyote_bayou/Newboston-Upper.dmm
@@ -170,6 +170,19 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/f13/wood,
 /area/f13/building)
+"aA" = (
+/obj/structure/flora/ausbushes/fullgrass{
+	plane = -3
+	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2;
+	opacity = 1
+	},
+/turf/open/indestructible/ground/outside/civ/grass0{
+	color = "#555555"
+	},
+/area/f13/wasteland/city/newboston/outdoors)
 "aB" = (
 /obj/structure/chair/sofa{
 	color = "#334E23";
@@ -390,20 +403,13 @@
 /turf/open/water,
 /area/f13/building/tribal)
 "bf" = (
-/obj/structure/railing,
-/obj/structure/railing{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/wood{
-	color = "#4F3528";
-	plane = -4
+/obj/structure/destructible/tribal_torch/wall/lit{
+	dir = 8
 	},
-/obj/effect/turf_decal/siding/wood{
-	color = "#4F3528";
-	dir = 1
+/turf/open/indestructible/ground/outside/civ/grass0{
+	color = "#555555"
 	},
-/turf/open/floor/wood_wide/wood_wide_dark,
-/area/f13/wasteland)
+/area/f13/wasteland/city/newboston/outdoors)
 "bg" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -607,12 +613,9 @@
 /area/f13/building)
 "bD" = (
 /obj/structure/spacevine,
-/obj/structure/flora/ausbushes/fullgrass{
-	plane = -3
-	},
-/obj/structure/flora/tree/oak_five{
-	plane = -1;
-	density = 0;
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2;
 	opacity = 1
 	},
 /turf/open/indestructible/ground/outside/civ/grass0{
@@ -779,6 +782,17 @@
 /obj/structure/barricade/wooden/planks/pregame,
 /turf/closed/wall/f13/wood,
 /area/f13/building)
+"cc" = (
+/obj/structure/chair/folding{
+	dir = 8
+	},
+/obj/structure/destructible/tribal_torch/wall/lit{
+	dir = 4;
+	pixel_y = 10;
+	pixel_x = 7
+	},
+/turf/open/floor/wood_wide/wood_wide_dark,
+/area/f13/wasteland/city/newboston/outdoors)
 "cd" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1016,7 +1030,7 @@
 	pixel_y = -1
 	},
 /turf/open/transparent/openspace,
-/area/f13/wasteland)
+/area/f13/wasteland/city/newboston/outdoors)
 "cw" = (
 /turf/closed/wall/f13/coyote/oldwood,
 /area/f13/wasteland/city/newboston/house/cabin_five)
@@ -1402,12 +1416,22 @@
 /turf/open/indestructible,
 /area/f13/tcoms)
 "dt" = (
-/obj/structure/railing{
-	color = "#A47449";
-	dir = 4
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
 	},
-/turf/open/transparent/openspace,
-/area/f13/wasteland)
+/obj/structure/flora/ausbushes/ppflowers{
+	plane = -2
+	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2;
+	opacity = 1
+	},
+/turf/open/indestructible/ground/outside/civ/grass0{
+	color = "#555555"
+	},
+/area/f13/wasteland/city/newboston/outdoors)
 "dv" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1466,6 +1490,16 @@
 "dA" = (
 /turf/closed/wall/f13/tentwall,
 /area/f13/wasteland)
+"dB" = (
+/obj/effect/turf_decal/siding/wood{
+	color = "#4F3528";
+	plane = -4
+	},
+/obj/structure/destructible/tribal_torch/wall/lit{
+	dir = 8
+	},
+/turf/open/floor/wood_wide/wood_wide_dark,
+/area/f13/wasteland/city/newboston/outdoors)
 "dC" = (
 /obj/structure/table,
 /obj/item/folder/red,
@@ -1863,6 +1897,14 @@
 	footstep = "grass"
 	},
 /area/f13/tribe)
+"eq" = (
+/obj/structure/destructible/tribal_torch/wall/lit{
+	dir = 4;
+	pixel_y = 10;
+	pixel_x = 7
+	},
+/turf/open/floor/wood_wide/wood_wide_dark,
+/area/f13/wasteland/city/newboston/outdoors)
 "er" = (
 /obj/structure/table/wood/fancy,
 /turf/open/floor/f13{
@@ -2158,10 +2200,6 @@
 	},
 /area/f13/wasteland/city/newboston/outdoors)
 "fb" = (
-/obj/structure/flora/chomp/bush2{
-	color = "#434343";
-	plane = -2
-	},
 /obj/structure/flora/chomp/bush2{
 	color = "#434343";
 	plane = -2
@@ -2170,6 +2208,11 @@
 	plane = -2
 	},
 /obj/structure/spacevine,
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2;
+	opacity = 1
+	},
 /turf/open/indestructible/ground/outside/civ/grass0{
 	color = "#555555"
 	},
@@ -2763,6 +2806,17 @@
 "gj" = (
 /turf/open/floor/wood_wide/wood_wide_dark,
 /area/f13/caves)
+"gk" = (
+/obj/structure/chair/folding{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood{
+	color = "#4F3528";
+	dir = 8;
+	plane = -4
+	},
+/turf/open/floor/wood_wide/wood_wide_dark,
+/area/f13/wasteland/city/newboston/outdoors)
 "gl" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
@@ -2998,7 +3052,7 @@
 	anchored = 1
 	},
 /turf/open/transparent/openspace,
-/area/f13/wasteland)
+/area/f13/wasteland/city/newboston/outdoors)
 "gS" = (
 /obj/structure/closet/cabinet{
 	anchored = 1;
@@ -3497,14 +3551,15 @@
 	color = "#434343";
 	plane = -2
 	},
-/obj/structure/flora/chomp/bush2{
-	color = "#434343";
-	plane = -2
-	},
 /obj/structure/flora/ausbushes/ywflowers{
 	plane = -2;
 	pixel_y = 15
 	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2;
+	opacity = 1
+	},
 /turf/open/indestructible/ground/outside/civ/grass0{
 	color = "#555555"
 	},
@@ -3714,16 +3769,11 @@
 /turf/open/floor/f13,
 /area/f13/brotherhood)
 "iv" = (
-/obj/machinery/light/small{
-	dir = 8;
-	pixel_x = -6;
-	pixel_y = 4
-	},
-/obj/effect/turf_decal/siding/wood{
-	color = "#4F3528";
-	dir = 4
+/obj/structure/railing{
+	color = "#A47449";
+	dir = 8
 	},
-/turf/open/floor/wood_wide/wood_wide_dark,
+/turf/open/transparent/openspace,
 /area/f13/wasteland/city/newboston/outdoors)
 "iw" = (
 /obj/structure/railing,
@@ -4360,6 +4410,20 @@
 	icon_state = "whitegreenrustychess"
 	},
 /area/f13/building)
+"jJ" = (
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/destructible/tribal_torch/wall/lit{
+	dir = 8
+	},
+/turf/open/indestructible/ground/outside/dirt,
+/area/f13/wasteland/city/newboston/outdoors)
 "jK" = (
 /obj/machinery/shower{
 	dir = 4
@@ -4471,8 +4535,9 @@
 /turf/open/floor/f13/wood,
 /area/f13/building)
 "jX" = (
-/obj/machinery/light/small{
-	dir = 1
+/obj/structure/destructible/tribal_torch/wall/lit{
+	dir = 1;
+	pixel_y = 15
 	},
 /turf/open/floor/wood_wide/wood_wide_dark,
 /area/f13/wasteland/city/newboston/outdoors)
@@ -4669,7 +4734,7 @@
 "ks" = (
 /obj/structure/railing,
 /turf/open/floor/plating/f13/outside/roof/metal/corrugated,
-/area/f13/wasteland)
+/area/f13/wasteland/city/newboston/outdoors)
 "kt" = (
 /obj/structure/flora/ausbushes/ppflowers,
 /obj/effect/turf_decal/weather/dirt{
@@ -5083,12 +5148,6 @@
 	name = "tree shaded bedroll";
 	color = "#555555"
 	},
-/obj/structure/flora/tree/oak_two{
-	density = 0;
-	plane = -1;
-	pixel_x = -18;
-	pixel_y = 25
-	},
 /turf/open/indestructible/ground/outside/civ/grass0{
 	color = "#555555"
 	},
@@ -5100,6 +5159,27 @@
 	},
 /turf/closed/wall/f13/coyote/oldwood,
 /area/f13/building)
+"lp" = (
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/flora/ausbushes/brflowers{
+	plane = -2
+	},
+/obj/structure/destructible/tribal_torch/wall/lit{
+	dir = 8;
+	pixel_y = 10;
+	pixel_x = -7
+	},
+/turf/open/indestructible/ground/outside/civ/grass0{
+	color = "#555555"
+	},
+/area/f13/wasteland/city/newboston/outdoors)
 "lq" = (
 /obj/structure/destructible/tribal_torch/lit,
 /obj/effect/turf_decal/weather/dirt{
@@ -5655,6 +5735,35 @@
 	dir = 1
 	},
 /area/f13/building)
+"my" = (
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/flora/ausbushes/brflowers{
+	plane = -2
+	},
+/obj/structure/spacevine,
+/obj/structure/flora/ausbushes/fullgrass{
+	plane = -3
+	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2;
+	opacity = 1
+	},
+/turf/open/indestructible/ground/outside/civ/grass0{
+	color = "#555555"
+	},
+/area/f13/wasteland/city/newboston/outdoors)
 "mz" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/closed/wall/f13/wood/house,
@@ -5762,6 +5871,20 @@
 	},
 /turf/open/floor/plating/f13/outside/road,
 /area/f13/brotherhood)
+"mO" = (
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2;
+	opacity = 1
+	},
+/turf/open/indestructible/ground/outside/civ/grass0{
+	color = "#555555"
+	},
+/area/f13/caves)
 "mP" = (
 /obj/structure/railing/wood{
 	pixel_y = -12
@@ -6422,6 +6545,9 @@
 /obj/structure/railing{
 	dir = 1
 	},
+/obj/structure/destructible/tribal_torch/wall/lit{
+	dir = 8
+	},
 /turf/open/indestructible/ground/outside/civ/grass0{
 	color = "#555555"
 	},
@@ -6766,19 +6892,10 @@
 /area/f13/building)
 "oU" = (
 /obj/structure/railing{
-	dir = 1
-	},
-/obj/structure/railing,
-/obj/effect/turf_decal/siding/wood{
-	color = "#4F3528";
-	plane = -4
-	},
-/obj/effect/turf_decal/siding/wood{
-	color = "#4F3528";
-	dir = 1
+	dir = 4
 	},
-/turf/open/floor/wood_wide/wood_wide_dark,
-/area/f13/wasteland)
+/turf/open/transparent/openspace,
+/area/f13/wasteland/city/newboston/outdoors)
 "oV" = (
 /obj/structure/window/fulltile/wood,
 /obj/structure/curtain/directional/west,
@@ -7522,6 +7639,27 @@
 	},
 /turf/open/floor/plating/f13/outside/roof/metal,
 /area/f13/wasteland)
+"qW" = (
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/flora/ausbushes/brflowers{
+	plane = -2
+	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2;
+	opacity = 1
+	},
+/turf/open/indestructible/ground/outside/civ/grass0{
+	color = "#555555"
+	},
+/area/f13/wasteland/city/newboston/outdoors)
 "qX" = (
 /obj/structure/destructible/tribal_torch/wall/lit{
 	dir = 8
@@ -7839,6 +7977,12 @@
 /obj/structure/curtain/directional/east,
 /turf/open/floor/wood_common,
 /area/f13/building)
+"rM" = (
+/obj/structure/chair/folding{
+	dir = 1
+	},
+/turf/open/floor/wood_wide/wood_wide_dark,
+/area/f13/wasteland/city/newboston/outdoors)
 "rN" = (
 /obj/structure/window/fulltile/wood,
 /obj/structure/curtain/directional/north,
@@ -7911,7 +8055,7 @@
 	dir = 1
 	},
 /turf/open/transparent/openspace,
-/area/f13/wasteland)
+/area/f13/wasteland/city/newboston/outdoors)
 "rV" = (
 /obj/structure/simple_door/tentflap_leather,
 /turf/open/floor/wood_common,
@@ -8899,9 +9043,9 @@
 "uc" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cave/support{
-	density = 1;
 	pixel_y = 16;
-	icon_state = "stalagmite5"
+	icon_state = "stalagmite5";
+	anchored = 1
 	},
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)
@@ -9152,7 +9296,7 @@
 /area/f13/tribe)
 "uz" = (
 /turf/open/floor/plating/f13/outside/roof/metal/corrugated,
-/area/f13/wasteland)
+/area/f13/wasteland/city/newboston/outdoors)
 "uA" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /mob/living/simple_animal/hostile/bs,
@@ -9628,7 +9772,25 @@
 	pixel_y = -3
 	},
 /turf/open/transparent/openspace,
-/area/f13/wasteland)
+/area/f13/wasteland/city/newboston/outdoors)
+"vQ" = (
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2;
+	opacity = 1
+	},
+/turf/open/indestructible/ground/outside/civ/grass0{
+	color = "#555555"
+	},
+/area/f13/wasteland/city/newboston/outdoors)
 "vS" = (
 /obj/effect/turf_decal/weather/dirtcorner{
 	color = "#777777"
@@ -10235,6 +10397,16 @@
 /obj/structure/destructible/tribal_torch/lit,
 /turf/open/floor/wood_wide/wood_wide_dark,
 /area/f13/caves)
+"xy" = (
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2;
+	opacity = 1
+	},
+/turf/open/indestructible/ground/outside/civ/grass0{
+	color = "#555555"
+	},
+/area/f13/wasteland/city/newboston/outdoors)
 "xz" = (
 /obj/effect/decal/cleanable/glass,
 /turf/open/floor/f13/wood,
@@ -10270,25 +10442,35 @@
 	},
 /turf/open/floor/f13/wood,
 /area/f13/building)
-"xD" = (
-/obj/structure/railing,
-/obj/structure/railing{
-	dir = 1
+"xC" = (
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
 	},
-/obj/structure/spacevine{
-	pixel_y = -17;
+/obj/structure/flora/ausbushes/fullgrass{
 	plane = -3
 	},
-/obj/effect/turf_decal/siding/wood{
-	color = "#4F3528";
-	plane = -4
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2;
+	opacity = 1
 	},
-/obj/effect/turf_decal/siding/wood{
-	color = "#4F3528";
-	dir = 1
+/turf/open/indestructible/ground/outside/civ/grass0{
+	color = "#555555"
 	},
-/turf/open/floor/wood_wide/wood_wide_dark,
-/area/f13/wasteland)
+/area/f13/wasteland/city/newboston/outdoors)
+"xD" = (
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2;
+	opacity = 1
+	},
+/turf/open/indestructible/ground/outside/dirt,
+/area/f13/caves)
 "xE" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -11967,7 +12149,7 @@
 	dir = 8
 	},
 /turf/open/transparent/openspace,
-/area/f13/wasteland)
+/area/f13/wasteland/city/newboston/outdoors)
 "Br" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/f13/vault_floor/purple/side{
@@ -12053,6 +12235,18 @@
 	icon_state = "bluedirtychess2"
 	},
 /area/f13/building)
+"BE" = (
+/obj/structure/railing{
+	plane = -2
+	},
+/obj/effect/turf_decal/siding/wood{
+	color = "#4F3528";
+	plane = -4
+	},
+/turf/open/indestructible/ground/outside/civ/grass0{
+	color = "#555555"
+	},
+/area/f13/wasteland/city/newboston/outdoors)
 "BF" = (
 /obj/structure/sink/cupboard{
 	pixel_y = 12;
@@ -12175,7 +12369,7 @@
 	pixel_y = 17
 	},
 /turf/open/transparent/openspace,
-/area/f13/wasteland)
+/area/f13/wasteland/city/newboston/outdoors)
 "BR" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/blanket{
@@ -12719,7 +12913,7 @@
 	pixel_y = 13
 	},
 /turf/open/transparent/openspace,
-/area/f13/wasteland)
+/area/f13/wasteland/city/newboston/outdoors)
 "CY" = (
 /obj/structure/closet/cabinet/anchored,
 /obj/item/reagent_containers/glass/woodmug/stone,
@@ -13099,6 +13293,19 @@
 	color = "#555555"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
+"DG" = (
+/obj/effect/turf_decal/siding/wood{
+	color = "#4F3528";
+	dir = 8;
+	plane = -4
+	},
+/obj/structure/destructible/tribal_torch/wall/lit{
+	dir = 4;
+	pixel_y = 10;
+	pixel_x = 7
+	},
+/turf/open/floor/wood_wide/wood_wide_dark,
+/area/f13/wasteland/city/newboston/outdoors)
 "DH" = (
 /obj/structure/flora/ausbushes/sparsegrass,
 /turf/open/indestructible/ground/outside/civ/grass3{
@@ -13314,6 +13521,9 @@
 /obj/structure/flora/ausbushes/brflowers{
 	plane = -2
 	},
+/obj/structure/destructible/tribal_torch/wall/lit{
+	dir = 8
+	},
 /turf/open/indestructible/ground/outside/civ/grass0{
 	color = "#555555"
 	},
@@ -14127,6 +14337,18 @@
 	footstep = "grass"
 	},
 /area/f13/building/tribal)
+"Gg" = (
+/obj/effect/turf_decal/siding/wood{
+	color = "#4F3528";
+	dir = 8;
+	plane = -4
+	},
+/obj/structure/destructible/tribal_torch/wall/lit{
+	dir = 1;
+	pixel_y = 15
+	},
+/turf/open/floor/wood_wide/wood_wide_dark,
+/area/f13/wasteland/city/newboston/outdoors)
 "Gh" = (
 /obj/machinery/microwave/stove,
 /turf/open/floor/f13/wood,
@@ -16173,6 +16395,25 @@
 	icon_state = "bluedirtychess2"
 	},
 /area/f13/building)
+"KM" = (
+/obj/structure/spacevine,
+/obj/structure/flora/ausbushes/fullgrass{
+	plane = -3
+	},
+/obj/structure/flora/ausbushes/palebush{
+	plane = -1;
+	pixel_y = 10
+	},
+/obj/structure/flora/rock/pile/largejungle,
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2;
+	opacity = 1
+	},
+/turf/open/indestructible/ground/outside/civ/grass0{
+	color = "#555555"
+	},
+/area/f13/wasteland/city/newboston/outdoors)
 "KN" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/sink{
@@ -16249,6 +16490,15 @@
 	},
 /turf/open/floor/wood_wide/wood_wide_dark,
 /area/f13/wasteland/city/newboston/outdoors)
+"KW" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/chair/folding,
+/obj/effect/turf_decal/siding/wood{
+	color = "#4F3528";
+	dir = 1
+	},
+/turf/open/floor/wood_wide/wood_wide_dark,
+/area/f13/wasteland/city/newboston/outdoors)
 "KX" = (
 /obj/structure/furnace,
 /obj/structure/stone_tile/slab,
@@ -16443,6 +16693,23 @@
 	icon_state = "floorrustysolid"
 	},
 /area/f13/building)
+"Lx" = (
+/obj/structure/railing{
+	plane = -2
+	},
+/obj/effect/turf_decal/siding/wood{
+	color = "#4F3528";
+	plane = -4
+	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2;
+	opacity = 1
+	},
+/turf/open/indestructible/ground/outside/civ/grass0{
+	color = "#555555"
+	},
+/area/f13/wasteland/city/newboston/outdoors)
 "Ly" = (
 /obj/item/pestle,
 /obj/structure/table/craft_counter,
@@ -17657,6 +17924,12 @@
 	footstep = "grass"
 	},
 /area/f13/tribe)
+"NY" = (
+/obj/structure/destructible/tribal_torch/wall/lit{
+	dir = 8
+	},
+/turf/open/floor/wood_wide/wood_wide_dark,
+/area/f13/wasteland/city/newboston/outdoors)
 "NZ" = (
 /obj/structure/closet/fridge,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -18735,6 +19008,10 @@
 "Ql" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/siding/wood{
+	color = "#4F3528";
+	dir = 1
+	},
 /turf/open/floor/wood_wide/wood_wide_dark,
 /area/f13/wasteland/city/newboston/outdoors)
 "Qm" = (
@@ -19082,6 +19359,16 @@
 	},
 /turf/open/water,
 /area/f13/building/tribal/cave)
+"Rc" = (
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2;
+	opacity = 1
+	},
+/turf/open/indestructible/ground/outside/civ/grass0{
+	color = "#555555"
+	},
+/area/f13/caves)
 "Rd" = (
 /obj/item/storage/box/gloves,
 /obj/structure/table/reinforced,
@@ -19365,6 +19652,25 @@
 	name = "spring water"
 	},
 /area/f13/tribe)
+"RL" = (
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/flora/ausbushes/ywflowers{
+	plane = -2
+	},
+/obj/structure/destructible/tribal_torch/wall/lit{
+	dir = 8;
+	pixel_y = 10;
+	pixel_x = -7
+	},
+/turf/open/indestructible/ground/outside/dirt,
+/area/f13/wasteland/city/newboston/outdoors)
 "RM" = (
 /obj/structure/railing{
 	pixel_y = -3
@@ -20778,7 +21084,8 @@
 	},
 /obj/structure/flora/chomp/bush2{
 	color = "#434343";
-	plane = -2
+	plane = -2;
+	opacity = 1
 	},
 /turf/open/indestructible/ground/outside/civ/grass0{
 	color = "#555555"
@@ -21195,6 +21502,22 @@
 "VT" = (
 /turf/open/floor/carpet/black,
 /area/f13/brotherhood)
+"VV" = (
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/destructible/tribal_torch/wall/lit{
+	dir = 8;
+	pixel_y = 10;
+	pixel_x = -7
+	},
+/turf/open/indestructible/ground/outside/dirt,
+/area/f13/wasteland/city/newboston/outdoors)
 "VW" = (
 /obj/structure/chair/sofa/corner{
 	color = "#990033"
@@ -21215,6 +21538,9 @@
 /obj/structure/flora/ausbushes/brflowers{
 	plane = -2
 	},
+/obj/structure/destructible/tribal_torch/wall/lit{
+	dir = 8
+	},
 /turf/open/indestructible/ground/outside/dirt,
 /area/f13/wasteland/city/newboston/outdoors)
 "Wa" = (
@@ -21390,9 +21716,9 @@
 /area/f13/wasteland)
 "Wt" = (
 /obj/structure/cave/support{
-	density = 1;
 	pixel_y = 16;
-	icon_state = "stalagmite5"
+	icon_state = "stalagmite5";
+	anchored = 1
 	},
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)
@@ -21406,6 +21732,22 @@
 /obj/machinery/smartfridge/drying_rack,
 /turf/open/floor/plasteel/cult,
 /area/f13/building/tribal)
+"Wx" = (
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/destructible/tribal_torch/wall/lit{
+	dir = 8
+	},
+/turf/open/indestructible/ground/outside/civ/grass0{
+	color = "#555555"
+	},
+/area/f13/wasteland/city/newboston/outdoors)
 "Wy" = (
 /obj/machinery/light{
 	dir = 1;
@@ -21752,6 +22094,23 @@
 /obj/item/slimecross/industrial/lightpink,
 /turf/open/floor/plasteel/f13/vault_floor/floor,
 /area/f13/building)
+"Xe" = (
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2
+	},
+/obj/structure/flora/ausbushes/brflowers{
+	plane = -2
+	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2;
+	opacity = 1
+	},
+/turf/open/indestructible/ground/outside/civ/grass0{
+	color = "#555555"
+	},
+/area/f13/caves)
 "Xf" = (
 /obj/item/storage/fancy/heart_box{
 	desc = "A heart shaped chocolate box, in memory of Xena.  Fens cat who passed in 2015.  Her mob here has been rescued from ARFS Dallus 1 for 1 from the final version of its map."
@@ -21983,10 +22342,6 @@
 /area/f13/building)
 "XK" = (
 /obj/structure/railing,
-/obj/machinery/light/small{
-	dir = 1;
-	pixel_y = 17
-	},
 /obj/structure/spacevine{
 	pixel_y = -24;
 	plane = -3
@@ -21995,6 +22350,10 @@
 	color = "#4F3528";
 	plane = -4
 	},
+/obj/structure/destructible/tribal_torch/wall/lit{
+	dir = 1;
+	pixel_y = 15
+	},
 /turf/open/floor/wood_wide/wood_wide_dark,
 /area/f13/wasteland/city/newboston/outdoors)
 "XL" = (
@@ -22124,14 +22483,15 @@
 /obj/structure/flora/ausbushes/ywflowers{
 	plane = -2
 	},
-/obj/structure/flora/chomp/bush2{
-	color = "#434343";
-	plane = -2
-	},
 /obj/effect/turf_decal/siding/wood{
 	color = "#4F3528";
 	plane = -4
 	},
+/obj/structure/flora/chomp/bush2{
+	color = "#434343";
+	plane = -2;
+	opacity = 1
+	},
 /turf/open/indestructible/ground/outside/civ/grass0{
 	color = "#555555"
 	},
@@ -22357,7 +22717,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating/f13/outside/roof/metal/corrugated,
-/area/f13/wasteland)
+/area/f13/wasteland/city/newboston/outdoors)
 "YE" = (
 /obj/structure/window/fulltile/wood,
 /obj/structure/curtain/directional/west,
@@ -45266,14 +45626,14 @@ GU
 GU
 GU
 GU
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Ws
+Ws
+Ws
+Ws
+Ws
+Ws
+Ws
+Ws
 Ws
 Ws
 Ws
@@ -45523,14 +45883,14 @@ GU
 GU
 GU
 GU
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-RM
+KV
+gk
+eB
+eB
+eB
+eB
+eB
+eB
 aC
 Zm
 NB
@@ -45780,14 +46140,14 @@ GU
 GU
 GU
 GU
-tN
-tN
-tN
-tN
-tN
-Ws
-Ws
-Fm
+KW
+gL
+rM
+bx
+bx
+bx
+bx
+bx
 wR
 CC
 WD
@@ -46037,14 +46397,14 @@ GU
 GU
 nV
 nV
-dt
-tN
-tN
-tN
-RM
-KV
-eB
-eB
+nc
+cc
+bx
+bx
+eq
+dK
+dK
+bx
 mM
 Ku
 Uu
@@ -46299,9 +46659,9 @@ mM
 mM
 QL
 mM
-bx
-bx
-bx
+IY
+IY
+nc
 mM
 ec
 Ku
@@ -46314,14 +46674,14 @@ cP
 mM
 bx
 UD
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 nb
 ME
 tN
@@ -46557,7 +46917,7 @@ LU
 Xi
 mM
 mM
-dK
+IY
 Ql
 tF
 YV
@@ -46571,14 +46931,14 @@ mz
 mM
 bx
 yj
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 nb
 ME
 tN
@@ -46828,14 +47188,14 @@ QR
 mM
 bx
 iw
-tN
-tN
-tN
-tN
-tN
-tN
-Ws
-Ws
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+oU
+oU
 nb
 ME
 Ws
@@ -47085,25 +47445,25 @@ vr
 mM
 bx
 RQ
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 AU
-eB
+DG
 bx
 bx
 eB
 eB
 eB
-eB
+DG
 bx
 eB
 eB
 eB
-bx
+eq
 eB
 OG
 Ws
@@ -47342,12 +47702,12 @@ yN
 mM
 bx
 UD
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 nb
 mM
 mM
@@ -47592,19 +47952,19 @@ ZJ
 WX
 ZJ
 nc
-Nh
-ZJ
+dB
 ZJ
 ZJ
 ZJ
+jJ
 nc
 UD
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 nb
 mM
 pw
@@ -47856,12 +48216,12 @@ eB
 eB
 bx
 UD
-Ws
-tN
-tN
-Ws
-Ws
-Ws
+oU
+Zh
+Zh
+oU
+oU
+oU
 nb
 Ef
 Rf
@@ -47875,9 +48235,9 @@ vD
 Zm
 mM
 tF
-Hl
-JD
-Mt
+xC
+xy
+xy
 OH
 Cn
 tN
@@ -48134,7 +48494,7 @@ Sq
 mM
 FB
 aS
-bq
+xy
 nc
 jz
 tN
@@ -48389,8 +48749,8 @@ tW
 RW
 tW
 QC
-Hl
-ul
+xC
+my
 bD
 nc
 Dv
@@ -48623,14 +48983,14 @@ DF
 bx
 bx
 bx
-bx
+eq
 bx
 bx
 bx
 Dd
 Xj
 RP
-bx
+eq
 bx
 bx
 bx
@@ -49133,7 +49493,7 @@ ya
 Jg
 bx
 dK
-bx
+eq
 bx
 bx
 bx
@@ -49148,18 +49508,18 @@ QV
 bx
 bx
 Nh
-WX
+RL
 ZJ
 Vp
 Zu
 cF
 WX
-ZJ
+VV
 Vp
 Zu
 JD
 Mt
-dR
+lp
 TJ
 Oq
 Kj
@@ -49379,11 +49739,11 @@ lS
 gj
 Nh
 bq
-Mt
+Wx
 Mt
 Dw
 Mt
-lE
+bf
 lE
 nc
 oa
@@ -49646,7 +50006,7 @@ bx
 bx
 bx
 lf
-Ui
+iv
 Qk
 Qy
 PR
@@ -49675,9 +50035,9 @@ cw
 cw
 cw
 cw
-tN
-tN
-tN
+Zh
+Zh
+Zh
 kL
 tN
 tN
@@ -49903,7 +50263,7 @@ vz
 vz
 bx
 lf
-Ap
+Zh
 Qk
 xA
 cR
@@ -49932,9 +50292,9 @@ Es
 bM
 jK
 cw
-tN
-tN
-tN
+Zh
+Zh
+Zh
 kL
 Ws
 Ws
@@ -50160,14 +50520,14 @@ Ap
 Ap
 dF
 Cf
-Ap
-Ap
-Ap
-Ap
-Ap
-Ap
-Ap
-Ap
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 Qk
 JE
 HG
@@ -50189,9 +50549,9 @@ rG
 cw
 cw
 cw
-tN
-tN
-tN
+Zh
+Zh
+Zh
 nb
 Gu
 CV
@@ -50417,14 +50777,14 @@ Ap
 Ap
 dF
 Cf
-Ap
-Ap
-Ap
-Ap
-Ap
-Ap
-Ap
-Ap
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 jB
 Mq
 Vr
@@ -50446,9 +50806,9 @@ tn
 Rs
 tn
 Qc
-tN
-tN
-tN
+Zh
+Zh
+Zh
 nb
 Ej
 Wo
@@ -50679,9 +51039,9 @@ Sf
 QA
 QA
 DU
-Ap
-Ap
-Ap
+Zh
+Zh
+Zh
 Qk
 Qk
 Qk
@@ -50703,9 +51063,9 @@ aR
 zt
 KO
 Qc
-Ws
-Ws
-Ws
+oU
+oU
+oU
 nb
 bx
 ME
@@ -51222,8 +51582,8 @@ Mt
 Mt
 nc
 Nh
-IY
-dR
+dt
+vQ
 SO
 Gj
 yg
@@ -51479,10 +51839,10 @@ iU
 WF
 nc
 Nh
-Rw
+KM
 ln
 SC
-bq
+xy
 ri
 tN
 tN
@@ -51736,8 +52096,8 @@ lv
 NE
 nc
 Nh
-Hl
-Hl
+xC
+xC
 fb
 bq
 ri
@@ -52206,8 +52566,8 @@ mM
 mM
 mM
 mM
-nS
-nS
+xD
+xD
 mM
 ST
 kx
@@ -52251,10 +52611,10 @@ iU
 nc
 Nh
 kW
-IY
-dR
-bq
-ri
+dt
+qW
+xy
+Lx
 tN
 tN
 tN
@@ -52511,7 +52871,7 @@ hU
 Rw
 QH
 SC
-ri
+BE
 tN
 tN
 tN
@@ -52765,8 +53125,8 @@ dO
 dO
 jE
 Kj
-Hl
-Hl
+xC
+aA
 Vc
 XW
 tN
@@ -53499,9 +53859,9 @@ GU
 GU
 GU
 GU
-tZ
-gM
-Rp
+Rc
+Xe
+mO
 PK
 UJ
 Rp
@@ -53758,7 +54118,7 @@ GU
 GU
 AE
 tZ
-tZ
+Rc
 Rp
 UJ
 Fd
@@ -54015,7 +54375,7 @@ GU
 GU
 yZ
 tZ
-tZ
+Rc
 gM
 UJ
 Rp
@@ -54287,10 +54647,10 @@ Mm
 hC
 bx
 UD
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
 HI
 bx
 tp
@@ -54544,10 +54904,10 @@ hC
 hC
 bx
 UD
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
 QK
 bx
 tp
@@ -54801,11 +55161,11 @@ wS
 DI
 bx
 yj
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
 nb
 tp
 tp
@@ -55058,22 +55418,22 @@ Tx
 TI
 bx
 yj
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
 iD
 UD
-tN
-tN
+Zh
+Zh
 nb
 bx
 UD
-tN
-tN
-tN
-xD
+Zh
+Zh
+Zh
+ZF
 tN
 tN
 tN
@@ -55313,24 +55673,24 @@ An
 hi
 QD
 TI
-bx
+jX
 yj
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 ZF
-tN
-tN
+Zh
+Zh
 ih
 NV
 uw
-tN
-tN
-tN
-bf
+Zh
+Zh
+Zh
+NI
 tN
 tN
 tN
@@ -55572,22 +55932,22 @@ MU
 DI
 bx
 yj
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 NI
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-xD
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+ZF
 tN
 tN
 tN
@@ -55829,22 +56189,22 @@ mo
 vC
 bx
 UD
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 NI
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-xD
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+ZF
 tN
 tN
 tN
@@ -56086,13 +56446,30 @@ UA
 DI
 bx
 UD
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+IC
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+NI
+tN
+tN
 tN
 tN
 tN
 tN
 tN
 tN
-IC
 tN
 tN
 tN
@@ -56101,7 +56478,6 @@ tN
 tN
 tN
 tN
-bf
 tN
 tN
 tN
@@ -56263,102 +56639,86 @@ tN
 tN
 tN
 tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-nQ
-tN
-tN
-tN
-tN
-tN
-tN
-jD
-zs
-zs
-zs
-zs
-zs
-zs
-zs
-zs
-zs
-zs
-jD
-"}
-(131,1,1) = {"
-Yj
-In
-yI
-Zb
-UI
-AC
-Zb
-NT
-Qw
-Qw
-DA
-DA
-DA
-iL
-DA
-pX
-FA
-DA
-iE
-Yj
-Mt
-nc
-mf
-Nb
-tV
-tV
-mf
-TI
-TI
-TI
-TI
-TI
-bx
-yj
-tN
-tN
-tN
-tN
-tN
-tN
-NI
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-bf
+tN
+tN
+tN
+tN
+tN
+tN
+tN
+tN
+tN
+nQ
+tN
+tN
+tN
+tN
+tN
+tN
+jD
+zs
+zs
+zs
+zs
+zs
+zs
+zs
+zs
+zs
+zs
+jD
+"}
+(131,1,1) = {"
+Yj
+In
+yI
+Zb
+UI
+AC
+Zb
+NT
+Qw
+Qw
+DA
+DA
+DA
+iL
+DA
+pX
+FA
+DA
+iE
+Yj
+Mt
+nc
+mf
+Nb
+tV
+tV
+mf
+TI
+TI
+TI
+TI
+TI
+bx
+yj
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+NI
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+NI
 tN
 tN
 tN
@@ -56600,22 +56960,22 @@ ZJ
 Bp
 nc
 yj
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 ZF
-tN
-tN
-Ws
-Ws
-Ws
-Ws
-Ws
-tN
+Zh
+Zh
 oU
+oU
+oU
+oU
+oU
+Zh
+IC
 tN
 tN
 tN
@@ -56849,7 +57209,7 @@ bx
 bx
 bx
 bx
-bx
+NY
 FL
 FL
 FL
@@ -56865,14 +57225,14 @@ NB
 mM
 LD
 BQ
-tN
+Zh
 gr
 iP
 QM
 iP
 jj
-tN
-bf
+Zh
+NI
 tN
 tN
 tN
@@ -57104,15 +57464,15 @@ bq
 nc
 bx
 bx
+eq
 bx
+eq
 bx
 bx
 bx
 bx
 bx
-bx
-bx
-bx
+eq
 bx
 mM
 pD
@@ -57121,15 +57481,15 @@ Ml
 UC
 mM
 XK
-tN
-tN
+Zh
+Zh
 Tm
 QM
 iP
 wj
 rE
-Ws
-xD
+oU
+ZF
 Ws
 Ws
 Ws
@@ -57378,8 +57738,8 @@ oQ
 mU
 XA
 yj
-tN
-tN
+Zh
+Zh
 Tm
 iP
 aH
@@ -57636,7 +57996,7 @@ om
 mM
 LD
 BQ
-tN
+Zh
 Tm
 QM
 mp
@@ -57892,8 +58252,8 @@ mM
 DS
 mM
 UD
-tN
-tN
+Zh
+Zh
 Vu
 Ge
 Sw
@@ -58149,13 +58509,13 @@ mM
 yH
 mM
 UD
-tN
-tN
-tN
+Zh
+Zh
+Zh
 vP
-tN
-tN
-tN
+Zh
+Zh
+Zh
 uz
 Yh
 Yh
@@ -58406,13 +58766,13 @@ mM
 Nm
 mM
 UD
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 uz
 Yh
 Ow
@@ -58636,11 +58996,11 @@ Ps
 Ps
 Ps
 Ps
-gz
-tN
-tN
-tN
-tN
+HI
+Zh
+Zh
+Zh
+Zh
 QC
 BZ
 CM
@@ -58662,14 +59022,14 @@ LQ
 mM
 mM
 mM
-LD
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+XK
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 uz
 Yh
 kU
@@ -58893,11 +59253,11 @@ Ps
 Ps
 Ps
 tA
-gz
-tN
-tN
-tN
-tN
+HI
+Zh
+Zh
+Zh
+Zh
 QC
 mM
 MF
@@ -58918,15 +59278,15 @@ Ed
 Zb
 Zb
 no
-iv
+dK
 yj
-tN
-tN
-tN
+Zh
+Zh
+Zh
 cu
-tN
-tN
-tN
+Zh
+Zh
+Zh
 uz
 Yh
 mK
@@ -59149,26 +59509,26 @@ GU
 GU
 GU
 GU
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 gR
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
 Mx
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 nb
 tF
 Av
@@ -59178,12 +59538,12 @@ BH
 Cs
 Uv
 CX
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 uz
 Yh
 kU
@@ -59406,26 +59766,26 @@ GU
 GU
 GU
 GU
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 Mx
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 nb
 tF
 ey
@@ -59434,13 +59794,13 @@ Zb
 BH
 SP
 QY
-tN
-tN
-tN
+Zh
+Zh
+Zh
 gR
-tN
-tN
-tN
+Zh
+Zh
+Zh
 uz
 Yh
 AT
@@ -59663,26 +60023,26 @@ GU
 GU
 GU
 GU
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 gR
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
 oz
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 nb
 tF
 UI
@@ -59691,13 +60051,13 @@ Zb
 BH
 as
 EC
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 uz
 Yh
 bC
@@ -59921,25 +60281,25 @@ GU
 GU
 GU
 GU
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 Dk
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 nb
 tF
 Lp
@@ -59948,13 +60308,13 @@ GD
 tF
 sc
 EC
-Ws
-tN
-Ws
-Ws
-tN
-tN
-tN
+oU
+Zh
+oU
+oU
+Zh
+Zh
+Zh
 uz
 Yh
 Yh
@@ -60178,32 +60538,32 @@ Yj
 Yj
 Yj
 Yj
-Ws
-Ws
-Ws
-Ws
-Ws
-Ws
-Ws
-Ws
-Ws
-Ws
-Ws
+oU
+oU
+oU
+oU
+oU
+oU
+oU
+oU
+oU
+oU
+oU
 sH
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 nb
 tF
 tF
 tF
 tF
 tF
-eB
+Gg
 dK
 Da
 bx
@@ -60447,9 +60807,9 @@ eB
 eB
 eB
 mT
-tN
-tN
-tN
+Zh
+Zh
+Zh
 rs
 rs
 rs
@@ -60704,9 +61064,9 @@ Vj
 bx
 bx
 UR
-tN
-tN
-tN
+Zh
+Zh
+Zh
 dl
 ZK
 Ur
@@ -60960,10 +61320,10 @@ iA
 YF
 bx
 Nh
-gz
-tN
-tN
-tN
+HI
+Zh
+Zh
+Zh
 Wm
 WK
 kg
@@ -61217,10 +61577,10 @@ lb
 qy
 bx
 Nh
-gz
-tN
-tN
-tN
+HI
+Zh
+Zh
+Zh
 Xs
 sQ
 UI
@@ -61474,10 +61834,10 @@ Tb
 ol
 bx
 KU
-gz
-tN
-tN
-tN
+HI
+Zh
+Zh
+Zh
 Xs
 oI
 UI
@@ -61731,10 +62091,10 @@ Zb
 XA
 bx
 KU
-gz
-tN
-tN
-tN
+HI
+Zh
+Zh
+Zh
 II
 WE
 UI
@@ -61988,10 +62348,10 @@ bJ
 qy
 bx
 Nh
-gz
-tN
-tN
-tN
+HI
+Zh
+Zh
+Zh
 zb
 TG
 AC
@@ -62246,9 +62606,9 @@ Hy
 bx
 Nh
 rU
-Ws
-Ws
-Ws
+oU
+oU
+oU
 rq
 rq
 Pt
@@ -62753,17 +63113,17 @@ GU
 GU
 GU
 GU
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 HN
 bx
 bx
@@ -63010,17 +63370,17 @@ qF
 qw
 GU
 GU
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 fY
 ej
 SU
@@ -63267,17 +63627,17 @@ qF
 fc
 GU
 GU
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 pM
 zD
 GE
@@ -63524,17 +63884,17 @@ Mh
 qw
 GU
 GU
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 nu
 PI
 UX
@@ -63781,21 +64141,21 @@ RA
 us
 GU
 GU
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 mM
 Qt
 Qt
@@ -64038,21 +64398,21 @@ gl
 GU
 GU
 GU
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 mM
 hA
 Qt
@@ -64295,21 +64655,21 @@ qF
 GU
 GU
 GU
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 mM
 rF
 IK
@@ -64552,21 +64912,21 @@ us
 GU
 GU
 GU
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
-tN
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
+Zh
 mM
 hA
 Qt
diff --git a/_maps/map_files/coyote_bayou/Redwater.dmm b/_maps/map_files/coyote_bayou/Redwater.dmm
index c70893d0cc..e6329d201c 100644
--- a/_maps/map_files/coyote_bayou/Redwater.dmm
+++ b/_maps/map_files/coyote_bayou/Redwater.dmm
@@ -365,8 +365,9 @@
 /turf/open/floor/plasteel/f13,
 /area/f13/building)
 "ajw" = (
-/obj/structure/wreck/bus/orange/alt,
-/turf/open/indestructible/ground/outside/gravel,
+/obj/structure/flora/rock/pile/largejungle,
+/obj/structure/campfire/barrel,
+/turf/open/indestructible/ground/outside/dirt,
 /area/f13/wasteland/redwater)
 "ajC" = (
 /obj/structure/flora/rock/pile/largejungle,
@@ -12905,10 +12906,12 @@
 /turf/open/floor/wood_common,
 /area/f13/building)
 "eQF" = (
-/turf/open/floor/f13{
-	icon_state = "stagestairs"
+/obj/machinery/light/small{
+	dir = 4
 	},
-/area/f13/building/coyote/safe/redwater)
+/obj/structure/campfire/barrel,
+/turf/open/indestructible/ground/outside/dirt,
+/area/f13/wasteland/redwater)
 "eQV" = (
 /obj/structure/fence{
 	max_integrity = 500;
@@ -33334,16 +33337,6 @@
 	},
 /turf/open/indestructible/ground/outside/sidewalk,
 /area/f13/building/abandoned)
-"mzt" = (
-/obj/structure/decoration/shock{
-	pixel_y = 4;
-	name = "PORTAL-STORM SHELTER";
-	desc = "A sign indicating that this bunker is a portal storm shelter."
-	},
-/turf/closed/wall/r_wall/f13vault{
-	icon_state = "2-i"
-	},
-/area/f13/building/coyote/safe/redwater)
 "mzB" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/blood/old{
@@ -53380,14 +53373,6 @@
 	},
 /turf/open/indestructible/ground/outside/dirt,
 /area/f13/wasteland/town)
-"uex" = (
-/obj/structure/decoration/vent{
-	pixel_y = 5
-	},
-/turf/closed/wall/r_wall/f13vault{
-	icon_state = "2-i"
-	},
-/area/f13/building/coyote/safe/redwater)
 "ueP" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/spawner/lootdrop/f13/alcoholspawner,
@@ -67114,7 +67099,7 @@ dnF
 dnF
 wgx
 wgx
-bFR
+kTH
 bFR
 bFR
 bFR
@@ -67122,7 +67107,7 @@ bFR
 flv
 flv
 flv
-bFR
+kTH
 flv
 bFR
 sui
@@ -67895,7 +67880,7 @@ sui
 sui
 oYs
 flv
-bFR
+kTH
 sui
 sui
 cqX
@@ -68654,7 +68639,7 @@ mCc
 tRd
 tRd
 bFR
-bFR
+kTH
 flv
 wgx
 jLh
@@ -68675,7 +68660,7 @@ rzm
 mCt
 flv
 flv
-nQD
+ajw
 bFR
 iAu
 kmH
@@ -69445,7 +69430,7 @@ flv
 flv
 flv
 flv
-ajw
+flv
 flv
 flv
 flv
@@ -70217,8 +70202,8 @@ flv
 flv
 flv
 flv
-aru
-bPw
+kTH
+bFR
 bPw
 tWH
 qqz
@@ -70979,7 +70964,7 @@ hjh
 sui
 sui
 ybw
-bFR
+kTH
 bFR
 bFR
 flv
@@ -71497,7 +71482,7 @@ rzm
 bFR
 flv
 flv
-mov
+eQF
 lNf
 bFR
 bFR
@@ -85977,14 +85962,14 @@ bFR
 bFR
 sNS
 bFR
-lVL
-lVL
-lVL
-lVL
-lVL
-lVL
-lVL
-lVL
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
 bFR
 bFR
 bFR
@@ -86234,16 +86219,16 @@ bFR
 bFR
 bFR
 bFR
-lVL
-qaO
-qaO
-qaO
-qaO
-qaO
-lVL
-lVL
-lVL
-lVL
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
 bFR
 bFR
 bFR
@@ -86491,14 +86476,14 @@ bFR
 bFR
 ifN
 bFR
-lVL
-qaO
-cNa
-vao
-tta
-qaO
-qaO
-qaO
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
 iIF
 iIF
 iIF
@@ -86748,14 +86733,14 @@ bFR
 ifN
 bFR
 bFR
-mzt
-qaO
-qoL
-vLF
-vLF
-dJE
-pcq
-qaO
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
 iIF
 iIF
 iIF
@@ -87005,14 +86990,14 @@ bFR
 bFR
 bFR
 bFR
-eQF
-buM
-wzF
-aio
-jCy
-hTS
-noO
-qaO
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
 iIF
 kDz
 kDz
@@ -87262,14 +87247,14 @@ bFR
 bFR
 bFR
 bFR
-uex
-mKs
-vYB
-rwI
-rwI
-rwI
-jAC
-qaO
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
 iIF
 kDz
 qhm
@@ -87520,13 +87505,13 @@ bFR
 flv
 iIF
 iIF
-qaO
-qaO
-koY
-qaO
-qaO
-nFA
-qaO
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
 iIF
 kDz
 emZ
@@ -87777,13 +87762,13 @@ gll
 flv
 iIF
 iIF
-qaO
-hUP
-vLF
-vtW
-qaO
-qaO
-qaO
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
+iIF
 iIF
 kDz
 emZ
@@ -88034,11 +88019,11 @@ flv
 bFR
 iIF
 iIF
-qaO
-rkl
-rwI
-xmc
-qaO
+iIF
+iIF
+iIF
+iIF
+iIF
 iIF
 iIF
 tzA
@@ -88291,11 +88276,11 @@ flv
 bFR
 iIF
 iIF
-qaO
-qaO
-qaO
-qaO
-qaO
+iIF
+iIF
+iIF
+iIF
+iIF
 iIF
 iIF
 iIF