From e15577a6592f362e1183c89fa8201275ff8acab2 Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Sat, 28 Mar 2020 20:51:21 +0000 Subject: [PATCH 1/2] Update ticker.dm --- yogstation/code/controllers/subsystem/ticker.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yogstation/code/controllers/subsystem/ticker.dm b/yogstation/code/controllers/subsystem/ticker.dm index ba4838107f89..53a73cf15d95 100644 --- a/yogstation/code/controllers/subsystem/ticker.dm +++ b/yogstation/code/controllers/subsystem/ticker.dm @@ -29,7 +29,7 @@ "https://www.youtube.com/watch?v=fMn30T5wEVg", // Mike Morasky - SynTek Residential Mall (Extended by FoxOnTheRails) "https://www.youtube.com/watch?v=iB5Az3vbkYs", // Coalescence - Risk of Rain (Cover by Nahu Pyrope) "https://www.youtube.com/watch?v=SQOdPQQf2Uo", // Star Trek The Motion Picture: Main Theme Album Style Edit - "https://www.youtube.com/watch?v=cJxSwxexZYo") // She Blinded Me With Science (2009 Remastered Version) + "https://www.youtube.com/watch?v=cJxSwxexZYo") // Thomas Dolby - She blinded me with science selected_lobby_music = pick(songs) From 21a209053489baf4d126a8eae0d28d39c3a52241 Mon Sep 17 00:00:00 2001 From: alexkar598 <25136265+alexkar598@users.noreply.github.com> Date: Mon, 30 Mar 2020 13:44:58 -0400 Subject: [PATCH 2/2] Update yogstation/code/controllers/subsystem/ticker.dm Co-Authored-By: Hopekz --- yogstation/code/controllers/subsystem/ticker.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yogstation/code/controllers/subsystem/ticker.dm b/yogstation/code/controllers/subsystem/ticker.dm index 53a73cf15d95..aa593d889155 100644 --- a/yogstation/code/controllers/subsystem/ticker.dm +++ b/yogstation/code/controllers/subsystem/ticker.dm @@ -29,7 +29,7 @@ "https://www.youtube.com/watch?v=fMn30T5wEVg", // Mike Morasky - SynTek Residential Mall (Extended by FoxOnTheRails) "https://www.youtube.com/watch?v=iB5Az3vbkYs", // Coalescence - Risk of Rain (Cover by Nahu Pyrope) "https://www.youtube.com/watch?v=SQOdPQQf2Uo", // Star Trek The Motion Picture: Main Theme Album Style Edit - "https://www.youtube.com/watch?v=cJxSwxexZYo") // Thomas Dolby - She blinded me with science + "https://www.youtube.com/watch?v=cJxSwxexZYo") // Thomas Dolby - She blinded me with science (2009 Remaster) selected_lobby_music = pick(songs)