Merge remote-tracking branch 'polaris/master' into PS_PORT_SCHEDULER

This commit is contained in:
kevinz000
2018-10-21 21:24:25 -07:00
96 changed files with 7612 additions and 7240 deletions

View File

@@ -13,5 +13,5 @@ datum/controller/transfer_controller/Destroy()
datum/controller/transfer_controller/process()
currenttick = currenttick + 1
if (round_duration_in_ticks >= timerbuffer - 1 MINUTE)
vote.autotransfer()
SSvote.autotransfer()
timerbuffer = timerbuffer + config.vote_autotransfer_interval