diff --git a/_maps/map_files/coyote_bayou/foxybar.dmm b/_maps/map_files/coyote_bayou/foxybar.dmm
index 805d5e8961..81b20cb7db 100644
--- a/_maps/map_files/coyote_bayou/foxybar.dmm
+++ b/_maps/map_files/coyote_bayou/foxybar.dmm
@@ -21,23 +21,6 @@
 	icon_state = "darkrustysolid"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
-"afh" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#3B2B1A"
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 4;
-	color = "#3B2B1A"
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
 "agk" = (
 /obj/structure/table/wood/settler,
 /obj/item/toy/crayon/spraycan,
@@ -56,17 +39,14 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
-"aht" = (
+"ajh" = (
+/obj/machinery/door/unpowered/securedoor,
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	alpha = 175
 	},
-/obj/effect/overlay/fog/fog2{
-	plane = -1;
-	alpha = 175
-	},
-/turf/closed/wall/mineral/brick{
-	plane = -1
+/turf/open/floor/wood_fancy{
+	color = "#779999"
 	},
 /area/f13/fb/bar)
 "akT" = (
@@ -119,15 +99,23 @@
 	},
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/f13/wasteland/city/newboston/outdoors)
-"atZ" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -2
+"asz" = (
+/obj/structure/mirror{
+	pixel_y = 31
 	},
-/obj/machinery/gear_painter,
-/turf/open/indestructible/ground/outside/sidewalk{
-	icon_state = "horizontalbottomborderbottom0"
+/obj/structure/sink{
+	pixel_y = 20
 	},
-/area/f13/wasteland/city/newboston/outdoors)
+/obj/structure/window/reinforced/tinted/frosted{
+	dir = 8;
+	color = "black"
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/plasteel/freezer,
+/area/f13/fb/bar)
 "awD" = (
 /obj/effect/decal/cleanable/glitter/white{
 	color = "#884444"
@@ -161,6 +149,20 @@
 	},
 /turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
+"ays" = (
+/obj/structure/window/reinforced/tinted/frosted{
+	dir = 4;
+	color = "black"
+	},
+/obj/structure/urinal{
+	pixel_y = 25
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/plasteel/freezer,
+/area/f13/fb/bar)
 "azu" = (
 /obj/effect/landmark/start/f13/barkeep,
 /obj/effect/overlay/fog/fog2{
@@ -216,6 +218,22 @@
 	color = "#AAAAAA"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
+"aMl" = (
+/obj/effect/turf_decal/weather/splinefancy{
+	dir = 1;
+	color = "#59392b";
+	pixel_y = 0;
+	pixel_x = -1;
+	plane = -14
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/plasteel/f13/whitemarble{
+	color = "#333333"
+	},
+/area/f13/fb/bar)
 "aOt" = (
 /obj/effect/decal/cleanable/glitter/blue{
 	color = "#993311";
@@ -254,32 +272,60 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
-"bbJ" = (
-/obj/effect/turf_decal/stripes/asteroid/line{
-	dir = 8
-	},
-/turf/open/floor/plasteel/f13{
-	icon_state = "darkrustysolid"
+"aWA" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1;
+	color = "#3B2B1A"
 	},
-/area/f13/wasteland/city/newboston/outdoors)
-"bcw" = (
-/obj/structure/chair/stool,
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	alpha = 175
 	},
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
+/area/f13/fb/bar)
+"aZX" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	color = "#3B2B1A"
+	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 1;
 	color = "#3B2B1A"
 	},
-/obj/effect/turf_decal/siding/wood/corner{
+/obj/structure/chair/right{
+	dir = 2;
+	pixel_y = 4
+	},
+/obj/structure/window/bronze{
+	dir = 1;
+	pixel_y = 4
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/obj/machinery/light/small{
+	color = "#993311";
 	dir = 8;
-	color = "#3B2B1A"
+	light_color = "#993311";
+	light_power = 2;
+	light_range = 2;
+	pixel_y = 13
 	},
 /turf/open/floor/wood_fancy{
 	color = "#779999"
 	},
 /area/f13/fb/bar)
+"bbJ" = (
+/obj/effect/turf_decal/stripes/asteroid/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel/f13{
+	icon_state = "darkrustysolid"
+	},
+/area/f13/wasteland/city/newboston/outdoors)
 "bga" = (
 /obj/structure/campfire/barrel,
 /obj/effect/overlay/fog/fog2{
@@ -325,6 +371,17 @@
 	color = "#999999"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
+"bnq" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#3B2B1A"
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/carpet/purple,
+/area/f13/fb/bar)
 "bpJ" = (
 /obj/structure/chair/stool/retro/backed,
 /obj/effect/turf_decal/siding/wood{
@@ -361,19 +418,6 @@
 	},
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)
-"btj" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
 "bxY" = (
 /obj/effect/turf_decal/weather/dirt{
 	dir = 8
@@ -504,6 +548,19 @@
 	},
 /turf/open/indestructible/ground/outside/sidewalk,
 /area/f13/wasteland/city/newboston/outdoors)
+"cdu" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#3B2B1A"
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
+/area/f13/fb/bar)
 "cdA" = (
 /obj/effect/turf_decal/weather/dirt{
 	dir = 1
@@ -543,10 +600,7 @@
 	},
 /area/f13/wasteland/city/newboston/outdoors)
 "cvh" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4;
-	color = "#3B2B1A"
-	},
+/obj/structure/chair/stool,
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	alpha = 175
@@ -579,6 +633,7 @@
 	pixel_x = 9;
 	pixel_y = 3
 	},
+/obj/item/storage/lockbox/dueling/hugbox/stamina,
 /turf/open/floor/f13{
 	color = "#ffe9de";
 	icon_state = "darkrusty";
@@ -637,6 +692,14 @@
 	plane = -2;
 	alpha = 175
 	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#3B2B1A"
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 8;
+	color = "#3B2B1A"
+	},
 /turf/open/floor/wood_fancy{
 	color = "#779999"
 	},
@@ -740,19 +803,6 @@
 	},
 /turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
-"djJ" = (
-/obj/structure/mirror{
-	pixel_y = 31
-	},
-/obj/structure/sink{
-	pixel_y = 20
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/turf/open/floor/plasteel/freezer,
-/area/f13/fb/bar)
 "dpG" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
 	dir = 9
@@ -767,6 +817,19 @@
 	name = "dirty floor"
 	},
 /area/f13/fb/bar)
+"dAC" = (
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1;
+	color = "#3B2B1A"
+	},
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
+/area/f13/fb/bar)
 "dCS" = (
 /obj/structure/window/bronze{
 	dir = 4;
@@ -804,36 +867,6 @@
 	},
 /turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
-"dFe" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
-"dIZ" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/obj/structure/chair/middle,
-/obj/structure/window/bronze{
-	dir = 1
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
 "dLD" = (
 /obj/effect/decal/cleanable/glitter/white{
 	color = "#884444"
@@ -896,12 +929,9 @@
 	dir = 1;
 	color = "#3B2B1A"
 	},
-/obj/structure/chair/middle{
-	pixel_y = 4
-	},
+/obj/structure/chair/middle,
 /obj/structure/window/bronze{
-	dir = 1;
-	pixel_y = 4
+	dir = 1
 	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
@@ -964,17 +994,6 @@
 	},
 /turf/open/indestructible/ground/outside/water,
 /area/f13/wasteland/city/newboston/outdoors)
-"ekg" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 4;
-	color = "#3B2B1A"
-	},
-/turf/open/floor/carpet/purple,
-/area/f13/fb/bar)
 "euX" = (
 /obj/structure/sign/painting/library{
 	pixel_x = -32
@@ -1036,19 +1055,6 @@
 	},
 /turf/open/floor/carpet/royalblack,
 /area/f13/fb/bar)
-"eAQ" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 2;
-	color = "#3B2B1A"
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
 "eBd" = (
 /obj/effect/overlay/fog/fog2{
 	plane = -2
@@ -1150,35 +1156,27 @@
 	color = "#AAAAAA"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
-"fdf" = (
+"fbp" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4;
+	color = "#3B2B1A"
+	},
 /obj/effect/overlay/fog/fog2{
-	plane = -2
+	plane = -2;
+	alpha = 175
 	},
-/turf/open/indestructible/ground/outside/sidewalk{
-	icon_state = "horizontaltopbordertop2right"
-	},
-/area/f13/wasteland/city/newboston/outdoors)
-"ffh" = (
-/obj/machinery/light/floor{
-	light_color = "#993311";
-	color = "#993311";
-	alpha = 10
+/turf/open/floor/wood_fancy{
+	color = "#779999"
 	},
+/area/f13/fb/bar)
+"fdf" = (
 /obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/obj/effect/turf_decal/weather/splinefancy{
-	dir = 1;
-	color = "#59392b";
-	pixel_y = 0;
-	pixel_x = -1;
-	plane = -14
+	plane = -2
 	},
-/turf/open/floor/plasteel/f13/whitemarble{
-	color = "#333333"
+/turf/open/indestructible/ground/outside/sidewalk{
+	icon_state = "horizontaltopbordertop2right"
 	},
-/area/f13/fb/bar)
+/area/f13/wasteland/city/newboston/outdoors)
 "ffM" = (
 /obj/effect/overlay/fog/fog2{
 	plane = -2
@@ -1299,54 +1297,39 @@
 	},
 /area/f13/wasteland/city/newboston/outdoors)
 "fDY" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#3B2B1A"
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/obj/structure/chair/right{
-	dir = 2
-	},
-/obj/structure/window/bronze{
-	dir = 1
+/obj/machinery/light/floor{
+	light_color = "#993311";
+	color = "#993311";
+	alpha = 10
 	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	alpha = 175
 	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
+/turf/open/floor/plasteel/f13/whitemarble{
+	color = "#333333"
 	},
 /area/f13/fb/bar)
-"fLZ" = (
-/obj/machinery/light/sign/heaven{
-	light_power = 2;
-	pixel_y = 3
-	},
+"fRv" = (
+/obj/machinery/telecomms/server/presets/science,
+/turf/open/floor/circuit/telecomms/mainframe,
+/area/f13/wasteland/city/newboston/outdoors)
+"fRB" = (
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	alpha = 175
 	},
-/turf/closed/wall/mineral/brick,
-/area/f13/fb/bar)
-"fRr" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 4;
-	color = "#3B2B1A"
+/obj/effect/turf_decal/weather/splinefancy{
+	dir = 1;
+	color = "#59392b";
+	pixel_y = 0;
+	pixel_x = -1;
+	plane = -14
 	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
+/turf/open/floor/plasteel/f13/whitemarble{
+	color = "#333333"
 	},
-/turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
-"fRv" = (
-/obj/machinery/telecomms/server/presets/science,
-/turf/open/floor/circuit/telecomms/mainframe,
-/area/f13/wasteland/city/newboston/outdoors)
 "fUM" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 8;
@@ -1399,6 +1382,15 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
+"gan" = (
+/obj/effect/overlay/fog/fog2{
+	plane = -2
+	},
+/obj/machinery/gear_painter,
+/turf/open/indestructible/ground/outside/sidewalk{
+	icon_state = "horizontalbottomborderbottom3"
+	},
+/area/f13/wasteland/city/newboston/outdoors)
 "gec" = (
 /obj/structure/table/abductor,
 /obj/effect/overlay/fog/fog2{
@@ -1496,6 +1488,15 @@
 	},
 /turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
+"gtn" = (
+/obj/effect/overlay/fog/fog2{
+	plane = -1;
+	alpha = 175
+	},
+/turf/closed/wall/mineral/brick{
+	plane = -1
+	},
+/area/f13/fb/bar)
 "gyr" = (
 /obj/machinery/vending/cigarette{
 	density = 0;
@@ -1643,17 +1644,19 @@
 /turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
 "hfS" = (
+/obj/machinery/light/small{
+	dir = 8;
+	pixel_y = 13;
+	light_color = "#993311";
+	light_power = 2;
+	light_range = 2;
+	color = "#993311"
+	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	alpha = 175
 	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 4;
-	color = "#3B2B1A"
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
+/turf/open/floor/plasteel/freezer,
 /area/f13/fb/bar)
 "his" = (
 /obj/effect/landmark/latejoin,
@@ -1705,16 +1708,6 @@
 	},
 /turf/open/floor/carpet/royalblack,
 /area/f13/fb/bar)
-"hwz" = (
-/obj/structure/urinal{
-	pixel_y = 25
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/turf/open/floor/plasteel/freezer,
-/area/f13/fb/bar)
 "hAy" = (
 /obj/effect/overlay/fog/fog2{
 	plane = -2
@@ -1723,11 +1716,22 @@
 	icon_state = "horizontaltopbordertop2left"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
-"hBy" = (
+"hEt" = (
+/obj/effect/turf_decal/siding/wood{
+	color = "#3B2B1A"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	color = "#3B2B1A"
+	},
+/obj/structure/chair/left{
+	dir = 1;
+	plane = -2;
+	pixel_y = -4
+	},
 /obj/structure/window/bronze{
-	dir = 4;
-	mouse_opacity = 0;
-	opacity = 1
+	plane = -2;
+	pixel_y = -4
 	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
@@ -1760,22 +1764,6 @@
 	name = "dirty floor"
 	},
 /area/f13/fb/bar)
-"hLc" = (
-/obj/effect/turf_decal/weather/splinefancy{
-	dir = 1;
-	color = "#59392b";
-	pixel_y = 0;
-	pixel_x = -1;
-	plane = -14
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/turf/open/floor/plasteel/f13/whitemarble{
-	color = "#333333"
-	},
-/area/f13/fb/bar)
 "hSj" = (
 /obj/machinery/light/small{
 	color = "#993311";
@@ -1810,30 +1798,16 @@
 	},
 /turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
-"ifs" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 4;
-	color = "#3B2B1A"
+"ije" = (
+/obj/machinery/light/sign/heaven{
+	light_power = 2;
+	pixel_y = 3
 	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	alpha = 175
 	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4;
-	color = "#3B2B1A"
-	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 8;
-	color = "#3B2B1A"
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
+/turf/closed/wall/mineral/brick,
 /area/f13/fb/bar)
 "iku" = (
 /obj/effect/decal/cleanable/glitter/blue{
@@ -1878,27 +1852,6 @@
 	},
 /turf/open/indestructible/ground/outside/water,
 /area/f13/wasteland/city/newboston/outdoors)
-"isY" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 4;
-	color = "#3B2B1A"
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4;
-	color = "#3B2B1A"
-	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
 "iub" = (
 /obj/effect/decal/marking,
 /obj/effect/landmark/latejoin,
@@ -1933,19 +1886,6 @@
 /obj/machinery/telecomms/server/presets/legion,
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/f13/wasteland/city/newboston/outdoors)
-"iGg" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 2;
-	color = "#3B2B1A"
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
 "iJV" = (
 /obj/machinery/telecomms/processor/preset_two,
 /obj/machinery/light/floor{
@@ -2002,6 +1942,37 @@
 	},
 /turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
+"iVb" = (
+/obj/structure/easel,
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#3B2B1A"
+	},
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
+/area/f13/fb/bar)
+"iVm" = (
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1;
+	color = "#3B2B1A"
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4;
+	color = "#3B2B1A"
+	},
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
+/area/f13/fb/bar)
 "iYl" = (
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
@@ -2042,16 +2013,30 @@
 	name = "dirty floor"
 	},
 /area/f13/fb/bar)
+"joB" = (
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -1;
+	alpha = 175
+	},
+/turf/closed/wall/mineral/brick{
+	plane = -1
+	},
+/area/f13/fb/bar)
 "jyP" = (
 /obj/effect/turf_decal/siding/wood{
-	dir = 4;
+	dir = 8;
 	color = "#3B2B1A"
 	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 1;
 	color = "#3B2B1A"
 	},
-/obj/structure/chair/left{
+/obj/structure/chair/right{
+	dir = 2;
 	pixel_y = 4
 	},
 /obj/structure/window/bronze{
@@ -2190,6 +2175,24 @@
 	icon_state = "horizontaltopbordertop0"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
+"knd" = (
+/obj/structure/window/bronze{
+	dir = 4;
+	mouse_opacity = 0;
+	opacity = 1
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/obj/structure/window/bronze{
+	dir = 1;
+	pixel_y = 4
+	},
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
+/area/f13/fb/bar)
 "krA" = (
 /obj/effect/decal/cleanable/glitter/white{
 	color = "#884444"
@@ -2197,14 +2200,35 @@
 /obj/structure/railing{
 	color = "#A47449";
 	dir = 4;
-	pixel_y = 8;
-	pixel_x = 2
+	pixel_y = 8;
+	pixel_x = 2
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/carpet/purple,
+/area/f13/fb/bar)
+"kuK" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#3B2B1A"
 	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	alpha = 175
 	},
-/turf/open/floor/carpet/purple,
+/obj/machinery/light/small{
+	color = "#993311";
+	dir = 4;
+	light_color = "#993311";
+	light_power = 2;
+	light_range = 2;
+	pixel_y = 13
+	},
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
 /area/f13/fb/bar)
 "kFu" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
@@ -2476,39 +2500,6 @@
 	},
 /turf/open/indestructible/ground/outside/water,
 /area/f13/wasteland/city/newboston/outdoors)
-"lXb" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#3B2B1A"
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/obj/structure/chair/right{
-	dir = 2;
-	pixel_y = 4
-	},
-/obj/structure/window/bronze{
-	dir = 1;
-	pixel_y = 4
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/obj/machinery/light/small{
-	color = "#993311";
-	dir = 8;
-	light_color = "#993311";
-	light_power = 2;
-	light_range = 2;
-	pixel_y = 13
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
 "lXt" = (
 /obj/structure/railing{
 	color = "#A47449";
@@ -2595,20 +2586,6 @@
 	},
 /turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
-"mpg" = (
-/obj/structure/window/reinforced/tinted/frosted{
-	dir = 4;
-	color = "black"
-	},
-/obj/structure/urinal{
-	pixel_y = 25
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/turf/open/floor/plasteel/freezer,
-/area/f13/fb/bar)
 "mtY" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4;
@@ -2641,6 +2618,19 @@
 	},
 /turf/open/indestructible/ground/outside/water,
 /area/f13/wasteland/city/newboston/outdoors)
+"mRP" = (
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#3B2B1A"
+	},
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
+/area/f13/fb/bar)
 "mSr" = (
 /obj/machinery/light/floor{
 	light_color = "#993311";
@@ -2652,12 +2642,28 @@
 	},
 /area/f13/wasteland/city/newboston/outdoors)
 "mSG" = (
+/obj/effect/decal/cleanable/glitter/blue{
+	color = "#993311";
+	layer = 3
+	},
+/obj/machinery/light/floor{
+	light_color = "#993311";
+	color = "#993311";
+	alpha = 10
+	},
 /obj/effect/overlay/fog/fog2{
-	plane = -1;
+	plane = -2;
 	alpha = 175
 	},
-/turf/closed/wall/mineral/brick{
-	plane = -1
+/obj/effect/turf_decal/weather/splinefancy{
+	dir = 1;
+	color = "#59392b";
+	pixel_y = 0;
+	pixel_x = -1;
+	plane = -14
+	},
+/turf/open/floor/plasteel/f13/whitemarble{
+	color = "#333333"
 	},
 /area/f13/fb/bar)
 "mWI" = (
@@ -2690,23 +2696,6 @@
 	icon_state = "verticalrightborderright2"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
-"nfq" = (
-/obj/structure/mirror{
-	pixel_y = 31
-	},
-/obj/structure/sink{
-	pixel_y = 20
-	},
-/obj/structure/window/reinforced/tinted/frosted{
-	dir = 8;
-	color = "black"
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/turf/open/floor/plasteel/freezer,
-/area/f13/fb/bar)
 "niY" = (
 /obj/structure/curtain{
 	color = "#c40e0e"
@@ -2774,12 +2763,17 @@
 /turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
 "nyA" = (
-/obj/structure/decoration/vent,
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 8;
+	color = "#3B2B1A"
+	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	alpha = 175
 	},
-/turf/open/floor/plasteel/freezer,
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
 /area/f13/fb/bar)
 "nPu" = (
 /obj/effect/landmark/start/f13/wastelander/clubworker,
@@ -2807,6 +2801,13 @@
 	plane = -2;
 	alpha = 175
 	},
+/obj/effect/turf_decal/weather/splinefancy{
+	dir = 1;
+	color = "#59392b";
+	pixel_y = 0;
+	pixel_x = -1;
+	plane = -14
+	},
 /turf/open/floor/plasteel/f13/whitemarble{
 	color = "#333333"
 	},
@@ -2828,9 +2829,9 @@
 	icon_state = "verticalrightborderright1"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
-"oIe" = (
+"oBl" = (
 /obj/effect/turf_decal/siding/wood/corner{
-	dir = 8;
+	dir = 2;
 	color = "#3B2B1A"
 	},
 /obj/effect/overlay/fog/fog2{
@@ -2890,21 +2891,25 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
-"oQi" = (
+"oQf" = (
 /obj/effect/overlay/fog/fog2{
-	plane = -2
+	plane = -2;
+	alpha = 175
 	},
-/turf/open/indestructible/ground/outside/sidewalk{
-	icon_state = "horizontaltopbordertop1"
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#3B2B1A"
 	},
-/area/f13/wasteland/city/newboston/outdoors)
-"oWN" = (
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
+/area/f13/fb/bar)
+"oQi" = (
 /obj/effect/overlay/fog/fog2{
 	plane = -2
 	},
-/obj/machinery/gear_painter,
 /turf/open/indestructible/ground/outside/sidewalk{
-	icon_state = "horizontalbottomborderbottom3"
+	icon_state = "horizontaltopbordertop1"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
 "pbh" = (
@@ -3053,6 +3058,26 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
+"pSY" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#3B2B1A"
+	},
+/obj/structure/chair/middle{
+	pixel_y = 4
+	},
+/obj/structure/window/bronze{
+	dir = 1;
+	pixel_y = 4
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
+/area/f13/fb/bar)
 "pUV" = (
 /obj/item/reagent_containers/food/drinks/shaker{
 	pixel_y = 12;
@@ -3103,15 +3128,6 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
-"qaG" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -2
-	},
-/obj/machinery/recycler,
-/turf/open/indestructible/ground/outside/sidewalk{
-	icon_state = "horizontalbottomborderbottom0"
-	},
-/area/f13/wasteland/city/newboston/outdoors)
 "qdx" = (
 /obj/machinery/light/small{
 	color = "#993311";
@@ -3136,6 +3152,28 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
+"qdS" = (
+/obj/effect/overlay/fog/fog2{
+	plane = -2
+	},
+/obj/machinery/gear_painter,
+/turf/open/indestructible/ground/outside/sidewalk{
+	icon_state = "horizontalbottomborderbottom0"
+	},
+/area/f13/wasteland/city/newboston/outdoors)
+"qfC" = (
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 2;
+	color = "#3B2B1A"
+	},
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
+/area/f13/fb/bar)
 "qjR" = (
 /obj/structure/flora/chomp/bones/lrock4,
 /obj/effect/overlay/fog/fog2{
@@ -3267,19 +3305,6 @@
 	},
 /turf/open/floor/carpet/royalblack,
 /area/f13/fb/bar)
-"qQu" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
 "qSj" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
 	dir = 4
@@ -3325,15 +3350,6 @@
 /obj/machinery/telecomms/hub/preset,
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/f13/wasteland/city/newboston/outdoors)
-"rqo" = (
-/obj/structure/simple_door/room,
-/obj/item/lock_bolt,
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/turf/open/floor/plasteel/freezer,
-/area/f13/fb/bar)
 "rtq" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 8;
@@ -3439,6 +3455,19 @@
 	color = "#777777"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
+"rOS" = (
+/obj/structure/mirror{
+	pixel_y = 31
+	},
+/obj/structure/sink{
+	pixel_y = 20
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/plasteel/freezer,
+/area/f13/fb/bar)
 "rTA" = (
 /obj/structure/car/rubbish3{
 	density = 0;
@@ -3564,6 +3593,17 @@
 	color = "#777777"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
+"sqa" = (
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#3B2B1A"
+	},
+/turf/open/floor/carpet/purple,
+/area/f13/fb/bar)
 "srN" = (
 /obj/structure/sign/poster/contraband/pinup_funk{
 	pixel_y = 32
@@ -3587,12 +3627,36 @@
 "sCW" = (
 /obj/effect/landmark/latejoin,
 /obj/effect/overlay/fog/fog2{
-	plane = -2
+	plane = -2
+	},
+/turf/open/indestructible/ground/outside/sidewalk{
+	icon_state = "verticalrightborderright0"
+	},
+/area/f13/wasteland/city/newboston/outdoors)
+"sKg" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#3B2B1A"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#3B2B1A"
+	},
+/obj/structure/chair/left{
+	pixel_y = 4
+	},
+/obj/structure/window/bronze{
+	dir = 1;
+	pixel_y = 4
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
 	},
-/turf/open/indestructible/ground/outside/sidewalk{
-	icon_state = "verticalrightborderright0"
+/turf/open/floor/wood_fancy{
+	color = "#779999"
 	},
-/area/f13/wasteland/city/newboston/outdoors)
+/area/f13/fb/bar)
 "sXl" = (
 /obj/structure/chair/stool/retro/backed,
 /obj/effect/turf_decal/siding/wood{
@@ -3630,6 +3694,31 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
+"tiS" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#3B2B1A"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#3B2B1A"
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4;
+	color = "#3B2B1A"
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 8;
+	color = "#3B2B1A"
+	},
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
+/area/f13/fb/bar)
 "tkO" = (
 /obj/effect/overlay/fog/fog2{
 	plane = -2
@@ -3689,9 +3778,9 @@
 	},
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)
-"tsB" = (
+"ttk" = (
 /obj/machinery/light/small{
-	dir = 8;
+	dir = 4;
 	pixel_y = 13;
 	light_color = "#993311";
 	light_power = 2;
@@ -3771,15 +3860,6 @@
 	color = "#AAAAAA"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
-"tOB" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 8;
-	color = "#3B2B1A"
-	},
-/turf/closed{
-	icon_state = "black"
-	},
-/area)
 "tPi" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4;
@@ -3841,6 +3921,15 @@
 /obj/machinery/telecomms/server/presets/vault,
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/f13/wasteland/city/newboston/outdoors)
+"urA" = (
+/obj/effect/overlay/fog/fog2{
+	plane = -2
+	},
+/obj/machinery/recycler,
+/turf/open/indestructible/ground/outside/sidewalk{
+	icon_state = "horizontalbottomborderbottom0"
+	},
+/area/f13/wasteland/city/newboston/outdoors)
 "usf" = (
 /obj/effect/landmark/start/f13/wastelander/clubworker,
 /obj/structure/chair/bench{
@@ -3893,19 +3982,6 @@
 	color = "#AAAAAA"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
-"uFG" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 4;
-	color = "#3B2B1A"
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
 "uOS" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4;
@@ -4045,48 +4121,6 @@
 	color = "#333333"
 	},
 /area/f13/fb/bar)
-"vAO" = (
-/obj/effect/decal/cleanable/glitter/blue{
-	color = "#993311";
-	layer = 3
-	},
-/obj/machinery/light/floor{
-	light_color = "#993311";
-	color = "#993311";
-	alpha = 10
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/obj/effect/turf_decal/weather/splinefancy{
-	dir = 1;
-	color = "#59392b";
-	pixel_y = 0;
-	pixel_x = -1;
-	plane = -14
-	},
-/turf/open/floor/plasteel/f13/whitemarble{
-	color = "#333333"
-	},
-/area/f13/fb/bar)
-"vDo" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4;
-	color = "#3B2B1A"
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
 "vEu" = (
 /obj/structure/curtain{
 	color = "#c40e0e";
@@ -4108,22 +4142,6 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
-"vFv" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/obj/effect/turf_decal/weather/splinefancy{
-	dir = 1;
-	color = "#59392b";
-	pixel_y = 0;
-	pixel_x = -1;
-	plane = -14
-	},
-/turf/open/floor/plasteel/f13/whitemarble{
-	color = "#333333"
-	},
-/area/f13/fb/bar)
 "vJz" = (
 /turf/open/floor/f13{
 	color = "#ffe9de";
@@ -4140,13 +4158,13 @@
 	plane = -2;
 	alpha = 175
 	},
-/obj/machinery/light/small{
-	color = "#993311";
+/obj/effect/turf_decal/siding/wood/corner{
 	dir = 4;
-	light_color = "#993311";
-	light_power = 2;
-	light_range = 2;
-	pixel_y = 13
+	color = "#3B2B1A"
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1;
+	color = "#3B2B1A"
 	},
 /turf/open/floor/wood_fancy{
 	color = "#779999"
@@ -4175,6 +4193,9 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
+"wev" = (
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
 "weZ" = (
 /obj/structure/bed/dogbed,
 /obj/effect/turf_decal/siding/wood{
@@ -4210,27 +4231,21 @@
 	},
 /turf/open/floor/carpet/royalblack,
 /area/f13/fb/bar)
-"wlx" = (
-/obj/machinery/light/small{
-	dir = 4;
-	pixel_y = 13;
-	light_color = "#993311";
-	light_power = 2;
-	light_range = 2;
-	color = "#993311"
+"wnw" = (
+/obj/machinery/telecomms/server/presets/medical,
+/turf/open/floor/plasteel/f13{
+	icon_state = "darkrustysolid"
 	},
+/area/f13/wasteland/city/newboston/outdoors)
+"woH" = (
+/obj/structure/simple_door/room,
+/obj/item/lock_bolt,
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	alpha = 175
 	},
 /turf/open/floor/plasteel/freezer,
 /area/f13/fb/bar)
-"wnw" = (
-/obj/machinery/telecomms/server/presets/medical,
-/turf/open/floor/plasteel/f13{
-	icon_state = "darkrustysolid"
-	},
-/area/f13/wasteland/city/newboston/outdoors)
 "wqx" = (
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
@@ -4240,20 +4255,6 @@
 	color = "#AAAAAA"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
-"wqJ" = (
-/obj/structure/easel,
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
 "wsB" = (
 /obj/structure/chair/stool/retro/backed{
 	dir = 4
@@ -4284,6 +4285,16 @@
 	icon_state = "verticalleftborderleft2"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
+"wuM" = (
+/obj/structure/urinal{
+	pixel_y = 25
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/plasteel/freezer,
+/area/f13/fb/bar)
 "wxN" = (
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
@@ -4363,12 +4374,10 @@
 	color = "#3B2B1A"
 	},
 /obj/structure/chair/right{
-	dir = 2;
-	pixel_y = 4
+	dir = 2
 	},
 /obj/structure/window/bronze{
-	dir = 1;
-	pixel_y = 4
+	dir = 1
 	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
@@ -4378,6 +4387,14 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
+"wOo" = (
+/obj/structure/decoration/vent,
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/plasteel/freezer,
+/area/f13/fb/bar)
 "wPR" = (
 /obj/effect/turf_decal/stripes/asteroid/corner{
 	dir = 1
@@ -4435,17 +4452,10 @@
 	plane = -2;
 	alpha = 175
 	},
-/obj/structure/window/bronze{
-	dir = 1;
-	pixel_y = 4
-	},
 /turf/open/floor/wood_fancy{
 	color = "#779999"
 	},
 /area/f13/fb/bar)
-"xkP" = (
-/turf/open/indestructible/ground/outside/desert,
-/area/f13/wasteland)
 "xlm" = (
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
@@ -4469,36 +4479,18 @@
 /turf/open/indestructible/ground/outside/water,
 /area/f13/wasteland/city/newboston/outdoors)
 "xpa" = (
-/obj/machinery/door/unpowered/securedoor,
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
-"xwb" = (
-/obj/effect/turf_decal/siding/wood{
-	color = "#3B2B1A"
-	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 8;
 	color = "#3B2B1A"
 	},
-/obj/structure/chair/left{
-	dir = 1;
-	plane = -2;
-	pixel_y = -4
-	},
-/obj/structure/window/bronze{
-	plane = -2;
-	pixel_y = -4
-	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	alpha = 175
 	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#3B2B1A"
+	},
 /turf/open/floor/wood_fancy{
 	color = "#779999"
 	},
@@ -7018,7 +7010,7 @@ xNF
 xNF
 xNF
 xNF
-tOB
+xNF
 xNF
 xNF
 xNF
@@ -7523,10 +7515,10 @@ xNF
 xNF
 xNF
 bPG
-hwz
-tsB
+wuM
+hfS
 gkC
-rqo
+woH
 gkC
 uvM
 bPG
@@ -7780,8 +7772,8 @@ xNF
 xNF
 xNF
 bPG
-hwz
-nyA
+wuM
+wOo
 gkC
 bPG
 gkC
@@ -7796,14 +7788,14 @@ wHw
 sel
 awD
 bPG
-lXb
+aZX
 oOK
-xwb
-mSG
-lXb
+hEt
+gtn
+aZX
 oOK
-xwb
-mSG
+hEt
+gtn
 his
 sCW
 sCW
@@ -8037,7 +8029,7 @@ xNF
 xNF
 xNF
 bPG
-mpg
+ays
 gkC
 gkC
 bPG
@@ -8053,14 +8045,14 @@ lXt
 krA
 hSj
 bPG
-dRv
+pSY
 lzG
 dNW
-aht
-dRv
+joB
+pSY
 lzG
 dNW
-aht
+joB
 mdh
 bXW
 bXW
@@ -8294,31 +8286,31 @@ xNF
 xNF
 xNF
 bPG
-nfq
+asz
 gkC
 gkC
-rqo
+woH
 gkC
 uvM
 bPG
 dga
-fRr
-ekg
+bnq
+sqa
 hTW
 hnl
 bIX
 cFj
 dYw
 bPG
-jyP
+sKg
 mtY
 aTn
-aht
-jyP
+joB
+sKg
 mtY
 aTn
-aht
-qaG
+joB
+urA
 bXW
 bXW
 ecT
@@ -8551,8 +8543,8 @@ xNF
 xNF
 xNF
 bPG
-djJ
-wlx
+rOS
+ttk
 gkC
 bPG
 gkC
@@ -8567,15 +8559,15 @@ bPG
 bPG
 bPG
 bPG
-xga
+knd
 wxN
 dCS
-aht
-hBy
+joB
+xga
 wxN
 dCS
-aht
-atZ
+joB
+qdS
 tdg
 nbY
 wum
@@ -9067,19 +9059,19 @@ xNF
 xNF
 xNF
 bPG
-ifs
-afh
-afh
+tiS
+xpa
+xpa
 cYv
 cYv
-vDo
+iVm
 wxN
 bPG
 glE
 dEp
 glE
 bPG
-bcw
+cKA
 gmW
 rtq
 rtq
@@ -9336,14 +9328,14 @@ goB
 goB
 goB
 iNU
-dFe
-iGg
-uFG
-uFG
-uFG
-uFG
-uFG
-cvh
+aWA
+oBl
+cdu
+cdu
+cdu
+cdu
+cdu
+fbp
 cAY
 bPG
 rDF
@@ -9595,12 +9587,12 @@ goB
 tCv
 wxN
 cAY
-hLc
+aMl
 orZ
 orZ
 orZ
 orZ
-qQu
+mRP
 cAY
 maZ
 usf
@@ -9852,12 +9844,12 @@ jPN
 hcd
 iku
 cAY
-vAO
+mSG
 orZ
 orZ
 orZ
 vzp
-qQu
+mRP
 cAY
 maZ
 usf
@@ -10100,7 +10092,7 @@ bPG
 lSC
 lSC
 bPG
-qQu
+mRP
 wxN
 wxN
 wxN
@@ -10109,14 +10101,14 @@ wxN
 wxN
 wxN
 cAY
-vFv
+fRB
 orZ
 orZ
 orZ
 orZ
-qQu
+mRP
 cAY
-xpa
+ajh
 eBd
 cuN
 gzw
@@ -10357,7 +10349,7 @@ bPG
 bAd
 rtq
 qxm
-btj
+dAC
 wxN
 iku
 wxN
@@ -10366,14 +10358,14 @@ wxN
 wxN
 wxN
 cAY
-vFv
+fRB
 exD
 orZ
 orZ
-ohS
-qQu
+fDY
+mRP
 cAY
-fLZ
+ije
 dfJ
 fdf
 eYJ
@@ -10623,12 +10615,12 @@ wxN
 wxN
 wxN
 cAY
-vFv
+fRB
 orZ
 orZ
 exD
 orZ
-qQu
+mRP
 cAY
 bPG
 wTs
@@ -10863,8 +10855,8 @@ xNF
 xNF
 xNF
 bPG
-wqJ
-cKA
+iVb
+cvh
 wxN
 gnx
 bPG
@@ -10880,14 +10872,14 @@ fUM
 wsB
 wxN
 cAY
-vFv
+fRB
 orZ
 orZ
 orZ
 orZ
-qQu
+mRP
 cAY
-xpa
+ajh
 wTs
 hAy
 tkO
@@ -11137,12 +11129,12 @@ gec
 pyN
 wxN
 cAY
-ffh
+ohS
 orZ
 aOt
 orZ
 vzp
-qQu
+mRP
 cAY
 maZ
 kjJ
@@ -11380,11 +11372,11 @@ bPG
 ygG
 yeQ
 yeQ
-hfS
+oQf
 vEu
-isY
-uFG
 vQt
+cdu
+kuK
 qKK
 gec
 hoE
@@ -11393,13 +11385,13 @@ iYl
 iYl
 dLD
 wxN
-oIe
+nyA
 rtq
 rtq
 rtq
 rtq
 rtq
-dFe
+aWA
 cAY
 maZ
 nPu
@@ -11649,14 +11641,14 @@ iYl
 iYl
 iYl
 mGF
-eAQ
+qfC
 qdx
-uFG
-uFG
-uFG
+cdu
+cdu
+cdu
 tzZ
-uFG
-uFG
+cdu
+cdu
 san
 bPG
 kke
@@ -12168,11 +12160,11 @@ bPG
 fqj
 wxN
 kUb
-mSG
+gtn
 fqj
 wxN
 kUb
-mSG
+gtn
 rlR
 fdf
 gzw
@@ -12422,15 +12414,15 @@ vJz
 vJz
 vJz
 bPG
-fDY
-kcI
-xwb
-mSG
 wJX
 kcI
-xwb
-mSG
-oWN
+hEt
+gtn
+jyP
+kcI
+hEt
+gtn
+gan
 fdf
 xfT
 uWY
@@ -12679,14 +12671,14 @@ vJz
 vJz
 vJz
 bPG
-dIZ
+dRv
 lzG
 dNW
-aht
-dRv
+joB
+pSY
 lzG
 dNW
-aht
+joB
 wTs
 fdf
 xfT
@@ -12939,11 +12931,11 @@ bPG
 pgU
 pxC
 aTn
-aht
-jyP
+joB
+sKg
 pxC
 aTn
-aht
+joB
 iCC
 tEH
 ouY
@@ -21396,10 +21388,10 @@ tLM
 lIe
 wqx
 xNF
-xkP
-xkP
-xkP
-xkP
+wev
+wev
+wev
+wev
 xNF
 xNF
 xNF
@@ -21653,10 +21645,10 @@ rvy
 wqx
 wqx
 xNF
-xkP
-xkP
-xkP
-xkP
+wev
+wev
+wev
+wev
 xNF
 xNF
 xNF
@@ -21910,10 +21902,10 @@ rTA
 wqx
 wqx
 xNF
-xkP
-xkP
-xkP
-xkP
+wev
+wev
+wev
+wev
 xNF
 xNF
 xNF
@@ -22167,10 +22159,10 @@ fDd
 wqx
 wqx
 xNF
-xkP
-xkP
-xkP
-xkP
+wev
+wev
+wev
+wev
 xNF
 xNF
 xNF
@@ -22424,10 +22416,10 @@ aJR
 wqx
 wqx
 xNF
-xkP
-xkP
-xkP
-xkP
+wev
+wev
+wev
+wev
 xNF
 xNF
 xNF
@@ -22681,10 +22673,10 @@ wqx
 wqx
 wqx
 xNF
-xkP
-xkP
-xkP
-xkP
+wev
+wev
+wev
+wev
 xNF
 xNF
 xNF
@@ -22941,7 +22933,7 @@ ukJ
 ukJ
 wqx
 wqx
-xkP
+wev
 xNF
 xNF
 xNF
@@ -23198,7 +23190,7 @@ wqx
 wqx
 wqx
 wqx
-xkP
+wev
 xNF
 xNF
 xNF
@@ -23455,7 +23447,7 @@ mZn
 mZn
 mZn
 mZn
-xkP
+wev
 xNF
 xNF
 xNF
diff --git a/_maps/map_files/coyote_bayou/foxybarupper.dmm b/_maps/map_files/coyote_bayou/foxybarupper.dmm
index b13a2f329d..9f8ad38fbf 100644
--- a/_maps/map_files/coyote_bayou/foxybarupper.dmm
+++ b/_maps/map_files/coyote_bayou/foxybarupper.dmm
@@ -48,16 +48,6 @@
 	light_color = "#BAF8FF"
 	},
 /area/f13/caves)
-"ar" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -2
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	pixel_x = 32
-	},
-/turf/open/transparent/openspace,
-/area/f13/fb/bar)
 "aG" = (
 /obj/structure/destructible/tribal_torch/wall/lit{
 	dir = 1;
@@ -86,39 +76,17 @@
 	},
 /turf/open/floor/wood_common/wood_common_dark,
 /area/f13/fb/bar)
-"aR" = (
-/obj/structure/dresser{
-	pixel_y = 19;
-	density = 0
-	},
-/obj/machinery/light/small{
-	color = "#444499";
-	dir = 8;
-	light_color = "#444499";
-	light_power = 2;
-	light_range = 2;
-	pixel_y = 13
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#3B2B1A"
-	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 1;
-	color = "#3B2B1A"
+"be" = (
+/obj/effect/overlay/fog/fog2{
+	plane = -2
 	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#3B2B1A"
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	pixel_y = 32
 	},
-/turf/open/floor/carpet/blue,
-/area/f13/fb/bar)
-"be" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 8;
-	color = "#3B2B1A"
+/turf/open/floor/wood_common{
+	color = "#779999"
 	},
-/turf/open/indestructible/cobble/dark,
 /area/f13/fb/bar)
 "bg" = (
 /obj/structure/chair/stool/retro/backed{
@@ -131,8 +99,29 @@
 	color = "#CCCCCC"
 	},
 /area/f13/fb/bar)
+"bm" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 2;
+	color = "#3B2B1A"
+	},
+/turf/open/indestructible/cobble/dark,
+/area/f13/fb/bar)
 "bp" = (
-/turf/open/floor/f13/wood,
+/obj/effect/overlay/fog/fog2{
+	plane = -2
+	},
+/obj/structure/railing{
+	color = "#A47449";
+	dir = 4
+	},
+/obj/item/kirbyplants/random,
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	pixel_y = 32
+	},
+/turf/open/floor/wood_common{
+	color = "#779999"
+	},
 /area/f13/fb/bar)
 "bt" = (
 /obj/effect/overlay/fog/fog2{
@@ -150,16 +139,6 @@
 	},
 /turf/open/transparent/openspace,
 /area/f13/fb/bar)
-"bH" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -2
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	pixel_y = 32
-	},
-/turf/closed/wall/mineral/brick,
-/area/f13/fb/bar)
 "bI" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 1;
@@ -216,6 +195,9 @@
 /obj/item/kirbyplants/random,
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)
+"cR" = (
+/turf/open/floor/f13/wood,
+/area/f13/fb/bar)
 "cV" = (
 /obj/effect/decal/cleanable/glitter/white{
 	color = "#884444"
@@ -237,6 +219,21 @@
 	},
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)
+"dw" = (
+/obj/structure/campfire/stove{
+	density = 0;
+	pixel_y = 22
+	},
+/obj/structure/chair/sofa/corp/right{
+	dir = 8;
+	pixel_x = 8;
+	pixel_y = -3
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/f13/wood,
+/area/f13/fb/bar)
 "dy" = (
 /obj/structure/sign/painting/library{
 	pixel_x = -32
@@ -295,14 +292,15 @@
 /area/f13/wasteland)
 "dD" = (
 /obj/effect/turf_decal/siding/wood{
-	dir = 4;
+	dir = 8;
 	color = "#3B2B1A"
 	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 1;
 	color = "#3B2B1A"
 	},
-/obj/structure/chair/left{
+/obj/structure/chair/right{
+	dir = 2;
 	pixel_y = 4
 	},
 /obj/structure/window/bronze{
@@ -327,17 +325,51 @@
 	},
 /turf/closed/indestructible/f13/obsidian,
 /area/f13/caves)
+"dU" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#3B2B1A"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#3B2B1A"
+	},
+/obj/structure/chair/left{
+	pixel_y = 4
+	},
+/obj/structure/window/bronze{
+	dir = 1;
+	pixel_y = 4
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/wood_common{
+	color = "#99BBBB"
+	},
+/area/f13/fb/bar)
 "ea" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 1;
 	color = "#3B2B1A"
 	},
 /obj/effect/turf_decal/siding/wood/corner{
-	dir = 4;
+	dir = 1;
 	color = "#3B2B1A"
 	},
 /turf/open/floor/carpet/red,
 /area/f13/fb/bar)
+"eg" = (
+/obj/structure/curtain{
+	color = "#c40e0e"
+	},
+/obj/structure/window/fulltile/civ/redsandstone_windownew_full,
+/obj/effect/overlay/fog/fog2{
+	plane = -2
+	},
+/turf/open/floor/wood_common,
+/area/f13/fb/bar)
 "eu" = (
 /obj/structure/simple_door/room,
 /obj/item/lock_bolt,
@@ -357,34 +389,28 @@
 	},
 /area/f13/fb/bar)
 "eL" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#3B2B1A"
-	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 1;
 	color = "#3B2B1A"
 	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 1;
-	color = "#3B2B1A"
+/obj/structure/chair/middle{
+	pixel_y = 4
 	},
-/turf/open/floor/carpet/black,
-/area/f13/fb/bar)
-"eM" = (
 /obj/structure/window/bronze{
 	dir = 1;
-	light_color = "#b5a642";
-	light_range = 1
+	pixel_y = 4
 	},
 /obj/effect/overlay/fog/fog2{
-	plane = -2
+	plane = -2;
+	alpha = 175
 	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
-	pixel_x = 32
+	pixel_y = 32
+	},
+/turf/open/floor/wood_common{
+	color = "#99BBBB"
 	},
-/turf/open/transparent/openspace,
 /area/f13/fb/bar)
 "fo" = (
 /obj/structure/chess/blackbishop,
@@ -442,17 +468,6 @@
 	light_color = "#BAF8FF"
 	},
 /area/f13/caves)
-"gb" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/turf/open/floor/carpet/red,
-/area/f13/fb/bar)
 "gc" = (
 /obj/structure/spacevine{
 	icon = 'icons/effects/effects.dmi';
@@ -618,6 +633,23 @@
 	},
 /turf/open/floor/carpet/red,
 /area/f13/fb/bar)
+"hc" = (
+/obj/item/kirbyplants/random{
+	pixel_y = 22
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	color = "#3B2B1A"
+	},
+/obj/effect/turf_decal/siding/wood{
+	color = "#3B2B1A"
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 8;
+	color = "#3B2B1A"
+	},
+/turf/open/floor/carpet/black,
+/area/f13/fb/bar)
 "hj" = (
 /obj/effect/turf_decal/siding/wood{
 	color = "#3B2B1A"
@@ -663,6 +695,13 @@
 	},
 /turf/open/floor/wood_common/wood_common_dark,
 /area/f13/fb/bar)
+"iD" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4;
+	color = "#3B2B1A"
+	},
+/turf/open/floor/carpet/black,
+/area/f13/fb/bar)
 "iF" = (
 /turf/closed/indestructible/f13/obsidian,
 /area/f13/caves)
@@ -708,39 +747,6 @@
 	color = "#CCCCCC"
 	},
 /area/f13/fb/bar)
-"jg" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/obj/structure/chair/middle{
-	pixel_y = 4
-	},
-/obj/structure/window/bronze{
-	dir = 1;
-	pixel_y = 4
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	pixel_y = 32
-	},
-/turf/open/floor/wood_common{
-	color = "#99BBBB"
-	},
-/area/f13/fb/bar)
-"jt" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -1;
-	alpha = 175
-	},
-/turf/closed/wall/mineral/brick{
-	plane = -1
-	},
-/area/f13/fb/bar)
 "jA" = (
 /obj/structure/chair/sofa/right{
 	dir = 8;
@@ -762,15 +768,25 @@
 /turf/open/floor/carpet/blue,
 /area/f13/fb/bar)
 "jO" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4;
-	color = "#3B2B1A"
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/nightstand/small{
+	pixel_x = 2
 	},
-/turf/closed/wall/mineral/brick,
+/obj/item/flashlight/littlelamp{
+	pixel_x = 1;
+	pixel_y = 2
+	},
+/turf/open/floor/f13/wood,
 /area/f13/fb/bar)
-"jY" = (
-/obj/structure/chess/blackpawn,
-/turf/open/floor/plasteel/f13/whitemarble,
+"jU" = (
+/obj/effect/overlay/fog/fog2{
+	plane = -2
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	pixel_y = 32
+	},
+/turf/closed/wall/mineral/brick,
 /area/f13/fb/bar)
 "kb" = (
 /obj/structure/flora/chomp/shrub0,
@@ -798,11 +814,20 @@
 /turf/open/floor/carpet/red,
 /area/f13/fb/bar)
 "kF" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4;
-	color = "#3B2B1A"
+/obj/effect/decal/cleanable/dirt,
+/obj/item/kirbyplants{
+	icon_state = "plant-18";
+	pixel_x = 8;
+	pixel_y = -2
 	},
-/turf/open/floor/carpet/black,
+/obj/item/flashlight/oldlamp{
+	light_on = 1;
+	light_power = 6;
+	pixel_x = -11;
+	pixel_y = 2;
+	on = 1
+	},
+/turf/open/floor/f13/wood,
 /area/f13/fb/bar)
 "kQ" = (
 /obj/structure/closet/crate/bin,
@@ -835,6 +860,19 @@
 	color = "#666666"
 	},
 /area/f13/fb/bar)
+"lB" = (
+/obj/effect/overlay/fog/fog2{
+	plane = -2
+	},
+/obj/item/kirbyplants/random,
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	pixel_y = 32
+	},
+/turf/open/floor/wood_common{
+	color = "#779999"
+	},
+/area/f13/fb/bar)
 "lR" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4;
@@ -856,30 +894,10 @@
 	plane = -2;
 	alpha = 175
 	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175;
-	pixel_x = 32
-	},
 /turf/open/floor/wood_common{
 	color = "#99BBBB"
 	},
 /area/f13/fb/bar)
-"lS" = (
-/obj/structure/window/bronze{
-	dir = 1;
-	light_color = "#b5a642";
-	light_range = 1
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	pixel_x = -32
-	},
-/turf/open/transparent/openspace,
-/area/f13/fb/bar)
 "mu" = (
 /obj/effect/turf_decal/siding/wood{
 	color = "#3B2B1A"
@@ -983,6 +1001,21 @@
 	},
 /turf/open/floor/carpet/arcade,
 /area/f13/fb/bar)
+"mQ" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	color = "#3B2B1A"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#3B2B1A"
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1;
+	color = "#3B2B1A"
+	},
+/turf/open/floor/carpet/black,
+/area/f13/fb/bar)
 "nc" = (
 /obj/machinery/vending/coffee,
 /obj/item/storage/box/drinkingglasses{
@@ -1017,6 +1050,13 @@
 	},
 /turf/open/floor/carpet/blue,
 /area/f13/fb/bar)
+"nF" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	color = "#3B2B1A"
+	},
+/turf/open/indestructible/cobble/dark,
+/area/f13/fb/bar)
 "nH" = (
 /obj/effect/turf_decal/siding/wood{
 	color = "#3B2B1A"
@@ -1089,21 +1129,11 @@
 	},
 /area/f13/fb/bar)
 "oD" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -2
-	},
-/obj/structure/railing{
-	color = "#A47449";
-	dir = 4
-	},
-/obj/item/kirbyplants/random,
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	pixel_y = 32
-	},
-/turf/open/floor/wood_common{
-	color = "#779999"
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1;
+	color = "#3B2B1A"
 	},
+/turf/open/floor/carpet/black,
 /area/f13/fb/bar)
 "oI" = (
 /obj/effect/turf_decal/siding/wood{
@@ -1141,21 +1171,31 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)
 "pc" = (
-/obj/item/kirbyplants/random{
-	pixel_y = 22
+/obj/structure/dresser{
+	pixel_y = 19;
+	density = 0
 	},
-/obj/effect/turf_decal/siding/wood{
+/obj/machinery/light/small{
+	color = "#444499";
 	dir = 8;
-	color = "#3B2B1A"
+	light_color = "#444499";
+	light_power = 2;
+	light_range = 2;
+	pixel_y = 13
 	},
 /obj/effect/turf_decal/siding/wood{
+	dir = 8;
 	color = "#3B2B1A"
 	},
 /obj/effect/turf_decal/siding/wood/corner{
-	dir = 8;
+	dir = 1;
 	color = "#3B2B1A"
 	},
-/turf/open/floor/carpet/black,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#3B2B1A"
+	},
+/turf/open/floor/carpet/blue,
 /area/f13/fb/bar)
 "pd" = (
 /obj/effect/turf_decal/siding/wood{
@@ -1191,19 +1231,56 @@
 /obj/structure/table/wood/settler,
 /turf/open/floor/wood_common/wood_common_dark,
 /area/f13/fb/bar)
-"pL" = (
+"pv" = (
 /obj/effect/turf_decal/siding/wood/corner{
 	dir = 4;
 	color = "#3B2B1A"
 	},
 /turf/open/indestructible/cobble/dark,
 /area/f13/fb/bar)
-"qp" = (
+"pL" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#3B2B1A"
+	},
 /obj/effect/turf_decal/siding/wood{
+	color = "#3B2B1A"
+	},
+/obj/structure/chair/right{
 	dir = 1;
+	plane = -2;
+	pixel_y = -4
+	},
+/obj/structure/window/bronze{
+	plane = -2;
+	pixel_y = -4
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175;
+	pixel_x = 32
+	},
+/turf/open/floor/wood_common{
+	color = "#99BBBB"
+	},
+/area/f13/fb/bar)
+"qo" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 8;
 	color = "#3B2B1A"
 	},
-/turf/open/indestructible/cobble/dark,
+/turf/open/floor/carpet/red,
+/area/f13/fb/bar)
+"qp" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4;
+	color = "#3B2B1A"
+	},
+/turf/open/floor/carpet/red,
 /area/f13/fb/bar)
 "qq" = (
 /obj/structure/destructible/tribal_torch/wall/lit{
@@ -1216,6 +1293,13 @@
 	},
 /turf/open/indestructible/cobble/dark,
 /area/f13/fb/bar)
+"qC" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#3B2B1A"
+	},
+/turf/open/indestructible/cobble/dark,
+/area/f13/fb/bar)
 "qW" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 1;
@@ -1284,21 +1368,21 @@
 /obj/structure/bookcase,
 /turf/open/floor/wood_common/wood_common_dark,
 /area/f13/fb/bar)
-"ry" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants{
-	icon_state = "plant-18";
-	pixel_x = 8;
-	pixel_y = -2
+"ru" = (
+/obj/structure/curtain{
+	color = "#c40e0e"
 	},
-/obj/item/flashlight/oldlamp{
-	light_on = 1;
-	light_power = 6;
-	pixel_x = -11;
-	pixel_y = 2;
-	on = 1
+/obj/structure/window/fulltile/civ/windowclear,
+/obj/effect/overlay/fog/fog2{
+	plane = -2
+	},
+/turf/open/floor/wood_common,
+/area/f13/fb/bar)
+"ry" = (
+/obj/structure/chess/blackpawn,
+/turf/open/floor/plasteel/f13/whitemarble{
+	color = "#666666"
 	},
-/turf/open/floor/f13/wood,
 /area/f13/fb/bar)
 "rA" = (
 /obj/structure/destructible/tribal_torch/wall/lit{
@@ -1307,6 +1391,31 @@
 	},
 /turf/open/indestructible/cobble/dark,
 /area/f13/fb/bar)
+"rM" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	color = "#3B2B1A"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#3B2B1A"
+	},
+/obj/structure/chair/right{
+	dir = 2;
+	pixel_y = 4
+	},
+/obj/structure/window/bronze{
+	dir = 1;
+	pixel_y = 4
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/wood_common{
+	color = "#99BBBB"
+	},
+/area/f13/fb/bar)
 "rV" = (
 /obj/structure/spacevine{
 	icon = 'icons/effects/effects.dmi';
@@ -1397,20 +1506,16 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)
 "sJ" = (
-/turf/open/floor/plasteel/f13/whitemarble{
-	color = "#666666"
-	},
-/area/f13/fb/bar)
-"tg" = (
 /obj/effect/turf_decal/siding/wood{
-	dir = 4;
+	dir = 8;
 	color = "#3B2B1A"
 	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 1;
 	color = "#3B2B1A"
 	},
-/obj/structure/chair/left{
+/obj/structure/chair/right{
+	dir = 2;
 	pixel_y = 4
 	},
 /obj/structure/window/bronze{
@@ -1421,10 +1526,47 @@
 	plane = -2;
 	alpha = 175
 	},
+/obj/machinery/light/small{
+	color = "#444499";
+	dir = 8;
+	light_color = "#444499";
+	light_power = 2;
+	light_range = 2;
+	pixel_y = 13
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	pixel_y = 32
+	},
 /turf/open/floor/wood_common{
 	color = "#99BBBB"
 	},
 /area/f13/fb/bar)
+"ta" = (
+/obj/effect/overlay/fog/fog2{
+	plane = -2
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	pixel_x = 32
+	},
+/turf/open/transparent/openspace,
+/area/f13/fb/bar)
+"tg" = (
+/obj/structure/window/bronze{
+	dir = 1;
+	light_color = "#b5a642";
+	light_range = 1
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	pixel_x = -32
+	},
+/turf/open/transparent/openspace,
+/area/f13/fb/bar)
 "tq" = (
 /obj/structure/flora/chomp/thicket2,
 /obj/effect/overlay/fog/fog2{
@@ -1471,41 +1613,14 @@
 	},
 /area/f13/caves)
 "tF" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#3B2B1A"
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/obj/structure/chair/right{
-	dir = 2;
-	pixel_y = 4
-	},
-/obj/structure/window/bronze{
-	dir = 1;
-	pixel_y = 4
-	},
 /obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/obj/machinery/light/small{
-	color = "#444499";
-	dir = 8;
-	light_color = "#444499";
-	light_power = 2;
-	light_range = 2;
-	pixel_y = 13
+	plane = -2
 	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	pixel_y = 32
 	},
-/turf/open/floor/wood_common{
-	color = "#99BBBB"
-	},
+/turf/open/transparent/openspace,
 /area/f13/fb/bar)
 "tH" = (
 /obj/structure/window/bronze/fulltile,
@@ -1606,6 +1721,13 @@
 /obj/structure/chess/whiteking,
 /turf/open/floor/plasteel/f13/whitemarble,
 /area/f13/fb/bar)
+"um" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 8;
+	color = "#3B2B1A"
+	},
+/turf/open/floor/carpet/black,
+/area/f13/fb/bar)
 "uu" = (
 /obj/structure/chair/sofa/corner{
 	dir = 1;
@@ -1667,9 +1789,6 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
-"ve" = (
-/turf/open/floor/plasteel/f13/whitemarble,
-/area/f13/fb/bar)
 "vk" = (
 /obj/effect/turf_decal/siding/wood{
 	color = "#3B2B1A"
@@ -1695,11 +1814,14 @@
 /turf/open/indestructible/cobble/dark,
 /area/f13/fb/bar)
 "vC" = (
+/obj/effect/turf_decal/siding/wood{
+	color = "#3B2B1A"
+	},
 /obj/effect/turf_decal/siding/wood/corner{
 	dir = 8;
 	color = "#3B2B1A"
 	},
-/turf/open/floor/carpet/black,
+/turf/open/floor/carpet/red,
 /area/f13/fb/bar)
 "vE" = (
 /obj/structure/chair/stool/retro/tan,
@@ -1715,15 +1837,6 @@
 	},
 /turf/open/floor/carpet/red,
 /area/f13/fb/bar)
-"vX" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 8;
-	color = "#3B2B1A"
-	},
-/turf/closed{
-	icon_state = "black"
-	},
-/area)
 "wl" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4;
@@ -1794,31 +1907,18 @@
 /obj/effect/overlay/fog/fog2{
 	plane = -2
 	},
-/turf/closed/wall/mineral/brick,
-/area/f13/fb/bar)
-"wM" = (
-/obj/item/kirbyplants/random,
-/turf/open/floor/wood_common/wood_common_dark,
-/area/f13/fb/bar)
-"wV" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/turf/open/floor/carpet/black,
-/area/f13/fb/bar)
-"xd" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -2
-	},
-/obj/item/kirbyplants/random,
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	pixel_y = 32
-	},
-/turf/open/floor/wood_common{
-	color = "#779999"
+/turf/closed/wall/mineral/brick,
+/area/f13/fb/bar)
+"wM" = (
+/obj/item/kirbyplants/random,
+/turf/open/floor/wood_common/wood_common_dark,
+/area/f13/fb/bar)
+"xd" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4;
+	color = "#3B2B1A"
 	},
+/turf/closed/wall/mineral/brick,
 /area/f13/fb/bar)
 "xI" = (
 /obj/structure/bed/wooden,
@@ -1850,6 +1950,20 @@
 	},
 /turf/open/floor/carpet/blue,
 /area/f13/fb/bar)
+"xS" = (
+/obj/structure/railing{
+	color = "#A47449";
+	dir = 4
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	pixel_y = 32
+	},
+/turf/open/transparent/openspace,
+/area/f13/fb/bar)
 "xX" = (
 /obj/effect/turf_decal/siding/wideplating/dark{
 	dir = 9
@@ -1921,6 +2035,11 @@
 	light_range = 2;
 	pixel_y = 13
 	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175;
+	pixel_x = 32
+	},
 /turf/open/floor/wood_common{
 	color = "#99BBBB"
 	},
@@ -1937,6 +2056,34 @@
 	},
 /turf/open/floor/f13/wood,
 /area/f13/fb/bar)
+"yr" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#3B2B1A"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#3B2B1A"
+	},
+/obj/structure/chair/left{
+	pixel_y = 4
+	},
+/obj/structure/window/bronze{
+	dir = 1;
+	pixel_y = 4
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	pixel_y = 32
+	},
+/turf/open/floor/wood_common{
+	color = "#99BBBB"
+	},
+/area/f13/fb/bar)
 "ys" = (
 /obj/structure/chair/stool/retro/backed,
 /obj/effect/turf_decal/siding/wood{
@@ -1960,11 +2107,8 @@
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)
 "yE" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#3B2B1A"
-	},
-/turf/open/indestructible/cobble/dark,
+/obj/structure/chess/blackpawn,
+/turf/open/floor/plasteel/f13/whitemarble,
 /area/f13/fb/bar)
 "yH" = (
 /obj/structure/spacevine{
@@ -2045,17 +2189,6 @@
 	light_color = "#BAF8FF"
 	},
 /area/f13/caves)
