diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm
index de9202c690c..904a4e1882e 100644
--- a/code/game/machinery/jukebox.dm
+++ b/code/game/machinery/jukebox.dm
@@ -9,7 +9,7 @@ datum/track/New(var/title_name, var/audio)
 	sound = audio
 
 /obj/machinery/media/jukebox/
-	name = "space jukebox"
+	name = "jukebox"
 	icon = 'icons/obj/jukebox.dmi'
 	icon_state = "jukebox-nopower"
 	var/state_base = "jukebox"
@@ -235,3 +235,29 @@ datum/track/New(var/title_name, var/audio)
 	icon_state = state_base
 	if(playing)
 		add_overlay("[state_base]-running")
+
+/obj/machinery/media/jukebox/audioconsole
+	name = "audioconsole"
+	desc = "An Idris-designed jukebox for the 25th century. Unfortunately, someone made a mistake setting this one up - it isn't connected to the extranet - and only plays the demo music it was preprogrammed with."
+	icon = 'icons/obj/audioconsole.dmi'
+	icon_state = "audioconsole-nopower"
+	state_base = "audioconsole"
+	anchored = FALSE
+	tracks = list(
+		new/datum/track("Butterflies", 'sound/music/audioconsole/Butterflies.ogg'),
+		new/datum/track("That Ain't Chopin", 'sound/music/audioconsole/ThatAintChopin.ogg'),
+		new/datum/track("Don't Rush", 'sound/music/audioconsole/DontRush.ogg'),
+		new/datum/track("Phoron Will Make Us Rich", 'sound/music/audioconsole/PhoronWillMakeUsRich.ogg'),
+		new/datum/track("Amsterdam", 'sound/music/audioconsole/Amsterdam.ogg'),
+		new/datum/track("when", 'sound/music/audioconsole/When.ogg'),
+		new/datum/track("Number 0", 'sound/music/audioconsole/Number0.ogg'),
+		new/datum/track("The Pianist", 'sound/music/audioconsole/ThePianist.ogg'),
+		new/datum/track("Lips", 'sound/music/audioconsole/Lips.ogg'),
+		new/datum/track("Childhood", 'sound/music/audioconsole/Childhood.ogg')
+	)
+
+/obj/machinery/media/jukebox/audioconsole/update_icon()
+	cut_overlays()
+	icon_state = state_base
+	if(playing)
+		add_overlay("[state_base]-running")
\ No newline at end of file
diff --git a/html/changelogs/dansemacabre-tunes.yml b/html/changelogs/dansemacabre-tunes.yml
new file mode 100644
index 00000000000..57ef9fd755f
--- /dev/null
+++ b/html/changelogs/dansemacabre-tunes.yml
@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: DanseMacabre
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - soundadd: "Added a more modern jukebox to the bar. It comes with ten hit songs of the future! Console sprites from Bay."
+  - tweak: "Space jukebox is now just a normal jukebox"
diff --git a/icons/obj/audioconsole.dmi b/icons/obj/audioconsole.dmi
new file mode 100644
index 00000000000..86b7e7195f8
Binary files /dev/null and b/icons/obj/audioconsole.dmi differ
diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
index a07633f2187..35a1fd86c33 100644
--- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
+++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
@@ -2133,10 +2133,10 @@
 /area/maintenance/aux_atmospherics/deck_2/starboard)
 "aYP" = (
 /obj/machinery/button/switch/windowtint{
+	dir = 8;
 	id = "librarian";
 	pixel_x = 24;
-	pixel_y = 9;
-	dir = 8
+	pixel_y = 9
 	},
 /turf/simulated/floor/carpet,
 /area/horizon/library)
@@ -2993,8 +2993,8 @@
 "byq" = (
 /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor,
 /obj/machinery/door/blast/shutters/open{
-	name = "Viewing Shutter";
-	id = "shutters_deck2_hydroponicswindows"
+	id = "shutters_deck2_hydroponicswindows";
+	name = "Viewing Shutter"
 	},
 /turf/simulated/floor/plating,
 /area/horizon/hydroponics)
@@ -3525,8 +3525,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/airlock/maintenance{
-	req_access = list(35);
-	name = "Hydroponics Maintenance"
+	name = "Hydroponics Maintenance";
+	req_access = list(35)
 	},
 /turf/simulated/floor/plating,
 /area/horizon/hydroponics)
