Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master'

2016-08-11 17:24:40 -04:00
parent b4f04ee500 b546571538
commit 853b6fc28d
4 changed files with 1 additions and 1 deletions
@@ -54,7 +54,7 @@ var/datum/subsystem/ticker/ticker
 /datum/subsystem/ticker/New()
 	NEW_SS_GLOBAL(ticker)

-	login_music = pickweight(list('sound/ambience/title2.ogg' = 31, 'sound/ambience/title1.ogg' = 31, 'sound/ambience/title3.ogg' =31, 'sound/ambience/clown.ogg' = 7)) // choose title music!
+	login_music = pickweight(list('sound/ambience/title1.ogg' = 31, 'sound/ambience/title2.ogg' = 31, 'sound/ambience/title3.ogg' = 31, 'sound/ambience/title4.ogg' = 31, 'sound/ambience/title5.ogg' = 31, 'sound/ambience/title6.ogg' = 31, 'sound/ambience/clown.ogg' = 7)) // choose title music!
 	if(SSevent.holidays && SSevent.holidays[APRIL_FOOLS])
 		login_music = 'sound/ambience/clown.ogg'