diff --git a/_maps/map_files/coyote_bayou/foxybar.dmm b/_maps/map_files/coyote_bayou/foxybar.dmm
index 81b20cb7db..5239a584ee 100644
--- a/_maps/map_files/coyote_bayou/foxybar.dmm
+++ b/_maps/map_files/coyote_bayou/foxybar.dmm
@@ -39,16 +39,6 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
-"ajh" = (
-/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)
 "akT" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 1;
@@ -99,23 +89,6 @@
 	},
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/f13/wasteland/city/newboston/outdoors)
-"asz" = (
-/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)
 "awD" = (
 /obj/effect/decal/cleanable/glitter/white{
 	color = "#884444"
@@ -149,20 +122,6 @@
 	},
 /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{
@@ -184,6 +143,20 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
+"aDr" = (
+/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)
 "aEB" = (
 /obj/effect/decal/marking,
 /obj/vehicle/sealed/car/jeep_mesa{
@@ -205,6 +178,19 @@
 /obj/machinery/telecomms/broadcaster/preset_right,
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/f13/wasteland/city/newboston/outdoors)
+"aJA" = (
+/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)
 "aJR" = (
 /obj/structure/car{
 	density = 0;
@@ -218,20 +204,25 @@
 	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
+"aNE" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	color = "#3B2B1A"
 	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	alpha = 175
 	},
-/turf/open/floor/plasteel/f13/whitemarble{
-	color = "#333333"
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#3B2B1A"
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1;
+	color = "#3B2B1A"
+	},
+/turf/open/floor/wood_fancy{
+	color = "#779999"
 	},
 /area/f13/fb/bar)
 "aOt" = (
@@ -272,52 +263,6 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
-"aWA" = (
-/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)
-"aZX" = (
-/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)
 "bbJ" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
 	dir = 8
@@ -371,17 +316,6 @@
 	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{
@@ -445,11 +379,7 @@
 	alpha = 175
 	},
 /obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#3B2B1A"
-	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 1;
+	dir = 4;
 	color = "#3B2B1A"
 	},
 /turf/open/floor/wood_fancy{
@@ -481,12 +411,17 @@
 /turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
 "bNh" = (
-/obj/structure/simple_door/room,
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1;
+	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)
 "bNC" = (
 /obj/structure/table/abductor,
@@ -548,19 +483,6 @@
 	},
 /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
@@ -599,16 +521,6 @@
 	icon_state = "horizontaltopbordertop2"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
-"cvh" = (
-/obj/structure/chair/stool,
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
 "cwC" = (
 /obj/effect/landmark/start/f13/wastelander,
 /obj/effect/overlay/fog/fog2{
@@ -655,18 +567,6 @@
 	color = "#AAAAAA"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
-"cAY" = (
-/obj/effect/turf_decal/siding/wood{
-	color = "#3B2B1A"
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
 "cFj" = (
 /obj/effect/decal/cleanable/glitter/white{
 	color = "#884444"
@@ -686,19 +586,24 @@
 	},
 /turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
-"cKA" = (
-/obj/structure/chair/stool,
+"cIc" = (
+/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{
-	dir = 1;
-	color = "#3B2B1A"
+/turf/open/floor/wood_fancy{
+	color = "#779999"
 	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 8;
-	color = "#3B2B1A"
+/area/f13/fb/bar)
+"cKA" = (
+/obj/structure/chair/stool,
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
 	},
 /turf/open/floor/wood_fancy{
 	color = "#779999"
@@ -721,6 +626,15 @@
 	},
 /turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
+"cVe" = (
+/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)
 "cWl" = (
 /obj/machinery/telecomms/server/presets/supply,
 /turf/open/floor/plasteel/f13{
@@ -756,6 +670,17 @@
 	color = "#AAAAAA"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
+"dez" = (
+/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)
 "dfJ" = (
 /obj/machinery/light/small{
 	color = "#FF0000";
@@ -818,14 +743,19 @@
 	},
 /area/f13/fb/bar)
 "dAC" = (
+/obj/structure/chair/stool,
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	alpha = 175
 	},
-/obj/effect/turf_decal/siding/wood/corner{
+/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"
 	},
@@ -924,14 +854,30 @@
 /obj/machinery/telecomms/server/presets/bos,
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/f13/wasteland/city/newboston/outdoors)
+"dQs" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4;
+	color = "#3B2B1A"
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
+/area/f13/fb/bar)
 "dRv" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 1;
 	color = "#3B2B1A"
 	},
-/obj/structure/chair/middle,
+/obj/structure/chair/middle{
+	pixel_y = 4
+	},
 /obj/structure/window/bronze{
-	dir = 1
+	dir = 1;
+	pixel_y = 4
 	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
@@ -974,12 +920,29 @@
 	},
 /turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
-"ecT" = (
-/obj/effect/landmark/start/f13/wastelander,
-/obj/effect/overlay/fog/fog2{
-	plane = -2
+"eaK" = (
+/obj/structure/mirror{
+	pixel_y = 31
 	},
-/turf/open/indestructible/ground/outside/sidewalk,
+/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)
+"ecT" = (
+/obj/effect/landmark/start/f13/wastelander,
+/obj/effect/overlay/fog/fog2{
+	plane = -2
+	},
+/turf/open/indestructible/ground/outside/sidewalk,
 /area/f13/wasteland/city/newboston/outdoors)
 "edK" = (
 /obj/machinery/telecomms/server/presets/responders,
@@ -994,6 +957,15 @@
 	},
 /turf/open/indestructible/ground/outside/water,
 /area/f13/wasteland/city/newboston/outdoors)
+"esa" = (
+/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)
 "euX" = (
 /obj/structure/sign/painting/library{
 	pixel_x = -32
@@ -1063,6 +1035,19 @@
 	icon_state = "horizontalbottomborderbottom2left"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
+"eEc" = (
+/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)
 "eEU" = (
 /obj/effect/turf_decal/stripes/asteroid/corner,
 /turf/open/floor/circuit/telecomms/mainframe,
@@ -1088,6 +1073,14 @@
 	color = "#AAAAAA"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
+"ePQ" = (
+/obj/structure/simple_door/room,
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/plasteel/freezer,
+/area/f13/fb/bar)
 "eUg" = (
 /obj/structure/flora/rock/pile/largejungle,
 /obj/structure/flora/rock/pile/largejungle{
@@ -1156,18 +1149,14 @@
 	color = "#AAAAAA"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
-"fbp" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4;
-	color = "#3B2B1A"
-	},
+"fcV" = (
+/obj/structure/simple_door/room,
+/obj/item/lock_bolt,
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	alpha = 175
 	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
+/turf/open/floor/plasteel/freezer,
 /area/f13/fb/bar)
 "fdf" = (
 /obj/effect/overlay/fog/fog2{
@@ -1177,6 +1166,20 @@
 	icon_state = "horizontaltopbordertop2right"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
+"ffh" = (
+/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)
 "ffM" = (
 /obj/effect/overlay/fog/fog2{
 	plane = -2
@@ -1206,6 +1209,22 @@
 /obj/machinery/telecomms/bus/preset_four,
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/f13/wasteland/city/newboston/outdoors)
+"fvH" = (
+/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)
 "fxb" = (
 /obj/structure/table/wood/settler,
 /obj/effect/turf_decal/siding/wood{
@@ -1296,40 +1315,10 @@
 	color = "#AAAAAA"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
-"fDY" = (
-/obj/machinery/light/floor{
-	light_color = "#993311";
-	color = "#993311";
-	alpha = 10
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/turf/open/floor/plasteel/f13/whitemarble{
-	color = "#333333"
-	},
-/area/f13/fb/bar)
 "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
-	},
-/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)
 "fUM" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 8;
@@ -1383,14 +1372,16 @@
 	},
 /area/f13/fb/bar)
 "gan" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -2
+/obj/machinery/light/sign/heaven{
+	light_power = 2;
+	pixel_y = 3
 	},
-/obj/machinery/gear_painter,
-/turf/open/indestructible/ground/outside/sidewalk{
-	icon_state = "horizontalbottomborderbottom3"
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
 	},
-/area/f13/wasteland/city/newboston/outdoors)
+/turf/closed/wall/mineral/brick,
+/area/f13/fb/bar)
 "gec" = (
 /obj/structure/table/abductor,
 /obj/effect/overlay/fog/fog2{
@@ -1419,13 +1410,6 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
-"gkC" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/turf/open/floor/plasteel/freezer,
-/area/f13/fb/bar)
 "glE" = (
 /obj/effect/decal/cleanable/glitter/pink,
 /obj/structure/table/abductor,
@@ -1488,15 +1472,6 @@
 	},
 /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;
@@ -1562,6 +1537,19 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
+"gHF" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 8;
+	color = "#3B2B1A"
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
+/area/f13/fb/bar)
 "gLq" = (
 /obj/machinery/telecomms/processor/preset_three,
 /obj/machinery/light/floor{
@@ -1573,6 +1561,20 @@
 	icon_state = "darkrustysolid"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
+"gOe" = (
+/obj/machinery/light/floor{
+	light_color = "#993311";
+	color = "#993311";
+	alpha = 10
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/plasteel/f13/whitemarble{
+	color = "#333333"
+	},
+/area/f13/fb/bar)
 "gVS" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
 	dir = 6
@@ -1644,19 +1646,17 @@
 /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
 	},
-/turf/open/floor/plasteel/freezer,
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 2;
+	color = "#3B2B1A"
+	},
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
 /area/f13/fb/bar)
 "his" = (
 /obj/effect/landmark/latejoin,
@@ -1698,6 +1698,21 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
+"hox" = (
+/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
+	},
+/turf/open/floor/plasteel/freezer,
+/area/f13/fb/bar)
 "hoE" = (
 /obj/effect/decal/cleanable/glitter/white{
 	color = "#884444"
@@ -1708,6 +1723,42 @@
 	},
 /turf/open/floor/carpet/royalblack,
 /area/f13/fb/bar)
+"hqa" = (
+/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/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
+/area/f13/fb/bar)
+"hrM" = (
+/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)
 "hAy" = (
 /obj/effect/overlay/fog/fog2{
 	plane = -2
@@ -1716,6 +1767,31 @@
 	icon_state = "horizontaltopbordertop2left"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
+"hBy" = (
+/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)
 "hEt" = (
 /obj/effect/turf_decal/siding/wood{
 	color = "#3B2B1A"
@@ -1764,6 +1840,9 @@
 	name = "dirty floor"
 	},
 /area/f13/fb/bar)
+"hRl" = (
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
 "hSj" = (
 /obj/machinery/light/small{
 	color = "#993311";
@@ -1798,17 +1877,6 @@
 	},
 /turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
-"ije" = (
-/obj/machinery/light/sign/heaven{
-	light_power = 2;
-	pixel_y = 3
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/turf/closed/wall/mineral/brick,
-/area/f13/fb/bar)
 "iku" = (
 /obj/effect/decal/cleanable/glitter/blue{
 	color = "#993311";
@@ -1942,37 +2010,6 @@
 	},
 /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;
@@ -2013,44 +2050,6 @@
 	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 = 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_fancy{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
 "jzx" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/flora/ausbushes/brflowers{
@@ -2175,24 +2174,6 @@
 	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"
@@ -2210,25 +2191,15 @@
 /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
 	},
-/obj/machinery/light/small{
-	color = "#993311";
+/obj/effect/turf_decal/siding/wood{
 	dir = 4;
-	light_color = "#993311";
-	light_power = 2;
-	light_range = 2;
-	pixel_y = 13
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
+	color = "#3B2B1A"
 	},
+/turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
 "kFu" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
@@ -2331,6 +2302,31 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
+"kPr" = (
+/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)
 "kUb" = (
 /obj/structure/window/bronze{
 	dir = 8;
@@ -2370,6 +2366,18 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
+"lel" = (
+/obj/effect/turf_decal/siding/wood{
+	color = "#3B2B1A"
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
+/area/f13/fb/bar)
 "lhy" = (
 /obj/structure/sign/poster/contraband/pinup_ride{
 	pixel_y = 32
@@ -2413,6 +2421,14 @@
 	},
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/f13/wasteland/city/newboston/outdoors)
+"lpN" = (
+/obj/structure/decoration/vent,
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/plasteel/freezer,
+/area/f13/fb/bar)
 "lvh" = (
 /obj/machinery/processor,
 /turf/open/floor/f13{
@@ -2421,6 +2437,31 @@
 	name = "dirty floor"
 	},
 /area/f13/fb/bar)
+"lyo" = (
+/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_fancy{
+	color = "#779999"
+	},
+/area/f13/fb/bar)
 "lzu" = (
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/f13/wasteland/city/newboston/outdoors)
@@ -2586,6 +2627,44 @@
 	},
 /turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
+"msa" = (
+/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)
+"msx" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#3B2B1A"
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/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)
 "mtY" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4;
@@ -2600,6 +2679,19 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
+"mBj" = (
+/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)
 "mGF" = (
 /obj/effect/turf_decal/siding/wood{
 	color = "#3B2B1A"
@@ -2641,31 +2733,6 @@
 	icon_state = "darkrustysolid"
 	},
 /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 = -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)
 "mWI" = (
 /obj/effect/turf_decal/stripes/asteroid/line{
 	dir = 4
@@ -2762,19 +2829,6 @@
 	},
 /turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
-"nyA" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 8;
-	color = "#3B2B1A"
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
 "nPu" = (
 /obj/effect/landmark/start/f13/wastelander/clubworker,
 /obj/structure/chair/bench{
@@ -2791,6 +2845,25 @@
 /obj/machinery/telecomms/server/presets/town,
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/f13/wasteland/city/newboston/outdoors)
+"nXE" = (
+/obj/effect/overlay/fog/fog2{
+	plane = -1;
+	alpha = 175
+	},
+/turf/closed/wall/mineral/brick{
+	plane = -1
+	},
+/area/f13/fb/bar)
+"oey" = (
+/obj/structure/urinal{
+	pixel_y = 25
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/plasteel/freezer,
+/area/f13/fb/bar)
 "ohS" = (
 /obj/machinery/light/floor{
 	light_color = "#993311";
@@ -2812,28 +2885,32 @@
 	color = "#333333"
 	},
 /area/f13/fb/bar)
-"orZ" = (
+"okV" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	color = "#3B2B1A"
+	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	alpha = 175
 	},
-/turf/open/floor/plasteel/f13/whitemarble{
-	color = "#333333"
+/turf/open/floor/wood_fancy{
+	color = "#779999"
 	},
 /area/f13/fb/bar)
-"ouY" = (
-/obj/effect/overlay/fog/fog2{
-	plane = -2
-	},
-/turf/open/indestructible/ground/outside/sidewalk{
-	icon_state = "verticalrightborderright1"
+"opB" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#3B2B1A"
 	},
-/area/f13/wasteland/city/newboston/outdoors)
-"oBl" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 2;
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
 	color = "#3B2B1A"
 	},
+/obj/structure/chair/left,
+/obj/structure/window/bronze{
+	dir = 1
+	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	alpha = 175
@@ -2842,6 +2919,23 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
+"orZ" = (
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/plasteel/f13/whitemarble{
+	color = "#333333"
+	},
+/area/f13/fb/bar)
+"ouY" = (
+/obj/effect/overlay/fog/fog2{
+	plane = -2
+	},
+/turf/open/indestructible/ground/outside/sidewalk{
+	icon_state = "verticalrightborderright1"
+	},
+/area/f13/wasteland/city/newboston/outdoors)
 "oLR" = (
 /obj/item/kirbyplants/random,
 /obj/machinery/light/small{
@@ -2891,19 +2985,6 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
-"oQf" = (
-/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)
 "oQi" = (
 /obj/effect/overlay/fog/fog2{
 	plane = -2
@@ -2949,9 +3030,12 @@
 	dir = 1;
 	color = "#3B2B1A"
 	},
-/obj/structure/chair/left,
+/obj/structure/chair/left{
+	pixel_y = 4
+	},
 /obj/structure/window/bronze{
-	dir = 1
+	dir = 1;
+	pixel_y = 4
 	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
@@ -3011,6 +3095,13 @@
 	},
 /turf/open/floor/carpet/royalblack,
 /area/f13/fb/bar)
+"pBI" = (
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/plasteel/freezer,
+/area/f13/fb/bar)
 "pGx" = (
 /obj/machinery/telecomms/processor/preset_one,
 /obj/machinery/light/floor{
@@ -3058,26 +3149,6 @@
 	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,6 +3174,22 @@
 	},
 /turf/open/floor/carpet/royalblack,
 /area/f13/fb/bar)
+"pVs" = (
+/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)
 "pXS" = (
 /obj/machinery/light/small{
 	color = "#993311";
@@ -3152,28 +3239,15 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
-"qdS" = (
+"qge" = (
 /obj/effect/overlay/fog/fog2{
 	plane = -2
 	},
-/obj/machinery/gear_painter,
+/obj/machinery/recycler,
 /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{
@@ -3227,9 +3301,6 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
-"qxx" = (
-/turf/closed/indestructible/f13/matrix,
-/area/f13/wasteland/city/newboston/outdoors)
 "qAX" = (
 /obj/structure/table/wood/settler,
 /obj/item/canvas/nineteenXnineteen,
@@ -3350,19 +3421,6 @@
 /obj/machinery/telecomms/hub/preset,
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/f13/wasteland/city/newboston/outdoors)
-"rtq" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#3B2B1A"
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
-/turf/open/floor/wood_fancy{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
 "rvy" = (
 /obj/structure/junk/cabinet{
 	pixel_x = 10
@@ -3455,19 +3513,6 @@
 	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;
@@ -3589,21 +3634,10 @@
 	plane = -2;
 	alpha = 175
 	},
-/turf/open/floor/grass{
-	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/grass{
+	color = "#777777"
 	},
-/turf/open/floor/carpet/purple,
-/area/f13/fb/bar)
+/area/f13/wasteland/city/newboston/outdoors)
 "srN" = (
 /obj/structure/sign/poster/contraband/pinup_funk{
 	pixel_y = 32
@@ -3633,30 +3667,6 @@
 	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/floor/wood_fancy{
-	color = "#779999"
-	},
-/area/f13/fb/bar)
 "sXl" = (
 /obj/structure/chair/stool/retro/backed,
 /obj/effect/turf_decal/siding/wood{
@@ -3694,31 +3704,6 @@
 	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
@@ -3778,20 +3763,22 @@
 	},
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)
-"ttk" = (
-/obj/machinery/light/small{
-	dir = 4;
-	pixel_y = 13;
-	light_color = "#993311";
-	light_power = 2;
-	light_range = 2;
-	color = "#993311"
+"tyV" = (
+/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/plasteel/freezer,
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
 /area/f13/fb/bar)
 "tzZ" = (
 /obj/structure/sign/painting/library{
@@ -3921,15 +3908,6 @@
 /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{
@@ -4142,6 +4120,24 @@
 	color = "#779999"
 	},
 /area/f13/fb/bar)
+"vHp" = (
+/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)
 "vJz" = (
 /turf/open/floor/f13{
 	color = "#ffe9de";
@@ -4194,8 +4190,18 @@
 	},
 /area/f13/fb/bar)
 "wev" = (
-/turf/open/indestructible/ground/outside/desert,
-/area/f13/wasteland)
+/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)
 "weZ" = (
 /obj/structure/bed/dogbed,
 /obj/effect/turf_decal/siding/wood{
@@ -4237,15 +4243,6 @@
 	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)
 "wqx" = (
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
@@ -4285,16 +4282,6 @@
 	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;
@@ -4374,27 +4361,29 @@
 	color = "#3B2B1A"
 	},
 /obj/structure/chair/right{
-	dir = 2
+	dir = 2;
+	pixel_y = 4
 	},
 /obj/structure/window/bronze{
-	dir = 1
+	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)
-"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
@@ -4479,18 +4468,11 @@
 /turf/open/indestructible/ground/outside/water,
 /area/f13/wasteland/city/newboston/outdoors)
 "xpa" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#3B2B1A"
-	},
+/obj/machinery/door/unpowered/securedoor,
 /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"
 	},
@@ -4581,6 +4563,21 @@
 	icon_state = "verticalrightborderright1"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
+"xQu" = (
+/obj/machinery/light/small{
+	dir = 4;
+	pixel_y = 13;
+	light_color = "#993311";
+	light_power = 2;
+	light_range = 2;
+	color = "#993311"
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/plasteel/freezer,
+/area/f13/fb/bar)
 "xWe" = (
 /turf/closed/indestructible/f13/obsidian,
 /area/f13/wasteland/city/newboston/outdoors)
@@ -7515,11 +7512,11 @@ xNF
 xNF
 xNF
 bPG
-wuM
-hfS
-gkC
-woH
-gkC
+oey
+hox
+pBI
+fcV
+pBI
 uvM
 bPG
 bPG
@@ -7547,7 +7544,7 @@ sbi
 sbi
 sbi
 sbi
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -7772,11 +7769,11 @@ xNF
 xNF
 xNF
 bPG
-wuM
-wOo
-gkC
+oey
+lpN
+pBI
 bPG
-gkC
+pBI
 vmu
 bPG
 miw
@@ -7788,14 +7785,14 @@ wHw
 sel
 awD
 bPG
-aZX
+wJX
 oOK
 hEt
-gtn
-aZX
+nXE
+wJX
 oOK
 hEt
-gtn
+nXE
 his
 sCW
 sCW
@@ -7804,7 +7801,7 @@ vgB
 tkO
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -8029,9 +8026,9 @@ xNF
 xNF
 xNF
 bPG
-ays
-gkC
-gkC
+ffh
+pBI
+pBI
 bPG
 bPG
 bPG
@@ -8045,14 +8042,14 @@ lXt
 krA
 hSj
 bPG
-pSY
+dRv
 lzG
 dNW
-joB
-pSY
+hrM
+dRv
 lzG
 dNW
-joB
+hrM
 mdh
 bXW
 bXW
@@ -8061,7 +8058,7 @@ klQ
 xfT
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -8286,31 +8283,31 @@ xNF
 xNF
 xNF
 bPG
-asz
-gkC
-gkC
-woH
-gkC
+eaK
+pBI
+pBI
+fcV
+pBI
 uvM
 bPG
 dga
-bnq
-sqa
+dez
+kuK
 hTW
 hnl
 bIX
 cFj
 dYw
 bPG
-sKg
+pgU
 mtY
 aTn
-joB
-sKg
+hrM
+pgU
 mtY
 aTn
-joB
-urA
+hrM
+qge
 bXW
 bXW
 ecT
@@ -8318,7 +8315,7 @@ klQ
 xfT
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -8543,11 +8540,11 @@ xNF
 xNF
 xNF
 bPG
-rOS
-ttk
-gkC
+mBj
+xQu
+pBI
 bPG
-gkC
+pBI
 vmu
 bPG
 bPG
@@ -8559,15 +8556,15 @@ bPG
 bPG
 bPG
 bPG
-knd
+vHp
 wxN
 dCS
-joB
+hrM
 xga
 wxN
 dCS
-joB
-qdS
+hrM
+esa
 tdg
 nbY
 wum
@@ -8575,7 +8572,7 @@ cwC
 tkO
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -8802,13 +8799,13 @@ xNF
 bPG
 bPG
 bPG
-bNh
+ePQ
 bPG
 bPG
 bPG
 bPG
 pXS
-rtq
+okV
 bPG
 kJh
 gCH
@@ -8832,7 +8829,7 @@ uWY
 uWY
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -9059,26 +9056,26 @@ xNF
 xNF
 xNF
 bPG
-tiS
-xpa
-xpa
+hBy
+bAd
+bAd
 cYv
 cYv
-iVm
+msa
 wxN
 bPG
 glE
 dEp
 glE
 bPG
-cKA
+dAC
 gmW
-rtq
-rtq
-rtq
+okV
+okV
+okV
 kNZ
-rtq
-rtq
+okV
+okV
 hov
 bPG
 eJV
@@ -9089,7 +9086,7 @@ aEB
 uWY
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -9328,15 +9325,15 @@ goB
 goB
 goB
 iNU
-aWA
-oBl
-cdu
-cdu
-cdu
-cdu
-cdu
-fbp
-cAY
+bNh
+aJA
+cIc
+cIc
+cIc
+cIc
+cIc
+dQs
+lel
 bPG
 rDF
 cuN
@@ -9346,7 +9343,7 @@ eYJ
 uWY
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -9586,14 +9583,14 @@ goB
 goB
 tCv
 wxN
-cAY
-aMl
+lel
+pVs
 orZ
 orZ
 orZ
 orZ
 mRP
-cAY
+lel
 maZ
 usf
 xOJ
@@ -9603,7 +9600,7 @@ fUR
 uWY
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -9843,14 +9840,14 @@ sdG
 jPN
 hcd
 iku
-cAY
-mSG
+lel
+kPr
 orZ
 orZ
 orZ
 vzp
 mRP
-cAY
+lel
 maZ
 usf
 rNu
@@ -9860,7 +9857,7 @@ uWY
 uWY
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -10100,15 +10097,15 @@ wxN
 wxN
 wxN
 wxN
-cAY
-fRB
+lel
+fvH
 orZ
 orZ
 orZ
 orZ
 mRP
-cAY
-ajh
+lel
+xpa
 eBd
 cuN
 gzw
@@ -10117,7 +10114,7 @@ blw
 uWY
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -10346,10 +10343,10 @@ bPG
 bPG
 bPG
 bPG
-bAd
-rtq
+aNE
+okV
 qxm
-dAC
+wev
 wxN
 iku
 wxN
@@ -10357,15 +10354,15 @@ iKD
 wxN
 wxN
 wxN
-cAY
-fRB
+lel
+fvH
 exD
 orZ
 orZ
-fDY
+gOe
 mRP
-cAY
-ije
+lel
+gan
 dfJ
 fdf
 eYJ
@@ -10374,7 +10371,7 @@ eYJ
 uWY
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -10614,14 +10611,14 @@ wxN
 wxN
 wxN
 wxN
-cAY
-fRB
+lel
+fvH
 orZ
 orZ
 exD
 orZ
 mRP
-cAY
+lel
 bPG
 wTs
 hAy
@@ -10631,7 +10628,7 @@ fUR
 uWY
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -10855,8 +10852,8 @@ xNF
 xNF
 xNF
 bPG
-iVb
-cvh
+aDr
+cKA
 wxN
 gnx
 bPG
@@ -10871,15 +10868,15 @@ eYB
 fUM
 wsB
 wxN
-cAY
-fRB
+lel
+fvH
 orZ
 orZ
 orZ
 orZ
 mRP
-cAY
-ajh
+lel
+xpa
 wTs
 hAy
 tkO
@@ -10888,7 +10885,7 @@ uWY
 uWY
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -11128,14 +11125,14 @@ gec
 gec
 pyN
 wxN
-cAY
+lel
 ohS
 orZ
 aOt
 orZ
 vzp
 mRP
-cAY
+lel
 maZ
 kjJ
 xOJ
@@ -11145,7 +11142,7 @@ aEB
 uWY
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -11372,11 +11369,11 @@ bPG
 ygG
 yeQ
 yeQ
-oQf
+eEc
 vEu
 vQt
-cdu
-kuK
+cIc
+msx
 qKK
 gec
 hoE
@@ -11385,14 +11382,14 @@ iYl
 iYl
 dLD
 wxN
-nyA
-rtq
-rtq
-rtq
-rtq
-rtq
-aWA
-cAY
+gHF
+okV
+okV
+okV
+okV
+okV
+bNh
+lel
 maZ
 nPu
 meo
@@ -11402,7 +11399,7 @@ eYJ
 uWY
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -11641,14 +11638,14 @@ iYl
 iYl
 iYl
 mGF
-qfC
+hfS
 qdx
-cdu
-cdu
-cdu
+cIc
+cIc
+cIc
 tzZ
-cdu
-cdu
+cIc
+cIc
 san
 bPG
 kke
@@ -11659,7 +11656,7 @@ fUR
 uWY
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -11916,7 +11913,7 @@ uWY
 uWY
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -12160,11 +12157,11 @@ bPG
 fqj
 wxN
 kUb
-gtn
+nXE
 fqj
 wxN
 kUb
-gtn
+nXE
 rlR
 fdf
 gzw
@@ -12173,7 +12170,7 @@ fUR
 uWY
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -12414,15 +12411,15 @@ vJz
 vJz
 vJz
 bPG
-wJX
+hqa
 kcI
 hEt
-gtn
-jyP
+nXE
+lyo
 kcI
 hEt
-gtn
-gan
+nXE
+cVe
 fdf
 xfT
 uWY
@@ -12430,7 +12427,7 @@ uWY
 uWY
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -12660,7 +12657,7 @@ xNF
 bPG
 fxb
 pNr
-cAY
+lel
 bPG
 seA
 vJz
@@ -12671,14 +12668,14 @@ vJz
 vJz
 vJz
 bPG
-dRv
+tyV
 lzG
 dNW
-joB
-pSY
+hrM
+dRv
 lzG
 dNW
-joB
+hrM
 wTs
 fdf
 xfT
@@ -12687,7 +12684,7 @@ uWY
 uWY
 uWY
 uWY
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -12928,14 +12925,14 @@ rWC
 uie
 jnG
 bPG
-pgU
+opB
 pxC
 aTn
-joB
-sKg
+hrM
+pgU
 pxC
 aTn
-joB
+hrM
 iCC
 tEH
 ouY
@@ -12944,7 +12941,7 @@ dUG
 neR
 ffM
 ffM
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -13201,7 +13198,7 @@ sbi
 sbi
 sbi
 sbi
-qxx
+sbi
 xNF
 xNF
 xNF
@@ -21388,10 +21385,10 @@ tLM
 lIe
 wqx
 xNF
-wev
-wev
-wev
-wev
+hRl
+hRl
+hRl
+hRl
 xNF
 xNF
 xNF
@@ -21645,10 +21642,10 @@ rvy
 wqx
 wqx
 xNF
-wev
-wev
-wev
-wev
+hRl
+hRl
+hRl
+hRl
 xNF
 xNF
 xNF
@@ -21902,10 +21899,10 @@ rTA
 wqx
 wqx
 xNF
-wev
-wev
-wev
-wev
+hRl
+hRl
+hRl
+hRl
 xNF
 xNF
 xNF
@@ -22159,10 +22156,10 @@ fDd
 wqx
 wqx
 xNF
-wev
-wev
-wev
-wev
+hRl
+hRl
+hRl
+hRl
 xNF
 xNF
 xNF
@@ -22416,10 +22413,10 @@ aJR
 wqx
 wqx
 xNF
-wev
-wev
-wev
-wev
+hRl
+hRl
+hRl
+hRl
 xNF
 xNF
 xNF
@@ -22673,10 +22670,10 @@ wqx
 wqx
 wqx
 xNF
-wev
-wev
-wev
-wev
+hRl
+hRl
+hRl
+hRl
 xNF
 xNF
 xNF
@@ -22933,7 +22930,7 @@ ukJ
 ukJ
 wqx
 wqx
-wev
+hRl
 xNF
 xNF
 xNF
@@ -23190,7 +23187,7 @@ wqx
 wqx
 wqx
 wqx
-wev
+hRl
 xNF
 xNF
 xNF
@@ -23447,7 +23444,7 @@ mZn
 mZn
 mZn
 mZn
-wev
+hRl
 xNF
 xNF
 xNF
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index d9a87cbd72..5421cf9680 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -606,7 +606,7 @@
 			SSeconomy.player_spawned(H)
 
 	character.client.is_in_game = 1
-	spawn(2 MINUTES)
+	spawn(30 SECONDS)
 		if(character?.client?.is_in_game)
 			character?.client?.is_in_game = 2