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

christmas music #7051

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

christmas music #7051

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
96b9a3c
makes halloween commit
boodaliboo Oct 31, 2019
220bbb5
Update golems.dm
boodaliboo Nov 8, 2019
be54125
Update golems.dm
boodaliboo Nov 8, 2019
443fee3
songs
boodaliboo Nov 8, 2019
a773486
Update holidays.dm
boodaliboo Nov 8, 2019
70de495
Update halloween.dm
boodaliboo Nov 10, 2019
b43ae65
adds dsi song
boodaliboo Nov 12, 2019
abd73a4
removed dsi song sadly
boodaliboo 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
10 changes: 9 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 @@ -502,7 +502,15 @@ 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
)
/datum/holiday/xmas/greet()
return "Have a merry Christmas!"

Expand Down