From 4a87af4bc191f4d14bfe4c812a8081dc230826a5 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Thu, 28 Feb 2019 11:30:15 +0100 Subject: [PATCH 1/2] Holiday specific Jukebox tracks --- code/modules/media/media_tracks.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/media/media_tracks.dm b/code/modules/media/media_tracks.dm index 708e2a811e..0f5a874675 100644 --- a/code/modules/media/media_tracks.dm +++ b/code/modules/media/media_tracks.dm @@ -35,7 +35,10 @@ var/global/list/all_lobby_tracks = list() // Read the jukebox configuration file on system startup. /hook/startup/proc/load_jukebox_tracks() - var/jukebox_track_file = "config/jukebox.json" + if(Holiday == "April Fool's Day") + var/jukebox_track_file = "config/apriljukebox.json" + else + var/jukebox_track_file = "config/jukebox.json" if(!fexists(jukebox_track_file)) warning("File not found: [jukebox_track_file]") return From 62e522d21a6b3b5fa8d3bc2d60c6a3811a2ec751 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Thu, 28 Feb 2019 11:38:47 +0100 Subject: [PATCH 2/2] Update media_tracks.dm --- code/modules/media/media_tracks.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/media/media_tracks.dm b/code/modules/media/media_tracks.dm index 0f5a874675..6544e62571 100644 --- a/code/modules/media/media_tracks.dm +++ b/code/modules/media/media_tracks.dm @@ -35,10 +35,9 @@ var/global/list/all_lobby_tracks = list() // Read the jukebox configuration file on system startup. /hook/startup/proc/load_jukebox_tracks() + var/jukebox_track_file = "config/jukebox.json" if(Holiday == "April Fool's Day") - var/jukebox_track_file = "config/apriljukebox.json" - else - var/jukebox_track_file = "config/jukebox.json" + jukebox_track_file = "config/apriljukebox.json" if(!fexists(jukebox_track_file)) warning("File not found: [jukebox_track_file]") return