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

2 minute vote time

Browse Source
This commit is contained in:
Putnam
2019-12-31 23:11:34 -08:00
parent 51a7c7776a
commit 9b0e27cbc3
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/ticker.dm
+2 -2
View File
@@ -481,9 +481,9 @@ SUBSYSTEM_DEF(ticker)
SSticker.modevoted = TRUE SSticker.modevoted = TRUE
var/dynamic = CONFIG_GET(flag/dynamic_voting) var/dynamic = CONFIG_GET(flag/dynamic_voting)
if(dynamic) if(dynamic)
SSvote.initiate_vote("dynamic","server",hideresults=TRUE,votesystem=SCORE_VOTING,forced=TRUE) SSvote.initiate_vote("dynamic","server",hideresults=TRUE,votesystem=SCORE_VOTING,forced=TRUE,vote_time = 2 MINUTES)
else else
SSvote.initiate_vote("roundtype","server",hideresults=TRUE,votesystem=PLURALITY_VOTING,forced=TRUE) SSvote.initiate_vote("roundtype","server",hideresults=TRUE,votesystem=PLURALITY_VOTING,forced=TRUE, vote_time = 2 MINUTES)
/datum/controller/subsystem/ticker/Recover() /datum/controller/subsystem/ticker/Recover()
current_state = SSticker.current_state current_state = SSticker.current_state
code/controllers/subsystem/vote.dm
+4 -2
View File
@@ -333,7 +333,7 @@ SUBSYSTEM_DEF(vote)
saved -= usr.ckey saved -= usr.ckey
return 0 return 0
/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key, hideresults, votesystem = PLURALITY_VOTING, forced = FALSE)//CIT CHANGE - adds hideresults argument to votes to allow for obfuscated votes /datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key, hideresults, votesystem = PLURALITY_VOTING, forced = FALSE,vote_time = -1)//CIT CHANGE - adds hideresults argument to votes to allow for obfuscated votes
vote_system = votesystem vote_system = votesystem
if(!mode) if(!mode)
if(started_time) if(started_time)
@@ -399,7 +399,9 @@ SUBSYSTEM_DEF(vote)
if(mode == "custom") if(mode == "custom")
text += "\n[question]" text += "\n[question]"
log_vote(text) log_vote(text)
var/vp = CONFIG_GET(number/vote_period) var/vp = vote_time
if(vp == -1)
vp = CONFIG_GET(number/vote_period)
to_chat(world, "\n<font color='purple'><b>[text]</b>\nType <b>vote</b> or click <a href='?src=[REF(src)]'>here</a> to place your votes.\nYou have [DisplayTimeText(vp)] to vote.</font>") to_chat(world, "\n<font color='purple'><b>[text]</b>\nType <b>vote</b> or click <a href='?src=[REF(src)]'>here</a> to place your votes.\nYou have [DisplayTimeText(vp)] to vote.</font>")
end_time = started_time+vp end_time = started_time+vp
for(var/c in GLOB.clients) for(var/c in GLOB.clients)