diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 8fbb97bbdd..f3f6c8d769 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -54656,6 +54656,7 @@
 /obj/structure/sign/poster/contraband/robust_softdrinks{
 	pixel_y = 32
 	},
+/obj/machinery/vending/snack/orange,
 /turf/open/floor/wood,
 /area/service/bar)
 "fZm" = (
@@ -57444,10 +57445,10 @@
 /turf/open/floor/plasteel/dark,
 /area/security/prison/cells)
 "kgB" = (
-/obj/machinery/vending/snack/orange,
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/jukebox,
 /turf/open/floor/wood,
 /area/service/bar)
 "khb" = (
diff --git a/_maps/map_files/LambdaStation/dorms.dmm b/_maps/map_files/LambdaStation/dorms.dmm
index d52c4e7870..99626ac667 100644
--- a/_maps/map_files/LambdaStation/dorms.dmm
+++ b/_maps/map_files/LambdaStation/dorms.dmm
@@ -5011,6 +5011,7 @@
 	dir = 1
 	},
 /obj/machinery/light,
+/obj/machinery/jukebox,
 /turf/open/floor/plasteel,
 /area/service/bar)
 "nb" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 3661b49684..dd05cf72ea 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -65631,6 +65631,14 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/service/chapel/main)
+"mWS" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/obj/machinery/jukebox,
+/turf/open/floor/plasteel,
+/area/service/bar)
 "mXi" = (
 /turf/open/floor/wood,
 /area/command/heads_quarters/captain/private)
@@ -119802,7 +119810,7 @@ teZ
 teZ
 wbZ
 hCA
-msI
+mWS
 pzY
 kPZ
 upO
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index 68dfbe5bcf..0726556d5c 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -13604,14 +13604,7 @@
 /turf/open/floor/plasteel,
 /area/service/bar/atrium)
 "ayN" = (
-/obj/item/storage/fancy/cigarettes/cigars{
-	pixel_y = 6
-	},
-/obj/item/storage/fancy/cigarettes/cigars/cohiba{
-	pixel_y = 3
-	},
-/obj/item/storage/fancy/cigarettes/cigars/havana,
-/obj/structure/table/reinforced,
+/obj/machinery/jukebox,
 /turf/open/floor/plasteel/dark/corner{
 	dir = 4
 	},
@@ -13622,6 +13615,13 @@
 	pixel_x = 32
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/item/storage/fancy/cigarettes/cigars/havana,
+/obj/item/storage/fancy/cigarettes/cigars/cohiba{
+	pixel_y = 3
+	},
+/obj/item/storage/fancy/cigarettes/cigars{
+	pixel_y = 6
+	},
 /turf/open/floor/plasteel/dark/side{
 	dir = 1
 	},
@@ -84771,7 +84771,7 @@ awp
 awX
 axR
 ayN
-aue
+asg
 blj
 aCb
 aCe