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

Merge remote-tracking branch 'Krausus/InvestigateFix' into space_ruins

Browse Source 
@tigercat2000 is a butt
This commit is contained in:
Crazylemon64
2016-06-24 16:42:47 -07:00
parent a4fde648e7 eecf8ba93b
commit dd98f1c868
35 changed files with 97 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/voting.dm
+3 -3
View File
@@ -229,11 +229,11 @@ datum/controller/vote
to_chat(world, "<font color='purple'><b>[text]</b>\nType vote to place your votes.\nYou have [config.vote_period/10] seconds to vote.</font>")
switch(vote_type)
if("crew_transfer")
to_chat(world, sound('sound/ambience/alarm4.ogg'))
world << sound('sound/ambience/alarm4.ogg')
if("gamemode")
to_chat(world, sound('sound/ambience/alarm4.ogg'))
world << sound('sound/ambience/alarm4.ogg')
if("custom")
to_chat(world, sound('sound/ambience/alarm4.ogg'))
world << sound('sound/ambience/alarm4.ogg')
if(mode == "gamemode" && going)
going = 0
to_chat(world, "<font color='red'><b>Round start has been delayed.</b></font>")