@@ -5935,8 +5935,8 @@
 /area/template_noop)
 "dlG" = (
 /obj/structure/sink/kitchen{
-	name = "sink";
 	dir = 8;
+	name = "sink";
 	pixel_x = 20
 	},
 /obj/machinery/light,
@@ -9099,17 +9099,17 @@
 "fdZ" = (
 /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor,
 /obj/machinery/door/blast/shutters/open{
-	name = "Viewing Shutter";
+	dir = 8;
 	id = "shutters_deck2_hydroponicswindows";
-	dir = 8
+	name = "Viewing Shutter"
 	},
 /turf/simulated/floor/plating,
 /area/horizon/hydroponics)
 "fei" = (
 /obj/machinery/firealarm/west,
 /obj/structure/sink/kitchen{
-	name = "sink";
 	dir = 4;
+	name = "sink";
 	pixel_x = -20
 	},
 /obj/effect/floor_decal/corner/green/full,
@@ -9216,8 +9216,8 @@
 	department = "Kitchen";
 	departmentType = 1;
 	name = "Kitchen Requests Console";
-	pixel_y = -2;
-	pixel_x = -4
+	pixel_x = -4;
+	pixel_y = -2
 	},
 /turf/simulated/wall,
 /area/crew_quarters/kitchen/freezer)
