Merge pull request #2927 from Baystation12/master

Merging master to BEF
This commit is contained in:
Chinsky
2013-05-31 19:49:13 -07:00
20 changed files with 87 additions and 53 deletions
@@ -65,6 +65,10 @@
Stat()
..()
statpanel("Status")
if (client.statpanel == "Status" && ticker)
if (ticker.current_state != GAME_STATE_PREGAME)
stat(null, "Station Time: [worldtime2text()]")
statpanel("Lobby")
if(client.statpanel=="Lobby" && ticker)
if(ticker.hide_mode)