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

Merge branch 'master' of github.com:Baystation12/Baystation12 into feature

Browse Source 
Conflicts:
	baystation12.dme
This commit is contained in:
cib
2013-05-19 05:54:14 +02:00
parent 8cfc395232 639da5b25b
commit fc20393b60
14 changed files with 10401 additions and 10402 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/voting.dm
+2 -2
View File
@@ -200,7 +200,7 @@ datum/controller/vote
log_vote(text)
world << "<font color='purple'><b>[text]</b>\nType vote to place your votes.\nYou have [config.vote_period/10] seconds to vote.</font>"
world << sound('misc/bloblarm.ogg')
world << sound('weapons/smg_empty_alarm.ogg')
if(mode == "gamemode" && going)
going = 0
world << "<font color='red'><b>Round start has been delayed.</b></font>"
@@ -305,4 +305,4 @@ datum/controller/vote
set name = "Vote"
if(vote)
src << browse(vote.interface(client),"window=vote;can_close=0")
src << browse(vote.interface(client),"window=vote;can_close=0")