-"za" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/nightstand/small{
-	pixel_x = 2
-	},
-/obj/item/flashlight/littlelamp{
-	pixel_x = 1;
-	pixel_y = 2
-	},
-/turf/open/floor/f13/wood,
-/area/f13/fb/bar)
 "ze" = (
 /obj/structure/closet{
 	pixel_x = 8
@@ -2149,24 +2282,10 @@
 	},
 /turf/open/floor/carpet/red,
 /area/f13/fb/bar)
-"zS" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/turf/open/indestructible/cobble/dark,
-/area/f13/fb/bar)
 "zZ" = (
 /obj/structure/chess/whitepawn,
 /turf/open/floor/plasteel/f13/whitemarble,
 /area/f13/fb/bar)
-"Af" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 8;
-	color = "#3B2B1A"
-	},
-/turf/open/floor/carpet/red,
-/area/f13/fb/bar)
 "Ag" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 8;
@@ -2176,34 +2295,15 @@
 	color = "#CCCCCC"
 	},
 /area/f13/fb/bar)
-"AI" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#3B2B1A"
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/obj/structure/chair/right{
-	dir = 2;
-	pixel_y = 4
-	},
-/obj/structure/window/bronze{
-	dir = 1;
-	pixel_y = 4
-	},
+"Ah" = (
 /obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
+	plane = -2
 	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
-	pixel_y = 32
-	},
-/turf/open/floor/wood_common{
-	color = "#99BBBB"
+	pixel_x = -32
 	},
