From 97a2b26cff64d32d24c6bb790ee17cb5bcb32684 Mon Sep 17 00:00:00 2001 From: Tractor Mann <69653259+Noot-Toot@users.noreply.github.com> Date: Sat, 23 Sep 2023 23:16:55 -0700 Subject: [PATCH] adds jukeboxes to all base bars added a jukebox to most bars for the JukeBoxes 2.5k bounty in the discord. --- _maps/map_files/Deltastation/DeltaStation2.dmm | 16 +++++++++++++++- _maps/map_files/KiloStation/KiloStation.dmm | 9 ++++++++- _maps/map_files/MetaStation/MetaStation.dmm | 1 + _maps/map_files/NorthStar/north_star.dmm | 1 + .../_maps/RandomBars/Icebox/icebox_bar_base.dmm | 1 + .../_maps/RandomBars/Tram/tram_bar_base.dmm | 1 + 6 files changed, 27 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 90de741895dc..695f9eaddcac 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -29065,6 +29065,20 @@ /obj/item/hand_labeler, /turf/open/floor/carpet, /area/station/security/detectives_office) +"gZK" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/media/jukebox, +/turf/open/floor/iron, +/area/station/commons/lounge) "gZM" = ( /obj/structure/table, /obj/machinery/light_switch/directional/south{ @@ -134915,7 +134929,7 @@ xDc deh ocR ozU -msR +gZK qGL vnU tNO diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 3b5e17859caa..d8b21103eb6e 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -53638,6 +53638,13 @@ /obj/machinery/composters, /turf/open/floor/iron, /area/station/service/hydroponics) +"rLw" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/media/jukebox, +/turf/open/floor/wood, +/area/station/service/bar/atrium) "rLy" = ( /obj/structure/table, /obj/item/folder/blue{ @@ -102787,7 +102794,7 @@ tEE mfJ bqd sHm -ddp +rLw ddp vRO rsb diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 975e7f4f6a7b..4127a1826de7 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -33078,6 +33078,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/media/jukebox, /turf/open/floor/wood, /area/station/commons/lounge) "lWq" = ( diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index 20d097488bdd..d2a8b4a5e884 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -9879,6 +9879,7 @@ }, /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/media/jukebox, /turf/open/floor/iron/checker, /area/station/service/bar/atrium) "ctX" = ( diff --git a/monkestation/_maps/RandomBars/Icebox/icebox_bar_base.dmm b/monkestation/_maps/RandomBars/Icebox/icebox_bar_base.dmm index 0b4a15f881d4..5a04cb19f85e 100644 --- a/monkestation/_maps/RandomBars/Icebox/icebox_bar_base.dmm +++ b/monkestation/_maps/RandomBars/Icebox/icebox_bar_base.dmm @@ -200,6 +200,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/media/jukebox, /turf/open/floor/wood/parquet, /area/station/commons/lounge) "lh" = ( diff --git a/monkestation/_maps/RandomBars/Tram/tram_bar_base.dmm b/monkestation/_maps/RandomBars/Tram/tram_bar_base.dmm index cc58ec88902d..1d4f8c2f5f30 100644 --- a/monkestation/_maps/RandomBars/Tram/tram_bar_base.dmm +++ b/monkestation/_maps/RandomBars/Tram/tram_bar_base.dmm @@ -1301,6 +1301,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/media/jukebox, /turf/open/floor/iron/checker, /area/station/commons/lounge) "GN" = (