cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a silly, and no mode votes while round is in progress, more .gitignore (*.lk, info.json)

Browse Source
This commit is contained in:
Miniature
2011-12-02 15:47:42 +10:30
parent 3089cd7db9
commit e1a254c34f
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/vote.dm
+9 -4
View File
@@ -59,7 +59,7 @@
calcwin()
if(mode)
if(!ticker)
if(ticker.current_state == GAME_STATE_PREGAME)
if(!going)
world << "<B>The game will start soon.</B>"
going = 1
@@ -74,7 +74,7 @@
world << "Result is change to \red [wintext]"
world.save_mode(winner)
if(ticker.current_state != 1)
if(ticker.current_state != GAME_STATE_PREGAME)
world <<"\red <B>World will reboot in 10 seconds</B>"
feedback_set_details("end_error","mode vote - [winner]")
@@ -262,7 +262,9 @@
if(!vote.canvote()) // not time to vote yet
if(config.allow_vote_restart) text+="Voting to restart is enabled.<BR>"
if(config.allow_vote_mode) text+="Voting to change mode is enabled.<BR>"
if(config.allow_vote_mode)
if(ticker.current_state == GAME_STATE_PREGAME) text+="Voting to change mode is enabled.<BR>"
else text =+ "Change mode votes are disabled while a round is in progress, vote to restart first.<BR>"
text+="<BR><P>Next vote can begin in [vote.nextwait()]."
text+=footer
@@ -273,7 +275,10 @@
if(config.allow_vote_restart)
text += "<A href='?src=\ref[vote];voter=\ref[src];vmode=1'>Begin restart vote.</A><BR>"
if(config.allow_vote_mode)
text += "<A href='?src=\ref[vote];voter=\ref[src];vmode=2'>Begin change mode vote.</A><BR>"
if(ticker.current_state == GAME_STATE_PREGAME)
text += "<A href='?src=\ref[vote];voter=\ref[src];vmode=2'>Begin change mode vote.</A><BR>"
else
text =+ "Change mode votes are disabled while a round is in progress, vote to restart first.<BR>"
text += footer
usr << browse(text, "window=vote")