cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6564 from TwistedAkai/master

Browse Source 
Add round start check to Declare Ready
This commit is contained in:
Zuhayr
2014-10-02 11:44:07 +09:30
parent dd9b3fe613 4c5665d4fd
commit a0ad04f520
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/mob/new_player/new_player.dm
View File

@@ -95,7 +95,10 @@
return 1 return 1
if(href_list["ready"]) if(href_list["ready"])
ready = !ready if(!ticker || ticker.current_state <= GAME_STATE_PREGAME) // Make sure we don't ready up after the round has started
ready = !ready
else
ready = 0
if(href_list["refresh"]) if(href_list["refresh"])
src << browse(null, "window=playersetup") //closes the player setup window src << browse(null, "window=playersetup") //closes the player setup window