From a7f3d6567fa0303e7bc12eeef43c871707faad89 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Tue, 12 Nov 2019 10:01:02 -0800 Subject: [PATCH 01/13] adds a song for independence day cant think of other music for it --- code/modules/holiday/holidays.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 9de2dc0e8880..eb0693c1e458 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -252,7 +252,9 @@ name = "Independence Day" begin_day = 4 begin_month = JULY - +lobby_music = list( + https://www.youtube.com/watch?v=MGQaH3-LK54", // america song yes hhaah + ) /datum/holiday/USA/getStationPrefix() return pick("Independent","American","Burger","Bald Eagle","Star-Spangled", "Fireworks") From d8d6e857603873f267ded2da63e80abf0bbd9cd6 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Tue, 12 Nov 2019 15:00:38 -0800 Subject: [PATCH 02/13] e --- code/modules/holiday/holidays.dm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index eb0693c1e458..ca471504ec46 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -253,7 +253,7 @@ begin_day = 4 begin_month = JULY lobby_music = list( - https://www.youtube.com/watch?v=MGQaH3-LK54", // america song yes hhaah + "https://www.youtube.com/watch?v=U1mlCPMYtPk", // america ) /datum/holiday/USA/getStationPrefix() return pick("Independent","American","Burger","Bald Eagle","Star-Spangled", "Fireworks") @@ -504,16 +504,7 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and begin_month = DECEMBER end_day = 27 drone_hat = /obj/item/clothing/head/santa - lobby_music = list( - "https://www.youtube.com/watch?v=v7s2VjwQSMw", // jingle bells - "https://www.youtube.com/watch?v=x2YlbiyiuMc", // Winter Wonderland - "https://www.youtube.com/watch?v=cW38y4AFGyI", // The Grinch - "https://www.youtube.com/watch?v=zgKazTrhXmI", // frosty the snowman - "https://www.youtube.com/watch?v=oyEyMjdD2uk", // twelve days of christmas - "https://www.youtube.com/watch?v=maYCStVzjDs", // deer song - "https://www.youtube.com/watch?v=Dkq3LD-4pmM", // jolly christmas - "https://www.youtube.com/watch?v=_9ePg09zV-0", // i got a brand new dsi for christmas - ) + /datum/holiday/xmas/greet() return "Have a merry Christmas!" From 9588675d4ce7430932e63dcc21b00c006616dde7 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Tue, 12 Nov 2019 15:17:32 -0800 Subject: [PATCH 03/13] Update holidays.dm --- code/modules/holiday/holidays.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index ca471504ec46..cebc862b93a6 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -503,8 +503,8 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and begin_day = 22 begin_month = DECEMBER end_day = 27 - drone_hat = /obj/item/clothing/head/santa - + drone_hat = /obj/item/clothing/head/santa + /datum/holiday/xmas/greet() return "Have a merry Christmas!" From 4b03f1ee8dca1798ead33fde03ec7135cd41546d Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Tue, 12 Nov 2019 15:19:52 -0800 Subject: [PATCH 04/13] Update holidays.dm --- code/modules/holiday/holidays.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index cebc862b93a6..98c23e91c9f3 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -253,7 +253,7 @@ begin_day = 4 begin_month = JULY lobby_music = list( - "https://www.youtube.com/watch?v=U1mlCPMYtPk", // america + "https://www.youtube.com/watch?v=U1mlCPMYtPk" // america ) /datum/holiday/USA/getStationPrefix() return pick("Independent","American","Burger","Bald Eagle","Star-Spangled", "Fireworks") From 0acd2fdec9b0f6a910dc5131ef18ab7a657550f2 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Tue, 12 Nov 2019 15:30:43 -0800 Subject: [PATCH 05/13] why in the fuck isnt this working its identical --- code/modules/holiday/holidays.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 98c23e91c9f3..209749eea3b1 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -253,8 +253,9 @@ begin_day = 4 begin_month = JULY lobby_music = list( - "https://www.youtube.com/watch?v=U1mlCPMYtPk" // america + "https://www.youtube.com/watch?v=U1mlCPMYtPk", //america ) + /datum/holiday/USA/getStationPrefix() return pick("Independent","American","Burger","Bald Eagle","Star-Spangled", "Fireworks") From 67cc19741c1e26a26d641c4e21ee91dfd45f75f2 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Tue, 12 Nov 2019 15:33:17 -0800 Subject: [PATCH 06/13] why --- code/modules/holiday/holidays.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 209749eea3b1..a9e45c20f1e3 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -504,7 +504,7 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and begin_day = 22 begin_month = DECEMBER end_day = 27 - drone_hat = /obj/item/clothing/head/santa + drone_hat = /obj/item/clothing/head/santa /datum/holiday/xmas/greet() return "Have a merry Christmas!" From 63c41863085839c40c97f63b1126ab0efa21edec Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Tue, 12 Nov 2019 15:43:29 -0800 Subject: [PATCH 07/13] this --- code/modules/holiday/holidays.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index a9e45c20f1e3..405703a3201e 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -252,9 +252,8 @@ name = "Independence Day" begin_day = 4 begin_month = JULY -lobby_music = list( - "https://www.youtube.com/watch?v=U1mlCPMYtPk", //america - ) + lobby_music = list( + "https://www.youtube.com/watch?v=U1mlCPMYtPk", //america ) /datum/holiday/USA/getStationPrefix() return pick("Independent","American","Burger","Bald Eagle","Star-Spangled", "Fireworks") From a5cfa1272f0f3a0ee11a660757dbe97acf881a1e Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Tue, 12 Nov 2019 15:43:35 -0800 Subject: [PATCH 08/13] this From 964abf23cd03624f865886452a9b1f9f5c3b1ab5 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Tue, 12 Nov 2019 15:55:48 -0800 Subject: [PATCH 09/13] Update holidays.dm --- code/modules/holiday/holidays.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 405703a3201e..434726c57598 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -253,7 +253,7 @@ begin_day = 4 begin_month = JULY lobby_music = list( - "https://www.youtube.com/watch?v=U1mlCPMYtPk", //america ) + "https://www.youtube.com/watch?v=5uPoDNEn3I0", // americ /datum/holiday/USA/getStationPrefix() return pick("Independent","American","Burger","Bald Eagle","Star-Spangled", "Fireworks") From 905601ff019dee01444128d255d2907a58da3c12 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Tue, 12 Nov 2019 17:15:31 -0800 Subject: [PATCH 10/13] Update holidays.dm --- code/modules/holiday/holidays.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 434726c57598..ad649f39475b 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -254,7 +254,7 @@ begin_month = JULY lobby_music = list( "https://www.youtube.com/watch?v=5uPoDNEn3I0", // americ - +) /datum/holiday/USA/getStationPrefix() return pick("Independent","American","Burger","Bald Eagle","Star-Spangled", "Fireworks") From 19fdb95cb8cbe2f2c90f60690ed333731c435ae8 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Tue, 19 Nov 2019 16:06:32 -0800 Subject: [PATCH 11/13] Update holidays.dm --- code/modules/holiday/holidays.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index ad649f39475b..0cd55a775e08 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -253,7 +253,10 @@ begin_day = 4 begin_month = JULY lobby_music = list( - "https://www.youtube.com/watch?v=5uPoDNEn3I0", // americ + "https://www.youtube.com/watch?v=5uPoDNEn3I0", // america + "https://www.youtube.com/watch?v=ec0XKhAHR5I", / fortunate + "https://www.youtube.com/watch?v=9Cyokaj3BJU", // alabama + "https://www.youtube.com/watch?v=1vrEljMfXYo", // country roads ) /datum/holiday/USA/getStationPrefix() return pick("Independent","American","Burger","Bald Eagle","Star-Spangled", "Fireworks") From b6a82ecbb0450f2213d83e81bff9cfc99ca83e3a Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Tue, 19 Nov 2019 23:17:17 -0800 Subject: [PATCH 12/13] Update holidays.dm --- code/modules/holiday/holidays.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 0cd55a775e08..ea0fa24d6633 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -254,7 +254,7 @@ begin_month = JULY lobby_music = list( "https://www.youtube.com/watch?v=5uPoDNEn3I0", // america - "https://www.youtube.com/watch?v=ec0XKhAHR5I", / fortunate + "https://www.youtube.com/watch?v=ec0XKhAHR5I", // fortunate (how did i forget a slash) "https://www.youtube.com/watch?v=9Cyokaj3BJU", // alabama "https://www.youtube.com/watch?v=1vrEljMfXYo", // country roads ) From 40238c91d224660fb818c10ecc003fa4ce0eb4cb Mon Sep 17 00:00:00 2001 From: Nichlas Pihl Date: Thu, 21 Nov 2019 15:10:33 +0000 Subject: [PATCH 13/13] Update holidays.dm --- code/modules/holiday/holidays.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index ea0fa24d6633..6d33eef0517b 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -256,8 +256,8 @@ "https://www.youtube.com/watch?v=5uPoDNEn3I0", // america "https://www.youtube.com/watch?v=ec0XKhAHR5I", // fortunate (how did i forget a slash) "https://www.youtube.com/watch?v=9Cyokaj3BJU", // alabama - "https://www.youtube.com/watch?v=1vrEljMfXYo", // country roads -) + "https://www.youtube.com/watch?v=1vrEljMfXYo" // country roads + ) /datum/holiday/USA/getStationPrefix() return pick("Independent","American","Burger","Bald Eagle","Star-Spangled", "Fireworks")