@@ -9981,8 +9981,8 @@
 /area/rnd/research)
 "fEI" = (
 /obj/machinery/alarm{
-	pixel_x = 28;
-	dir = 8
+	dir = 8;
+	pixel_x = 28
 	},
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 6
@@ -11382,9 +11382,9 @@
 "gmt" = (
 /obj/structure/table/standard,
 /obj/machinery/light_switch{
+	dir = 4;
 	pixel_x = -24;
-	pixel_y = -9;
-	dir = 4
+	pixel_y = -9
 	},
 /obj/machinery/requests_console{
 	department = "Hydroponics";
@@ -11398,17 +11398,17 @@
 	},
 /obj/machinery/button/remote/blast_door{
 	dir = 4;
-	pixel_x = -40;
-	pixel_y = -7;
+	id = "shutters_deck2_hydroponicsdesk";
 	name = "Desk Shutter";
-	id = "shutters_deck2_hydroponicsdesk"
+	pixel_x = -40;
+	pixel_y = -7
 	},
 /obj/machinery/button/remote/blast_door{
 	dir = 4;
-	pixel_x = -40;
-	pixel_y = 4;
+	id = "shutters_deck2_hydroponicswindows";
 	name = "Window Shutters";
-	id = "shutters_deck2_hydroponicswindows"
+	pixel_x = -40;
+	pixel_y = 4
 	},
 /obj/machinery/light{
 	dir = 1
@@ -11644,8 +11644,8 @@
 "gsh" = (
 /obj/structure/table/standard,
 /obj/machinery/reagentgrinder{
-	pixel_y = 7;
-	pixel_x = 1
+	pixel_x = 1;
+	pixel_y = 7
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/hydroponics)
@@ -13522,11 +13522,11 @@
 "hqS" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/machinery/button/remote/blast_door{
+	dir = 1;
 	id = "diner_shutters";
 	name = "Diner Counter Shutters";
-	pixel_y = -29;
 	pixel_x = -9;
-	dir = 1
+	pixel_y = -29
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/kitchen)
@@ -14777,9 +14777,9 @@
 /area/rnd/hallway)
 "idL" = (
 /obj/structure/disposalpipe/sortjunction/flipped{
+	icon_state = "pipe-j1s";
 	name = "Hydroponics";
-	sortType = "Hydroponics";
-	icon_state = "pipe-j1s"
+	sortType = "Hydroponics"
 	},
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
@@ -14801,9 +14801,9 @@
 /obj/structure/grille,
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/shutters/open{
-	name = "Viewing Shutter";
+	dir = 4;
 	id = "shutters_deck2_hydroponicswindowssafety";
-	dir = 4
+	name = "Viewing Shutter"
 	},
 /turf/simulated/floor/plating,
 /area/horizon/hydroponics)
@@ -20373,8 +20373,8 @@
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/extinguisher_cabinet{
-	pixel_y = -32;
-	dir = 1
+	dir = 1;
+	pixel_y = -32
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hydroponics)
@@ -20578,8 +20578,8 @@
 /area/chapel/office)
 "lBS" = (
 /obj/machinery/door/airlock/maintenance{
-	req_access = list(12);
-	name = "Public Garden Maintenance"
+	name = "Public Garden Maintenance";
+	req_access = list(12)
 	},
 /obj/machinery/door/firedoor,
 /obj/structure/cable/green{
@@ -21752,12 +21752,12 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/firedoor,
 /obj/machinery/door/window/northleft{
-	req_access = list(35);
-	name = "Hydroponics"
+	name = "Hydroponics";
+	req_access = list(35)
 	},
 /obj/machinery/door/window/southleft{
-	req_access = list(28);
-	name = "Kitchen"
+	name = "Kitchen";
+	req_access = list(28)
 	},
 /obj/effect/floor_decal/corner/green{
 	dir = 1
@@ -22473,8 +22473,8 @@
 	dir = 1
 	},
 /obj/structure/extinguisher_cabinet{
-	pixel_y = -32;
-	dir = 1
+	dir = 1;
+	pixel_y = -32
 	},
 /obj/effect/floor_decal/corner/green/diagonal,
 /obj/effect/floor_decal/spline/plain/cee,
@@ -22527,10 +22527,13 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/hor)
 "mDD" = (
-/obj/structure/bed/stool/padded/red,
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/media/jukebox/audioconsole{
+	anchored = 1;
+	pixel_x = -8
+	},
 /turf/simulated/floor/lino/grey,
 /area/hallway/primary/central_two)
 "mDQ" = (
@@ -29582,8 +29585,8 @@
 "quh" = (
 /obj/structure/table/standard,
 /obj/machinery/reagentgrinder{
-	pixel_y = 7;
-	pixel_x = 1
+	pixel_x = 1;
+	pixel_y = 7
 	},
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 10
@@ -30792,8 +30795,8 @@
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/machinery/light_switch{
-	pixel_y = 7;
-	pixel_x = -3
+	pixel_x = -3;
+	pixel_y = 7
 	},
 /obj/machinery/button/remote/airlock{
 	id = "dinerbolt";
@@ -34673,8 +34676,8 @@
 /area/server)
 "thY" = (
 /obj/machinery/orderterminal{
-	pixel_y = -3;
-	pixel_x = -30
+	pixel_x = -30;
+	pixel_y = -3
 	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/kitchen)
@@ -34710,8 +34713,8 @@
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/item/device/radio/intercom{
-	pixel_y = -24;
-	dir = 1
+	dir = 1;
+	pixel_y = -24
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/hydroponics)
@@ -34745,9 +34748,9 @@
 	name = "Hydroponics Desk External"
 	},
 /obj/machinery/door/blast/shutters{
+	dir = 8;
 	id = "shutters_deck2_hydroponicsdesk";
-	name = "Hydroponics Desk Shutter";
-	dir = 8
+	name = "Hydroponics Desk Shutter"
 	},
 /turf/simulated/floor/plating,
 /area/horizon/hydroponics)
@@ -35915,10 +35918,10 @@
 "tRz" = (
 /obj/machinery/button/remote/blast_door{
 	dir = 8;
-	pixel_x = 25;
-	pixel_y = -7;
+	id = "shutters_deck2_hydroponicswindowssafety";
 	name = "Viewing Shutters";
-	id = "shutters_deck2_hydroponicswindowssafety"
+	pixel_x = 25;
+	pixel_y = -7
 	},
 /obj/structure/closet/secure_closet/hydroponics,
 /obj/item/watertank,
@@ -36684,8 +36687,8 @@
 /area/crew_quarters/kitchen/freezer)
 "uma" = (
 /obj/effect/map_effect/airlock{
-	radio_frequency = 2006;
-	name = "Security Maintenance AIrlock (2006)"
+	name = "Security Maintenance AIrlock (2006)";
+	radio_frequency = 2006
 	},
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/horizon/hydroponics)
@@ -38014,8 +38017,8 @@
 /obj/machinery/door/firedoor,
 /obj/structure/plasticflaps/airtight,
 /obj/machinery/door/airlock/freezer{
-	req_access = list(28);
-	name = "Freezer"
+	name = "Freezer";
+	req_access = list(28)
 	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/kitchen/freezer)
@@ -43020,8 +43023,8 @@
 	},
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/freezer{
-	req_access = list(28);
-	name = "Freezer"
+	name = "Freezer";
+	req_access = list(28)
 	},
 /obj/structure/plasticflaps/airtight,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -43060,8 +43063,8 @@
 /area/security/armory)
 "xBv" = (
 /obj/machinery/door/airlock/multi_tile/glass{
-	name = "Public Garden";
-	dir = 2
+	dir = 2;
+	name = "Public Garden"
 	},
 /obj/machinery/door/firedoor/multi_tile{
 	dir = 2
@@ -63630,7 +63633,7 @@ gHV
 ugp
 eBy
 ycL
-kAo
+tfl
 kAo
 ncN
 mZI
diff --git a/sound/music/audioconsole/Amsterdam.ogg b/sound/music/audioconsole/Amsterdam.ogg
new file mode 100644
index 00000000000..be431c53324
Binary files /dev/null and b/sound/music/audioconsole/Amsterdam.ogg differ
diff --git a/sound/music/audioconsole/Butterflies.ogg b/sound/music/audioconsole/Butterflies.ogg
new file mode 100644
index 00000000000..0b735724718
Binary files /dev/null and b/sound/music/audioconsole/Butterflies.ogg differ
diff --git a/sound/music/audioconsole/Childhood.ogg b/sound/music/audioconsole/Childhood.ogg
new file mode 100644
index 00000000000..1758fcc99d4
Binary files /dev/null and b/sound/music/audioconsole/Childhood.ogg differ
diff --git a/sound/music/audioconsole/DontRush.ogg b/sound/music/audioconsole/DontRush.ogg
new file mode 100644
index 00000000000..81a9852fd6f
Binary files /dev/null and b/sound/music/audioconsole/DontRush.ogg differ
diff --git a/sound/music/audioconsole/Lips.ogg b/sound/music/audioconsole/Lips.ogg
new file mode 100644
index 00000000000..7ab5665a3bd
Binary files /dev/null and b/sound/music/audioconsole/Lips.ogg differ
diff --git a/sound/music/audioconsole/Number0.ogg b/sound/music/audioconsole/Number0.ogg
new file mode 100644
index 00000000000..4bccbb2e5b9
Binary files /dev/null and b/sound/music/audioconsole/Number0.ogg differ
diff --git a/sound/music/audioconsole/PhoronWillMakeUsRich.ogg b/sound/music/audioconsole/PhoronWillMakeUsRich.ogg
new file mode 100644
index 00000000000..b10df084dea
Binary files /dev/null and b/sound/music/audioconsole/PhoronWillMakeUsRich.ogg differ
diff --git a/sound/music/audioconsole/ThatAintChopin.ogg b/sound/music/audioconsole/ThatAintChopin.ogg
new file mode 100644
index 00000000000..0254565a0da
Binary files /dev/null and b/sound/music/audioconsole/ThatAintChopin.ogg differ
diff --git a/sound/music/audioconsole/ThePianist.ogg b/sound/music/audioconsole/ThePianist.ogg
new file mode 100644
index 00000000000..a6d2aad4273
Binary files /dev/null and b/sound/music/audioconsole/ThePianist.ogg differ
diff --git a/sound/music/audioconsole/When.ogg b/sound/music/audioconsole/When.ogg
new file mode 100644
index 00000000000..94cf035c743
Binary files /dev/null and b/sound/music/audioconsole/When.ogg differ
diff --git a/sound/music/audioconsole/licensing.txt b/sound/music/audioconsole/licensing.txt
new file mode 100644
index 00000000000..728901cbc05
--- /dev/null
+++ b/sound/music/audioconsole/licensing.txt
@@ -0,0 +1,10 @@
+phoron will make us rich - Alexander Divine - CC BY-NC-SA 3.0
+Amsterdam - LASERS - CC BY-NC-SA 3.0
+when - Stephan Siebert - CC BY-NC-ND 4.0
+Lips - Plurabelle - CC BY-NC-SA 3.0
+Childhood - HoliznaCC0 - CC0 1.0/Public Domain
+That Ain't Chopin - Dee Yan-Key - CC BY-NC-SA 4.0
+Butterflies - Dee Yan-Key - CC BY-NC-SA 4.0
+Don't Rush - Zero V - CC BY-NC-SA 3.0
+Number 0 - Jesse Spillane - CC BY 4.0
+The Pianist - Dee Yan-Key - CC BY-NC-SA 4.0
\ No newline at end of file