cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-02 05:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6884 from PsiOmegaDelta/LobbyVote

Browse Source 
Fixes #6881
This commit is contained in:
Chinsky
2014-10-30 22:13:32 +03:00
parent be7a9bcf3a 6ec31fc48e
commit fff3622386
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/controllers/voting.dm
View File

@@ -48,11 +48,11 @@ datum/controller/vote
voting.Cut()
proc/autotransfer()
initiate_vote("crew_transfer","the server")
initiate_vote("crew_transfer","the server", 1)
log_debug("The server has called a crew transfer vote")
proc/autogamemode()
initiate_vote("gamemode","the server")
initiate_vote("gamemode","the server", 1)
log_debug("The server has called a gamemode vote")
proc/reset()
@@ -197,9 +197,9 @@ datum/controller/vote
return vote
return 0
proc/initiate_vote(var/vote_type, var/initiator_key)
proc/initiate_vote(var/vote_type, var/initiator_key, var/automatic = 0)
if(!mode)
if(started_time != null && !check_rights(R_ADMIN))
if(started_time != null && !(check_rights(R_ADMIN) || automatic))
var/next_allowed_time = (started_time + config.vote_delay)
if(next_allowed_time > world.time)
return 0