shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kwargs

Browse Source
This commit is contained in:
Putnam
2020-02-06 15:57:42 -08:00
parent e6d353dd01
commit edcdb531cc
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/ticker.dm
+5 -5
View File
@@ -479,15 +479,15 @@ SUBSYSTEM_DEF(ticker)
else else
switch(CONFIG_GET(string/map_vote_type)) switch(CONFIG_GET(string/map_vote_type))
if("PLURALITY") if("PLURALITY")
SSvote.initiate_vote("map","server",TRUE) SSvote.initiate_vote("map","server",hideresults=TRUE)
if("APPROVAL") if("APPROVAL")
SSvote.initiate_vote("map","server",TRUE,votesystem = APPROVAL_VOTING) SSvote.initiate_vote("map","server",hideresults=TRUE,votesystem = APPROVAL_VOTING)
if("IRV") if("IRV")
SSvote.initiate_vote("map","server",TRUE,votesystem = INSTANT_RUNOFF_VOTING) SSvote.initiate_vote("map","server",hideresults=TRUE,votesystem = INSTANT_RUNOFF_VOTING)
if("SCORE") if("SCORE")
SSvote.initiate_vote("map","server",TRUE,votesystem = MAJORITY_JUDGEMENT_VOTING) SSvote.initiate_vote("map","server",hideresults=TRUE,votesystem = MAJORITY_JUDGEMENT_VOTING)
// fallback // fallback
SSvote.initiate_vote("map","server",TRUE) SSvote.initiate_vote("map","server",hideresults=TRUE)
/datum/controller/subsystem/ticker/proc/HasRoundStarted() /datum/controller/subsystem/ticker/proc/HasRoundStarted()
return current_state >= GAME_STATE_PLAYING return current_state >= GAME_STATE_PLAYING