Merge branch 'master' into Ryu113-patch-1

code/game/birthday.dm

@@ -20,10 +20,9 @@
 		msg = "Today is your birthday! Do you want to increase your character's listed age?"
 		/* //Chomp DISABLE - Absolutely not.
 		if(client.prefs.bday_announce)
-			var/list/sounds = list('sound/voice/BIRTH1.ogg','sound/voice/BIRTH2.ogg')
+			var/list/sounds = list('sound/voice/BIRTH.ogg')
 			var/oursound = pickweight(sounds)
 			command_announcement.Announce("Confirmed presence of BIRTHDAY aboard the station! It is [src.real_name]'s birthday or similar sort of celebration, name day, hatchday, WHATEVER! We encourage you to go find [src.real_name] and show them how we celebrate around here! Have a secure day!", "BIRTHDAY!", oursound)
-			to_world("We did it")
 		*/ //Chomp DISABLE END
 	else
 		msg = "Your birthday has passed! Do you want to increase your character's listed age?"	//sad, but thus is the life of an adult

config/jukebox.json

@@ -4874,6 +4874,16 @@
 "url": "https://archive.org/download/i-care-because-you-do-flac/10.%20Aphex%20Twin%20-%20Alberto%20Balsalm.mp3",
 "title": "Alberto Balsalm",
 "duration": 3110,
+ "artist": "Aphex Twin",
+"genre": "Electronic",
+"secret": false,
+"lobby": false,
+"jukebox": true
+},
+{
+"url": "https://archive.org/download/selected-ambient-works-85-92-flac/01.%20Aphex%20Twin%20-%20Xtal.mp3",
+"title": "Xtal",
+"duration": 2930,
 "artist": "Aphex Twin",
 "genre": "Electronic",
 "secret": false,