Merge pull request #2898 from Asanadas/master

Sounds: Removed the bangin' donk from round end, added new lobby theme.
This commit is contained in:
Chinsky
2013-05-29 11:06:53 -07:00
4 changed files with 4 additions and 3 deletions
+2 -1
View File
@@ -39,7 +39,8 @@ var/global/datum/controller/gameticker/ticker
/datum/controller/gameticker/proc/pregame()
login_music = pick(\
'sound/music/space.ogg',\
'sound/music/traitor.ogg')
'sound/music/traitor.ogg',\
'sound/music/space_oddity.ogg') //Ground Control to Major Tom, this song is cool, what's going on?
do
pregame_timeleft = 180
world << "<B><FONT color='blue'>Welcome to the pre-game lobby!</FONT></B>"
+2 -2
View File
@@ -155,9 +155,9 @@
/world/Reboot(var/reason)
spawn(0)
/*spawn(0)
world << sound(pick('sound/AI/newroundsexy.ogg','sound/misc/apcdestroyed.ogg','sound/misc/bangindonk.ogg')) // random end sounds!! - LastyBatsy
*/
for(var/client/C in clients)
if(config.server) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
C << link("byond://[config.server]")
Binary file not shown.
Binary file not shown.