+/turf/open/transparent/openspace,
 /area/f13/fb/bar)
 "AR" = (
 /obj/structure/spacevine{
@@ -2237,11 +2337,12 @@
 	light_color = "#BAF8FF"
 	},
 /area/f13/caves)
-"Ba" = (
-/obj/structure/chess/blackpawn,
-/turf/open/floor/plasteel/f13/whitemarble{
-	color = "#666666"
+"Bb" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1;
+	color = "#3B2B1A"
 	},
+/turf/open/indestructible/cobble/dark,
 /area/f13/fb/bar)
 "Bt" = (
 /obj/structure/spacevine{
@@ -2316,6 +2417,17 @@
 	},
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)
+"CP" = (
+/obj/structure/window/bronze{
+	dir = 1;
+	light_color = "#b5a642";
+	light_range = 1
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2
+	},
+/turf/open/transparent/openspace,
+/area/f13/fb/bar)
 "CW" = (
 /obj/machinery/libraryscanner,
 /turf/open/floor/wood_common/wood_common_dark,
@@ -2326,23 +2438,6 @@
 /obj/item/pen,
 /turf/open/floor/wood_common/wood_common_dark,
 /area/f13/fb/bar)
-"Dd" = (
-/obj/structure/curtain{
-	color = "#c40e0e"
-	},
-/obj/structure/window/fulltile/civ/windowclear,
-/obj/effect/overlay/fog/fog2{
-	plane = -2
-	},
-/turf/open/floor/wood_common,
-/area/f13/fb/bar)
-"Dg" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 4;
-	color = "#3B2B1A"
-	},
-/turf/open/indestructible/cobble/dark,
-/area/f13/fb/bar)
 "Dh" = (
 /obj/machinery/light/small{
 	light_power = 2;
@@ -2353,53 +2448,6 @@
 /obj/item/kirbyplants/random,
 /turf/open/floor/carpet/red,
 /area/f13/fb/bar)
-"Dw" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#3B2B1A"
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/obj/structure/chair/right{
-	dir = 2;
-	pixel_y = 4
-	},
-/obj/structure/window/bronze{
-	dir = 1;
-	pixel_y = 4
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/obj/machinery/light/small{
-	color = "#444499";
-	dir = 8;
-	light_color = "#444499";
-	light_power = 2;
-	light_range = 2;
-	pixel_y = 13
-	},
-/turf/open/floor/wood_common{
-	color = "#99BBBB"
-	},
-/area/f13/fb/bar)
-"DC" = (
-/obj/structure/railing{
-	color = "#A47449";
-	dir = 4
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	pixel_y = 32
-	},
-/turf/open/transparent/openspace,
-/area/f13/fb/bar)
 "DJ" = (
 /turf/open/floor/carpet/blue,
 /area/f13/fb/bar)
@@ -2411,14 +2459,17 @@
 /turf/open/floor/wood_common/wood_common_dark,
 /area/f13/fb/bar)
 "DY" = (
-/obj/structure/curtain{
-	color = "#c40e0e"
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
 	},
-/obj/structure/window/fulltile/civ/redsandstone_windownew_full,
 /obj/effect/overlay/fog/fog2{
-	plane = -2
+	plane = -1;
+	alpha = 175
+	},
+/turf/closed/wall/mineral/brick{
+	plane = -1
 	},
-/turf/open/floor/wood_common,
 /area/f13/fb/bar)
 "Ec" = (
 /obj/machinery/light/small{
@@ -2561,6 +2612,10 @@
 	color = "#666666"
 	},
 /area/f13/fb/bar)
