Merge pull request #3850 from DJSnapshot/master

end of 2spookyday event
This commit is contained in:
Mloc
2013-11-01 08:03:11 -07:00
3 changed files with 3 additions and 3 deletions
+3 -3
View File
@@ -38,10 +38,10 @@ var/global/datum/controller/gameticker/ticker
/datum/controller/gameticker/proc/pregame()
login_music = pick(\
'sound/music/halloween/skeletons.ogg',\
/*'sound/music/halloween/skeletons.ogg',\
'sound/music/halloween/halloween.ogg',\
'sound/music/halloween/ghosts.ogg')
//'sound/music/space.ogg',\
'sound/music/halloween/ghosts.ogg'*/
'sound/music/space.ogg',\
'sound/music/traitor.ogg',\
'sound/music/title2.ogg',\
'sound/music/clouds.s3m',\
Binary file not shown.

Before

Width:  |  Height:  |  Size: 644 KiB

After

Width:  |  Height:  |  Size: 662 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 644 KiB