diff --git a/_maps/map_files/coyote_bayou/foxybar.dmm b/_maps/map_files/coyote_bayou/foxybar.dmm
index 253c96a00f..4aa3da0c7f 100644
--- a/_maps/map_files/coyote_bayou/foxybar.dmm
+++ b/_maps/map_files/coyote_bayou/foxybar.dmm
@@ -122,15 +122,6 @@
 	},
 /turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
-"azu" = (
-/obj/effect/landmark/start/f13/barkeep,
-/obj/effect/overlay/fog/fog2{
-	plane = -2
-	},
-/turf/open/indestructible/ground/outside/sidewalk{
-	icon_state = "horizontalbottomborderbottom2left"
-	},
-/area/f13/wasteland/city/newboston/outdoors)
 "aBY" = (
 /obj/structure/curtain{
 	color = "#c40e0e"
@@ -440,6 +431,7 @@
 /obj/effect/overlay/fog/fog2{
 	plane = -2
 	},
+/obj/effect/landmark/start/f13/wastelander/clubworker,
 /turf/open/indestructible/ground/outside/sidewalk,
 /area/f13/wasteland/city/newboston/outdoors)
 "cgn" = (
@@ -1357,16 +1349,19 @@
 "gyr" = (
 /obj/machinery/vending/cigarette{
 	density = 0;
-	pixel_y = 25
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
+	pixel_y = 10
 	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 1;
 	color = "#3B2B1A"
 	},
+/obj/structure/sign/poster/contraband/have_a_puff{
+	pixel_y = 35
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
 /turf/open/floor/wood_fancy{
 	color = "#779999"
 	},
@@ -1746,14 +1741,14 @@
 	pixel_y = -2
 	},
 /obj/machinery/vending/kink,
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
 /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)
 "iku" = (
@@ -1981,7 +1976,6 @@
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/f13/wasteland/city/newboston/outdoors)
 "kjJ" = (
-/obj/effect/landmark/start/f13/wastelander/clubworker,
 /obj/structure/chair/bench{
 	pixel_y = 12
 	},
@@ -1996,12 +1990,11 @@
 /obj/structure/sign/poster/contraband/pinup_pink{
 	pixel_y = 32
 	},
-/obj/effect/landmark/start/f13/barkeep,
 /obj/effect/overlay/fog/fog2{
 	plane = -2
 	},
 /turf/open/indestructible/ground/outside/sidewalk{
-	icon_state = "horizontalbottomborderbottom2right"
+	icon_state = "horizontalbottomborderbottom2left"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
 "klQ" = (
@@ -2344,15 +2337,6 @@
 	icon_state = "horizontalbottomborderbottom0"
 	},
 /area/f13/wasteland/city/newboston/outdoors)
-"meo" = (
-/obj/effect/landmark/start/f13/wastelander/clubworker,
-/obj/effect/overlay/fog/fog2{
-	plane = -2
-	},
-/turf/open/indestructible/ground/outside/sidewalk{
-	icon_state = "horizontaltopbordertop2left"
-	},
-/area/f13/wasteland/city/newboston/outdoors)
 "miw" = (
 /obj/structure/closet/cabinet/anchored,
 /obj/item/clothing/under/fancy_red_formaldress,
@@ -2497,6 +2481,7 @@
 /obj/effect/overlay/fog/fog2{
 	plane = -2
 	},
+/obj/effect/landmark/start/f13/barkeep,
 /turf/open/indestructible/ground/outside/sidewalk{
 	icon_state = "verticalleftborderleft2top"
 	},
@@ -2576,7 +2561,6 @@
 /turf/open/floor/carpet/purple,
 /area/f13/fb/bar)
 "nPu" = (
-/obj/effect/landmark/start/f13/wastelander/clubworker,
 /obj/structure/chair/bench{
 	pixel_y = 12
 	},
@@ -2747,14 +2731,22 @@
 	color = "#993311";
 	layer = 3
 	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
-	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 1;
 	color = "#3B2B1A"
 	},
+/obj/machinery/vending/kink{
+	pixel_y = 11;
+	density = 0
+	},
+/obj/item/candle/infinite{
+	pixel_y = 28;
+	pixel_x = -8
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
 /turf/open/floor/wood_fancy{
 	color = "#779999"
 	},
@@ -3181,15 +3173,6 @@
 /obj/machinery/telecomms/receiver/preset_left,
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/f13/wasteland/city/newboston/outdoors)
-"rNu" = (
-/obj/effect/landmark/start/f13/wastelander/clubworker,
-/obj/effect/overlay/fog/fog2{
-	plane = -2
-	},
-/turf/open/indestructible/ground/outside/sidewalk{
-	icon_state = "horizontaltopbordertop2"
-	},
-/area/f13/wasteland/city/newboston/outdoors)
 "rWC" = (
 /obj/item/reagent_containers/glass/bucket,
 /obj/machinery/light/small{
@@ -3323,6 +3306,7 @@
 /obj/effect/overlay/fog/fog2{
 	plane = -2
 	},
+/obj/effect/landmark/start/f13/barkeep,
 /turf/open/indestructible/ground/outside/sidewalk{
 	icon_state = "outerbordercorner - S"
 	},
@@ -3528,7 +3512,6 @@
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/f13/wasteland/city/newboston/outdoors)
 "usf" = (
-/obj/effect/landmark/start/f13/wastelander/clubworker,
 /obj/structure/chair/bench{
 	pixel_y = 12
 	},
@@ -3759,16 +3742,19 @@
 "wdE" = (
 /obj/machinery/vending/cola/red{
 	density = 0;
-	pixel_y = 27
-	},
-/obj/effect/overlay/fog/fog2{
-	plane = -2;
-	alpha = 175
+	pixel_y = 12
 	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 1;
 	color = "#3B2B1A"
 	},
+/obj/structure/sign/poster/contraband/space_cola{
+	pixel_y = 33
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
 /turf/open/floor/wood_fancy{
 	color = "#779999"
 	},
@@ -4062,15 +4048,6 @@
 	icon_state = "black"
 	},
 /area)
-"xOJ" = (
-/obj/effect/landmark/start/f13/wastelander/clubworker,
-/obj/effect/overlay/fog/fog2{
-	plane = -2
-	},
-/turf/open/indestructible/ground/outside/sidewalk{
-	icon_state = "horizontaltopbordertop2right"
-	},
-/area/f13/wasteland/city/newboston/outdoors)
 "xPQ" = (
 /obj/effect/landmark/latejoin,
 /obj/effect/overlay/fog/fog2{
@@ -6490,7 +6467,7 @@ mRP
 lel
 maZ
 usf
-xOJ
+fdf
 gzw
 iub
 fUR
@@ -6607,7 +6584,7 @@ mRP
 lel
 maZ
 usf
-rNu
+cuN
 tkO
 uWY
 uWY
@@ -7192,7 +7169,7 @@ mRP
 lel
 maZ
 kjJ
-xOJ
+fdf
 gzw
 qwR
 aEB
@@ -7309,7 +7286,7 @@ bNh
 lel
 maZ
 nPu
-meo
+hAy
 cgn
 eYY
 eYJ
@@ -7542,7 +7519,7 @@ bUG
 aBY
 niY
 bPG
-azu
+eBd
 hAy
 tkO
 uWY
diff --git a/_maps/map_files/coyote_bayou/foxybarupper.dmm b/_maps/map_files/coyote_bayou/foxybarupper.dmm
index d0e632cb23..a15a972291 100644
--- a/_maps/map_files/coyote_bayou/foxybarupper.dmm
+++ b/_maps/map_files/coyote_bayou/foxybarupper.dmm
@@ -529,10 +529,14 @@
 /turf/open/transparent/openspace,
 /area/f13/fb/bar)
 "gn" = (
-/obj/effect/decal/cleanable/glitter/white{
-	color = "#884444"
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 8;
+	color = "#3B2B1A"
+	},
+/obj/structure/sign/poster/contraband/donut_corp{
+	pixel_x = -32;
+	pixel_y = -33
 	},
-/obj/structure/chair/stool/retro/tan,
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)
 "gs" = (
@@ -834,10 +838,6 @@
 /turf/open/floor/wood_common/wood_common_dark,
 /area/f13/fb/bar)
 "kX" = (
-/obj/machinery/vending/cola/red{
-	density = 0;
-	pixel_y = 16
-	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 1;
 	color = "#3B2B1A"
@@ -846,6 +846,11 @@
 	icon_state = "vault_arcade";
 	pixel_y = 30
 	},
+/obj/machinery/computer/slot_machine{
+	pixel_y = 16;
+	density = 0
+	},
+/obj/structure/chair/stool/retro/tan,
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)
 "ln" = (
@@ -2515,14 +2520,12 @@
 /turf/open/floor/carpet/red,
 /area/f13/fb/bar)
 "EE" = (
-/obj/effect/turf_decal/siding/wood{
-	color = "#3B2B1A"
-	},
-/obj/machinery/computer/slot_machine{
-	pixel_y = -4;
-	density = 0
+/obj/structure/table/glass,
+/obj/item/storage/fancy/donut_box{
+	pixel_y = 14
 	},
-/turf/open/floor/carpet/black,
+/obj/item/storage/fancy/donut_box,
+/turf/open/floor/wood_common/wood_common_dark,
 /area/f13/fb/bar)
 "EK" = (
 /obj/item/kirbyplants/random,
@@ -2639,18 +2642,14 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)
 "Fv" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#3B2B1A"
-	},
 /obj/effect/turf_decal/siding/wood{
 	color = "#3B2B1A"
 	},
-/obj/machinery/computer/slot_machine{
-	pixel_y = -4;
-	density = 0
+/obj/machinery/computer/arcade{
+	density = 0;
+	dir = 1
 	},
-/obj/effect/turf_decal/siding/wood/corner{
+/obj/effect/turf_decal/siding/wood{
 	dir = 8;
 	color = "#3B2B1A"
 	},
@@ -2795,14 +2794,15 @@
 	},
 /area/f13/fb/bar)
 "Ib" = (
-/obj/machinery/vending/cigarette{
-	density = 0;
-	pixel_y = 13
-	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 1;
 	color = "#3B2B1A"
 	},
+/obj/machinery/mineral/wasteland_vendor/special{
+	pixel_y = 14;
+	pixel_x = 5;
+	density = 0
+	},
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)
 "IC" = (
@@ -3213,11 +3213,16 @@
 	},
 /area/f13/fb/bar)
 "Pc" = (
+/obj/machinery/light/floor{
+	light_color = "#444499";
+	color = "#444499";
+	alpha = 10
+	},
+/obj/structure/chair/stool/retro/tan,
 /obj/effect/turf_decal/siding/wood{
 	dir = 8;
 	color = "#3B2B1A"
 	},
-/obj/structure/chair/stool/retro/tan,
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)
 "Pq" = (
@@ -3927,10 +3932,23 @@
 	},
 /turf/open/transparent/openspace,
 /area/f13/fb/bar)
+"WQ" = (
+/obj/structure/table/glass,
+/obj/item/crafting/coffee_pot{
+	pixel_y = 17
+	},
+/obj/item/storage/fancy/donut_box,
+/turf/open/floor/wood_common/wood_common_dark,
+/area/f13/fb/bar)
 "Xr" = (
 /turf/open/indestructible,
 /area/f13/wasteland)
 "Xy" = (
+/obj/machinery/light/floor{
+	light_color = "#444499";
+	color = "#444499";
+	alpha = 10
+	},
 /obj/structure/chair/stool/retro/tan,
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)
@@ -4119,19 +4137,10 @@
 /obj/structure/sign/poster/contraband/pinup_topless{
 	pixel_y = 32
 	},
-/obj/machinery/mineral/wasteland_vendor/special{
-	pixel_y = 14;
-	pixel_x = 5;
+/obj/machinery/computer/slot_machine{
+	pixel_y = 16;
 	density = 0
 	},
-/turf/open/floor/carpet/black,
-/area/f13/fb/bar)
-"YP" = (
-/obj/machinery/light/floor{
-	light_color = "#444499";
-	color = "#444499";
-	alpha = 10
-	},
 /obj/structure/chair/stool/retro/tan,
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)
@@ -5666,7 +5675,7 @@ Ll
 Pc
 Fv
 il
-YQ
+WQ
 rk
 Ec
 kf
@@ -5780,8 +5789,8 @@ nZ
 il
 yx
 zr
-gn
-EE
+Xy
+NB
 il
 DS
 kf
@@ -5898,7 +5907,7 @@ il
 YO
 zr
 Xy
-EE
+NB
 il
 nc
 kf
@@ -6014,10 +6023,10 @@ nZ
 il
 kX
 zr
-YP
+Xy
 NB
 il
-YQ
+EE
 YQ
 YQ
 kf
@@ -6483,7 +6492,7 @@ il
 Qe
 gi
 zr
-um
+gn
 Ll
 cQ
 ea