+"Fg" = (
+/obj/structure/rug/carpet,
+/turf/open/floor/f13/wood,
+/area/f13/fb/bar)
 "Fo" = (
 /obj/structure/window/bronze{
 	dir = 1;
@@ -2570,6 +2625,10 @@
 /obj/effect/overlay/fog/fog2{
 	plane = -2
 	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	pixel_x = 32
+	},
 /turf/open/transparent/openspace,
 /area/f13/fb/bar)
 "Fq" = (
@@ -2597,6 +2656,13 @@
 	},
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)
+"FS" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 8;
+	color = "#3B2B1A"
+	},
+/turf/open/indestructible/cobble/dark,
+/area/f13/fb/bar)
 "Gv" = (
 /obj/machinery/computer/slot_machine{
 	pixel_y = 16;
@@ -2639,75 +2705,23 @@
 	icon = 'icons/effects/effects.dmi';
 	icon_state = "smoke";
 	name = "steam";
-	pixel_y = 12;
-	pixel_x = 17
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2
-	},
-/turf/open/indestructible/ground/outside/water{
-	name = "hot spring";
-	color = "#90DBFE";
-	light_range = 2;
-	light_power = 2;
-	light_color = "#BAF8FF"
-	},
-/area/f13/caves)
-"Ht" = (
-/obj/effect/turf_decal/siding/wood{
-	color = "#3B2B1A"
-	},
-/turf/open/indestructible/cobble/dark,
-/area/f13/fb/bar)
-"Hy" = (
-/obj/structure/sign/painting/library{
-	pixel_x = -32
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#3B2B1A"
-	},
-/obj/structure/table/abductor,
-/obj/item/reagent_containers/food/condiment/saltshaker{
-	pixel_x = 11;
-	pixel_y = 5;
-	layer = 4
-	},
-/obj/item/reagent_containers/food/condiment/peppermill{
-	pixel_x = 10;
-	pixel_y = 1;
-	layer = 4
-	},
-/obj/item/reagent_containers/food/condiment/ketchup{
-	pixel_y = 6;
-	pixel_x = 4
+	pixel_y = 12;
+	pixel_x = 17
 	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2
 	},
-/obj/machinery/light/small{
-	color = "#444499";
-	dir = 4;
-	light_color = "#444499";
-	light_power = 2;
+/turf/open/indestructible/ground/outside/water{
+	name = "hot spring";
+	color = "#90DBFE";
 	light_range = 2;
-	pixel_y = 13
-	},
-/obj/machinery/light/small{
-	color = "#444499";
-	dir = 4;
-	light_color = "#444499";
 	light_power = 2;
-	light_range = 2;
-	pixel_y = 13
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175;
-	pixel_x = 32
+	light_color = "#BAF8FF"
 	},
-/turf/open/floor/wood_common{
-	color = "#99BBBB"
+/area/f13/caves)
+"Ht" = (
+/turf/open/floor/plasteel/f13/whitemarble{
+	color = "#666666"
 	},
 /area/f13/fb/bar)
 "HH" = (
@@ -2742,6 +2756,44 @@
 	},
 /turf/open/floor/carpet/arcade,
 /area/f13/fb/bar)
+"HT" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#3B2B1A"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#3B2B1A"
+	},
+/obj/structure/chair/left{
+	pixel_y = 4
+	},
+/obj/structure/window/bronze{
+	dir = 1;
+	pixel_y = 4
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175;
+	pixel_x = 32
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	pixel_y = 32
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	pixel_y = 32;
+	pixel_x = 32
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/wood_common{
+	color = "#99BBBB"
+	},
+/area/f13/fb/bar)
 "Ib" = (
 /obj/machinery/vending/cigarette{
 	density = 0;
@@ -2810,9 +2862,6 @@
 	dir = 1;
 	color = "#3B2B1A"
 	},
-/obj/machinery/computer/arcade{
-	density = 0
-	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 4;
 	color = "#3B2B1A"
@@ -2821,6 +2870,9 @@
 	dir = 4;
 	color = "#3B2B1A"
 	},
+/obj/machinery/computer/arcade{
+	density = 0
+	},
 /turf/open/floor/carpet/arcade,
 /area/f13/fb/bar)
 "JQ" = (
@@ -2871,14 +2923,11 @@
 	},
 /area/f13/fb/bar)
 "Kp" = (
-/obj/effect/turf_decal/siding/wood{
-	color = "#3B2B1A"
-	},
 /obj/effect/turf_decal/siding/wood/corner{
-	dir = 8;
+	dir = 2;
 	color = "#3B2B1A"
 	},
-/turf/open/floor/carpet/red,
+/turf/open/floor/carpet/black,
 /area/f13/fb/bar)
 "Kz" = (
 /obj/structure/destructible/tribal_torch/wall/lit{
@@ -2958,14 +3007,7 @@
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)
 "LF" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -2
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	pixel_y = 32
-	},
-/turf/open/transparent/openspace,
+/turf/open/floor/plasteel/f13/whitemarble,
 /area/f13/fb/bar)
 "Mv" = (
 /obj/structure/chair/sofa/right{
@@ -3002,6 +3044,13 @@
 	color = "#B18770"
 	},
 /area/f13/caves)
