Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

independence day mysuc #7065

Merged
Amelia0010 merged 14 commits into from
Nov 22, 2019
Merged

independence day mysuc #7065

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a7f3d65
adds a song for independence day
boodaliboo Nov 12, 2019
d8d6e85
e
boodaliboo Nov 12, 2019
9588675
Update holidays.dm
boodaliboo Nov 12, 2019
4b03f1e
Update holidays.dm
boodaliboo Nov 12, 2019
0acd2fd
why in the fuck isnt this working its identical
boodaliboo Nov 12, 2019
67cc197
why
boodaliboo Nov 12, 2019
63c4186
this
boodaliboo Nov 12, 2019
a5cfa12
this
boodaliboo Nov 12, 2019
964abf2
Update holidays.dm
boodaliboo Nov 12, 2019
905601f
Update holidays.dm
boodaliboo Nov 13, 2019
19fdb95
Update holidays.dm
boodaliboo Nov 20, 2019
b6a82ec
Update holidays.dm
boodaliboo Nov 20, 2019
40238c9
Update holidays.dm
Amelia0010 Nov 21, 2019
54b33f0
Merge branch 'master' into the-more-holiday-song
Amelia0010 Nov 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion code/modules/holiday/holidays.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,12 @@
name = "Independence Day"
begin_day = 4
begin_month = JULY

lobby_music = list(
"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
)
/datum/holiday/USA/getStationPrefix()
return pick("Independent","American","Burger","Bald Eagle","Star-Spangled", "Fireworks")

Expand Down Expand Up @@ -498,6 +503,7 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and
"https://www.youtube.com/watch?v=maYCStVzjDs", // deer song
"https://www.youtube.com/watch?v=Dkq3LD-4pmM" // jolly christmas
)

/datum/holiday/xmas/greet()
return "Have a merry Christmas!"

Expand Down