diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index bbc9fde9211..79c7c0ad76d 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -9268,7 +9268,14 @@
 /area/maintenance/fore)
 "aBE" = (
 /obj/structure/disposalpipe/segment,
-/obj/structure/table/reinforced,
+/obj/machinery/door/window{
+	dir = 2;
+	name = "Bar Door";
+	req_access_txt = "25"
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "dark"
@@ -14077,7 +14084,7 @@
 	name = "Civilian"
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aLT" = (
@@ -14614,7 +14621,7 @@
 	pixel_x = -28
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aNj" = (
@@ -14627,7 +14634,7 @@
 	pixel_x = 24
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aNk" = (
@@ -15076,7 +15083,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aOd" = (
@@ -15304,7 +15311,7 @@
 /area/crew_quarters/bar)
 "aOG" = (
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aOH" = (
@@ -15382,7 +15389,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aOR" = (
@@ -15641,7 +15648,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aPv" = (
@@ -15917,18 +15924,11 @@
 	icon_state = "grimy"
 	},
 /area/crew_quarters/bar/atrium)
-"aPZ" = (
-/obj/structure/table/wood,
-/turf/simulated/floor/plasteel{
-	dir = 5;
-	icon_state = "dark"
-	},
-/area/crew_quarters/bar)
 "aQb" = (
 /obj/structure/table/wood,
 /obj/item/storage/pill_bottle/dice,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aQc" = (
@@ -15941,14 +15941,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aQd" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/drinks/cans/cola,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aQe" = (
@@ -16126,7 +16126,7 @@
 	},
 /obj/structure/chair/stool/bar,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aQu" = (
@@ -16476,7 +16476,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aRf" = (
@@ -16609,7 +16609,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aRt" = (
@@ -16668,7 +16668,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aRy" = (
@@ -16696,7 +16696,7 @@
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/snacks/cheesiehonkers,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aRD" = (
@@ -16704,14 +16704,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aRE" = (
 /obj/structure/table/wood,
 /obj/item/deck/cards,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aRH" = (
@@ -17454,7 +17454,7 @@
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aTi" = (
@@ -17514,7 +17514,7 @@
 "aTp" = (
 /obj/structure/chair/stool/bar,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aTq" = (
@@ -18053,7 +18053,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aUk" = (
@@ -18094,7 +18094,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aUp" = (
@@ -18159,7 +18159,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aUx" = (
@@ -18204,7 +18204,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aUC" = (
@@ -18268,7 +18268,7 @@
 "aUI" = (
 /obj/structure/table/wood,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aUJ" = (
@@ -18277,7 +18277,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aUL" = (
@@ -18286,7 +18286,7 @@
 	icon_state = "pipe-y"
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aUM" = (
@@ -18908,7 +18908,7 @@
 	},
 /obj/structure/chair/stool/bar,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aVR" = (
@@ -19038,7 +19038,7 @@
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/snacks/chips,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aWh" = (
@@ -19047,26 +19047,26 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aWi" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/drinks/britcup,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aWj" = (
 /obj/structure/chair/stool,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aWk" = (
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aWl" = (
@@ -19916,7 +19916,7 @@
 	pixel_y = -28
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aXI" = (
@@ -19924,7 +19924,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aXJ" = (
@@ -20075,6 +20075,9 @@
 /area/hallway/primary/fore)
 "aYa" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/item/radio/intercom{
+	pixel_y = 28
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "redfull"
 	},
@@ -20605,7 +20608,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aZc" = (
@@ -20618,7 +20621,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "aZd" = (
@@ -21182,9 +21185,8 @@
 	dir = 4;
 	pixel_x = 28
 	},
-/obj/structure/chair/stool/bar,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "baa" = (
@@ -21577,7 +21579,7 @@
 	},
 /obj/item/twohanded/required/kirbyplants,
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "baS" = (
@@ -21597,7 +21599,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "redyellowfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
 "baU" = (
@@ -22406,16 +22408,11 @@
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/bar)
 "bcx" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker,
-/obj/item/reagent_containers/food/drinks/britcup,
 /obj/machinery/door/firedoor,
-/obj/machinery/door/window{
-	dir = 2;
+/obj/machinery/door/airlock/public/glass{
 	name = "Kitchen";
 	req_access_txt = "28"
 	},
-/obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bcy" = (
@@ -23146,11 +23143,18 @@
 	},
 /area/crew_quarters/kitchen)
 "bdR" = (
-/obj/structure/sink/kitchen{
-	pixel_y = 30
+/obj/structure/table/reinforced,
+/obj/machinery/door/window{
+	dir = 2;
+	name = "Kitchen";
+	req_access_txt = "28"
 	},
+/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/food/condiment/saltshaker,
+/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plasteel{
-	icon_state = "redfull"
+	icon_state = "bar"
 	},
 /area/crew_quarters/kitchen)
 "bdS" = (
@@ -23169,7 +23173,9 @@
 	req_access_txt = "28"
 	},
 /obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+	icon_state = "bar"
+	},
 /area/crew_quarters/kitchen)
 "bdU" = (
 /turf/simulated/wall,
@@ -23714,7 +23720,9 @@
 	req_access_txt = "28"
 	},
 /obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+	icon_state = "bar"
+	},
 /area/crew_quarters/kitchen)
 "bfm" = (
 /obj/machinery/kitchen_machine/oven,
@@ -23738,7 +23746,9 @@
 	req_access_txt = "28"
 	},
 /obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+	icon_state = "bar"
+	},
 /area/crew_quarters/kitchen)
 "bfp" = (
 /obj/machinery/door/firedoor,
@@ -24816,8 +24826,8 @@
 	},
 /area/storage/primary)
 "bhK" = (
-/obj/item/radio/intercom{
-	pixel_y = 28
+/obj/structure/sink/kitchen{
+	pixel_y = 30
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
@@ -25786,7 +25796,7 @@
 /area/crew_quarters/sleep)
 "bjp" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
 	name = "Kitchen";
 	req_access_txt = "28"
 	},
@@ -95404,6 +95414,13 @@
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/simulated/floor/plating,
 /area/maintenance/starboard)
+"hly" = (
+/obj/structure/table/wood,
+/turf/simulated/floor/plasteel{
+	dir = 5;
+	icon_state = "dark"
+	},
+/area/crew_quarters/bar)
 "hmC" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -136951,11 +136968,11 @@ aKq
 aFA
 aFA
 aOF
-aPZ
+hly
 aRA
 aRd
 aRA
-aPZ
+hly
 aIZ
 aYZ
 aYZ
@@ -137472,7 +137489,7 @@ aWj
 aLS
 aUj
 aOG
-aTp
+aOG
 bcx
 bdP
 bdQ
@@ -137986,9 +138003,9 @@ aUJ
 aWh
 aUw
 aOG
-aOG
-aYZ
+aTp
 bdR
+bdP
 bgv
 bgB
 bhR