+"MX" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1;
+	color = "#3B2B1A"
+	},
+/turf/open/floor/carpet/red,
+/area/f13/fb/bar)
 "Nf" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4;
@@ -3035,6 +3084,15 @@
 /obj/item/kirbyplants/random,
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)
+"NE" = (
+/obj/effect/overlay/fog/fog2{
+	plane = -1;
+	alpha = 175
+	},
+/turf/closed/wall/mineral/brick{
+	plane = -1
+	},
+/area/f13/fb/bar)
 "NT" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4;
@@ -3259,13 +3317,6 @@
 	},
 /turf/open/transparent/openspace,
 /area/f13/fb/bar)
-"Qg" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 2;
-	color = "#3B2B1A"
-	},
-/turf/open/floor/carpet/black,
-/area/f13/fb/bar)
 "Ql" = (
 /obj/structure/railing/wood/post{
 	pixel_x = -16
@@ -3284,6 +3335,15 @@
 	color = "#666666"
 	},
 /area/f13/fb/bar)
+"QJ" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 8;
+	color = "#3B2B1A"
+	},
+/turf/closed{
+	icon_state = "black"
+	},
+/area)
 "QR" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4;
@@ -3302,22 +3362,18 @@
 	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
-	alpha = 175;
-	pixel_x = 32
+	alpha = 175
 	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
