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

Merge pull request #11029 from Putnam3145/fix-that-dumb

Browse Source 
Made the fallback if config is incorrect for map voting plurality (default)
This commit is contained in:
kevinz000
2020-02-12 21:01:07 -07:00
committed by GitHub
parent 89936a1335 7795e1609d
commit 4f9652f2d2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/ticker.dm
+1 -1
View File
@@ -488,7 +488,7 @@ SUBSYSTEM_DEF(ticker)
if("SCORE") if("SCORE")
SSvote.initiate_vote("map","server",hideresults=TRUE,votesystem = MAJORITY_JUDGEMENT_VOTING) SSvote.initiate_vote("map","server",hideresults=TRUE,votesystem = MAJORITY_JUDGEMENT_VOTING)
// fallback // fallback
SSvote.initiate_vote("map","server",hideresults=TRUE,votesystem = MAJORITY_JUDGEMENT_VOTING) 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