cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 11:35:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev

Browse Source
This commit is contained in:
Mloc-Argent
2014-05-08 19:27:02 +01:00
parent e93f19449e 5426670a3d
commit 2d99a65cdf
12 changed files with 69 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/voting.dm
+4 -3
View File
@@ -163,13 +163,14 @@ datum/controller/vote
restart = 1
else
master_mode = .
if(!going)
going = 1
world << "<font color='red'><b>The round will start soon.</b></font>"
if("crew_transfer")
if(. == "Initiate Crew Transfer")
init_shift_change(null, 1)
if(mode == "gamemode") //fire this even if the vote fails.
if(!going)
going = 1
world << "<font color='red'><b>The round will start soon.</b></font>"
if(restart)
world << "World restarting due to vote..."