-	pixel_y = 32
+	alpha = 175;
+	pixel_x = 32
 	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	pixel_y = 32;
 	pixel_x = 32
 	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
 /turf/open/floor/wood_common{
 	color = "#99BBBB"
 	},
@@ -3337,20 +3393,12 @@
 	color = "#CCCCCC"
 	},
 /area/f13/fb/bar)
-"Ra" = (
-/obj/structure/campfire/stove{
-	density = 0;
-	pixel_y = 22
-	},
-/obj/structure/chair/sofa/corp/right{
-	dir = 8;
-	pixel_x = 8;
-	pixel_y = -3
-	},
-/obj/machinery/light{
-	dir = 4
+"QY" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#3B2B1A"
 	},
-/turf/open/floor/f13/wood,
+/turf/open/indestructible/cobble/dark,
 /area/f13/fb/bar)
 "Re" = (
 /obj/effect/turf_decal/siding/wood{
@@ -3370,23 +3418,51 @@
 	color = "#CCCCCC"
 	},
 /area/f13/fb/bar)
-"Rm" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4;
-	color = "#3B2B1A"
-	},
-/turf/open/floor/carpet/red,
-/area/f13/fb/bar)
-"Ro" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/f13/wood,
-/area/f13/fb/bar)
 "Rp" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 2;
