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

Merge branch 'master' of git://github.com/Baystation12/Baystation12

Browse Source 
Conflicts:
	code/game/vote.dm

Because I did it derpily.
This commit is contained in:
Miniature
2011-12-03 19:30:28 +10:30
parent f62eccc76b 0adfd00e88
commit 2159409d53
29 changed files with 212 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/equipment/weapons/weapons.dm
+2 -1
View File
@@ -125,7 +125,8 @@
if(istype(H.ears, /obj/item/clothing/ears/earmuffs))
continue
M << "<font color='red' size='7'>HONK</font>"
M.sleeping = 0
if(!M.sleeping_willingly)
M.sleeping = 0
M.stuttering += 20
M.ear_deaf += 30
M.weakened = 3
code/game/vote.dm
+5 -5
View File
@@ -59,7 +59,7 @@
calcwin()
if(mode)
if(ticker.current_state == GAME_STATE_PREGAME)
if(ticker.current_state == 1)
if(!going)
world << "<B>The game will start soon.</B>"
going = 1
@@ -263,8 +263,8 @@
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)
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>"
if(ticker.current_state == 1) 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
@@ -275,10 +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)
if(ticker.current_state == GAME_STATE_PREGAME)
if(ticker.current_state == 1)
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 += "Change mode votes are disabled while a round is in progress, vote to restart first.<BR>"
text += footer
usr << browse(text, "window=vote")