+/obj/structure/sign/painting/library{
+	pixel_x = -32
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
 	color = "#3B2B1A"
 	},
-/turf/open/indestructible/cobble/dark,
+/obj/structure/table/abductor,
+/obj/item/reagent_containers/food/condiment/saltshaker{
+	pixel_x = 11;
+	pixel_y = 5;
+	layer = 4
+	},
+/obj/item/reagent_containers/food/condiment/peppermill{
+	pixel_x = 10;
+	pixel_y = 1;
+	layer = 4
+	},
+/obj/item/reagent_containers/food/condiment/ketchup{
+	pixel_y = 6;
+	pixel_x = 4
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2
+	},
+/obj/machinery/light/small{
+	color = "#444499";
+	dir = 4;
+	light_color = "#444499";
+	light_power = 2;
+	light_range = 2;
+	pixel_y = 13
+	},
+/obj/machinery/light/small{
+	color = "#444499";
+	dir = 4;
+	light_color = "#444499";
+	light_power = 2;
+	light_range = 2;
+	pixel_y = 13
+	},
+/turf/open/floor/wood_common{
+	color = "#99BBBB"
+	},
 /area/f13/fb/bar)
 "Rs" = (
 /obj/structure/table/wood/settler,
@@ -3439,6 +3515,14 @@
 	plane = -2;
 	alpha = 175
 	},
+/obj/machinery/light/small{
+	color = "#444499";
+	dir = 8;
+	light_color = "#444499";
+	light_power = 2;
+	light_range = 2;
+	pixel_y = 13
+	},
 /turf/open/floor/wood_common{
 	color = "#99BBBB"
 	},
@@ -3552,68 +3636,26 @@
 	},
 /obj/effect/turf_decal/siding/wood/corner{
 	dir = 8;
-	color = "#3B2B1A"
-	},
-/turf/open/floor/carpet/arcade,
-/area/f13/fb/bar)
-"Tt" = (
-/obj/structure/rug/carpet,
-/turf/open/floor/f13/wood,
-/area/f13/fb/bar)
-"Tu" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -1;
-	alpha = 175
-	},
-/turf/closed/wall/mineral/brick{
-	plane = -1
-	},
-/area/f13/fb/bar)
-"TR" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -2
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	pixel_x = -32
-	},
-/turf/open/transparent/openspace,
-/area/f13/fb/bar)
-"Ud" = (
-/obj/structure/chess/blackrook,
-/turf/open/floor/plasteel/f13/whitemarble{
-	color = "#666666"
-	},
-/area/f13/fb/bar)
-"Uf" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 4;
-	color = "#3B2B1A"
-	},
-/obj/effect/turf_decal/siding/wood{
-	color = "#3B2B1A"
-	},
-/obj/structure/chair/right{
-	dir = 1;
-	plane = -2;
-	pixel_y = -4
-	},
-/obj/structure/window/bronze{
-	plane = -2;
-	pixel_y = -4
+	color = "#3B2B1A"
 	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
+/turf/open/floor/carpet/arcade,
+/area/f13/fb/bar)
+"Tu" = (
+/obj/effect/turf_decal/siding/wood{
+	color = "#3B2B1A"
 	},
-/turf/open/floor/wood_common{
-	color = "#99BBBB"
+/turf/open/indestructible/cobble/dark,
+/area/f13/fb/bar)
+"Ud" = (
+/obj/structure/chess/blackrook,
+/turf/open/floor/plasteel/f13/whitemarble{
+	color = "#666666"
 	},
 /area/f13/fb/bar)
+"Uf" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/f13/wood,
+/area/f13/fb/bar)
 "Um" = (
 /obj/structure/spacevine{
 	icon = 'icons/effects/effects.dmi';
@@ -3772,18 +3814,6 @@
 	},
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)
-"Vs" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -2
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	pixel_y = 32
-	},
-/turf/open/floor/wood_common{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
 "VG" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 8;
@@ -3854,40 +3884,6 @@
 	color = "#666666"
 	},
 /area/f13/fb/bar)
-"Wx" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 4;
-	color = "#3B2B1A"
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/obj/structure/chair/left{
-	pixel_y = 4
-	},
-/obj/structure/window/bronze{
-	dir = 1;
-	pixel_y = 4
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175;
-	pixel_x = 32
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	pixel_y = 32;
-	pixel_x = 32
-	},
-/turf/open/floor/wood_common{
-	color = "#99BBBB"
-	},
-/area/f13/fb/bar)
 "Wz" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 8;
@@ -4038,6 +4034,17 @@
 	},
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)
+"Ys" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#3B2B1A"
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4;
+	color = "#3B2B1A"
+	},
+/turf/open/floor/carpet/red,
+/area/f13/fb/bar)
 "Yu" = (
 /obj/structure/spacevine{
 	icon = 'icons/effects/effects.dmi';
@@ -4066,13 +4073,6 @@
 /obj/machinery/door/unpowered/securedoor,
 /turf/open/floor/carpet/red,
 /area/f13/fb/bar)
-"YC" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/turf/open/floor/carpet/red,
-/area/f13/fb/bar)
 "YD" = (
 /obj/structure/spacevine{
 	icon = 'icons/effects/effects.dmi';
@@ -7044,7 +7044,7 @@ il
 il
 il
 il
-bH
+jU
 wB
 wB
 wB
@@ -7301,14 +7301,14 @@ kf
 wn
 ki
 il
-tF
+sJ
 dz
 nM
-jt
-Dw
+NE
+RF
 EX
 nM
-jt
+NE
 nZ
 nZ
 nZ
@@ -7558,14 +7558,14 @@ kf
 vU
 Ex
 il
-jg
+eL
 if
 oI
-Tu
+DY
 qW
 if
 oI
-Tu
+DY
 nZ
 nZ
 nZ
@@ -7815,14 +7815,14 @@ kf
 vU
 Dh
 il
-dD
+yr
 Nf
-Uf
-Tu
-tg
+lR
+DY
+dU
 Nf
-Uf
-Tu
+lR
+DY
 nZ
 nZ
 nZ
@@ -8072,14 +8072,14 @@ kf
 vU
 ln
 il
-Vs
+be
 XR
 UD
 wB
 XR
 XR
 UD
-DY
+eg
 nZ
 nZ
 nZ
@@ -8307,9 +8307,9 @@ dS
 nZ
 nZ
 il
-ry
-Tt
-za
+kF
+Fg
+jO
 il
 il
 il
@@ -8326,17 +8326,17 @@ iA
 pj
 Oq
 Oq
-YC
+MX
 cs
 il
-DC
+xS
 UK
 Qf
 wB
 Qf
 JQ
 Qf
-DY
+eg
 nZ
 nZ
 nZ
@@ -8564,12 +8564,12 @@ dS
 nZ
 nZ
 il
-bp
-Ro
-Ro
+cR
+Uf
+Uf
 il
-eL
-pc
+mQ
+hc
 il
 VN
 uu
@@ -8586,14 +8586,14 @@ vv
 vv
 Ex
 il
-xd
+lB
 XR
 XR
 wB
 XR
 XR
 vb
-DY
+eg
 nZ
 nZ
 nZ
@@ -8821,7 +8821,7 @@ dS
 nZ
 nZ
 il
-Ra
+dw
 yn
 Ql
 OD
@@ -8850,7 +8850,7 @@ yJ
 ZT
 ZT
 OF
-DY
+eg
 nZ
 nZ
 nZ
@@ -9091,14 +9091,14 @@ il
 Qe
 gi
 zr
-vC
+um
 Ll
 cQ
-gb
-Kp
+ea
+vC
 VG
-lS
-TR
+tg
+Ah
 bt
 bt
 bt
@@ -9107,7 +9107,7 @@ bt
 bt
 bt
 bt
-Dd
+ru
 nZ
 nZ
 nZ
@@ -9336,7 +9336,7 @@ CA
 dS
 dS
 il
-aR
+pc
 sd
 il
 cV
@@ -9351,10 +9351,10 @@ zr
 zr
 zr
 zr
-ea
+Ys
 Wj
 UB
-Fo
+CP
 bt
 bt
 bt
@@ -9364,7 +9364,7 @@ bt
 bt
 bt
 bt
-Dd
+ru
 nZ
 nZ
 nZ
@@ -9611,7 +9611,7 @@ zr
 vU
 zL
 UB
-Fo
+CP
 bt
 bt
 bt
@@ -9621,7 +9621,7 @@ bt
 bt
 bt
 bt
-Dd
+ru
 nZ
 nZ
 nZ
@@ -9850,7 +9850,7 @@ XW
 XW
 dS
 il
-jO
+xd
 il
 il
 nX
@@ -9868,7 +9868,7 @@ zr
 XK
 mu
 hj
-Fo
+CP
 bt
 bt
 bt
@@ -9878,7 +9878,7 @@ bt
 bt
 bt
 bt
-Dd
+ru
 nZ
 nZ
 nZ
@@ -10110,13 +10110,13 @@ RJ
 RJ
 RJ
 RJ
-wV
-vC
+oD
+um
 RU
 WI
 yj
 dy
-wV
+oD
 zr
 zr
 zr
@@ -10125,7 +10125,7 @@ ph
 vU
 zL
 UB
-Fo
+CP
 bt
 bt
 bt
@@ -10135,7 +10135,7 @@ bt
 bt
 bt
 bt
-Dd
+ru
 nZ
 nZ
 nZ
@@ -10367,7 +10367,7 @@ Jp
 Jp
 Jp
 Jp
-kF
+iD
 zr
 zr
 zr
@@ -10379,10 +10379,10 @@ zr
 LE
 zr
 zr
-gb
-Kp
+ea
+vC
 UB
-Fo
+CP
 bt
 bt
 bt
@@ -10392,7 +10392,7 @@ bt
 bt
 bt
 bt
-Dd
+ru
 nZ
 nZ
 nZ
@@ -10633,14 +10633,14 @@ zr
 zr
 zr
 zr
-Qg
+Kp
 ZQ
 NT
-ea
+Ys
 Wj
 bP
-eM
-ar
+Fo
+ta
 bt
 Qf
 Qf
@@ -10649,7 +10649,7 @@ Qf
 Qf
 Qf
 Qf
-Dd
+ru
 nZ
 nZ
 nZ
@@ -10906,7 +10906,7 @@ KH
 XR
 XR
 tL
-DY
+eg
 nZ
 nZ
 nZ
@@ -11139,7 +11139,7 @@ nZ
 nZ
 il
 nX
-Qg
+Kp
 zu
 Jp
 Jp
@@ -11156,14 +11156,14 @@ BS
 Re
 Wz
 il
-oD
+bp
 XR
 ZT
 wB
 ZT
 XR
 eI
-DY
+eg
 nZ
 nZ
 nZ
@@ -11413,14 +11413,14 @@ BS
 gT
 Rs
 il
-LF
+tF
 oB
 WO
 wB
 bt
 oB
 bB
-DY
+eg
 nZ
 nZ
 nZ
@@ -11665,19 +11665,19 @@ gs
 il
 pq
 vU
-Af
+qo
 nH
 aL
 gy
 il
-Vs
+be
 XR
 UD
 wB
 XR
 XR
 UD
-DY
+eg
 nZ
 nZ
 nZ
@@ -11922,19 +11922,19 @@ pd
 il
 CY
 wl
-Rm
-Af
+qp
+qo
 Oq
 nH
 il
-AI
+dD
 wo
 nM
-jt
-RF
+NE
+rM
 wo
 nM
-jt
+NE
 nZ
 nZ
 nZ
@@ -12181,17 +12181,17 @@ MD
 fw
 wl
 su
-Rm
+qp
 zL
 il
-jg
+eL
 if
 oI
-Tu
+DY
 qW
 if
 oI
-Tu
+DY
 nZ
 nZ
 nZ
@@ -12441,14 +12441,14 @@ kQ
 vU
 zL
 il
+HT
+yl
+pL
+DY
 QR
-Hy
+Rp
 lR
-Tu
-Wx
-yl
-Uf
-Tu
+DY
 nZ
 nZ
 nZ
@@ -13205,16 +13205,16 @@ nZ
 nZ
 il
 ag
-Rp
-Dg
-Dg
-Dg
-Dg
-Dg
-Dg
-Dg
-Dg
-pL
+bm
+qC
+qC
+qC
+qC
+qC
+qC
+qC
+qC
+pv
 ag
 il
 nZ
@@ -13462,21 +13462,21 @@ nZ
 nZ
 il
 ag
-Ht
+Tu
 PV
-Ba
-ve
-sJ
-ve
-sJ
+ry
+LF
+Ht
+LF
+Ht
 zZ
 Wr
-qp
+QY
 ag
 il
 nZ
 nZ
-vX
+QJ
 nZ
 nZ
 nZ
@@ -13719,16 +13719,16 @@ nZ
 nZ
 il
 ag
-Ht
+Tu
 uQ
-jY
-sJ
-ve
-sJ
-ve
+yE
+Ht
+LF
+Ht
+LF
 lt
 ym
-qp
+QY
 ag
 il
 nZ
@@ -13976,16 +13976,16 @@ nZ
 nZ
 il
 tu
-Ht
+Tu
 ic
-Ba
-ve
-sJ
-ve
-sJ
+ry
+LF
+Ht
+LF
+Ht
 zZ
 mv
-qp
+QY
 rA
 il
 nZ
@@ -14233,16 +14233,16 @@ nZ
 nZ
 il
 ag
-Ht
+Tu
 EY
-jY
-sJ
-ve
-sJ
-ve
+yE
+Ht
+LF
+Ht
+LF
 lt
 ud
-qp
+QY
 ag
 il
 nZ
@@ -14490,16 +14490,16 @@ nZ
 nZ
 il
 ag
-Ht
+Tu
 EP
-Ba
-ve
-sJ
-ve
-sJ
+ry
+LF
+Ht
+LF
+Ht
 zZ
 UY
-qp
+QY
 ag
 il
 nZ
@@ -14747,16 +14747,16 @@ nZ
 nZ
 il
 tu
-Ht
+Tu
 fo
-jY
-sJ
-ve
-sJ
-ve
+yE
+Ht
+LF
+Ht
+LF
 lt
 se
-qp
+QY
 rA
 il
 nZ
@@ -15004,16 +15004,16 @@ nZ
 nZ
 il
 ag
-Ht
+Tu
 sw
-Ba
-ve
-sJ
-ve
-sJ
+ry
+LF
+Ht
+LF
+Ht
 zZ
 QF
-qp
+QY
 ag
 il
 nZ
@@ -15261,16 +15261,16 @@ nZ
 nZ
 il
 ag
-Ht
+Tu
 Ud
-jY
-sJ
-ve
-sJ
-ve
+yE
+Ht
+LF
+Ht
+LF
 lt
 Up
-qp
+QY
 ag
 il
 nZ
@@ -15518,16 +15518,16 @@ nZ
 nZ
 il
 ag
-be
-yE
-yE
-yE
-yE
-yE
-yE
-yE
-yE
-zS
+FS
+nF
+nF
+nF
+nF
+nF
+nF
+nF
+nF
+Bb
 ag
 il
 nZ