Merge pull request #3862 from DJSnapshot/dev-freeze

Fix for auto-transfer being called every 10 after 3 hours
This commit is contained in:
Chinsky
2013-11-03 01:47:06 -08:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -28,7 +28,7 @@
var/vote_delay = 6000 // minimum time between voting sessions (deciseconds, 10 minute default)
var/vote_period = 600 // length of voting period (deciseconds, default 1 minute)
var/vote_autotransfer_initial = 108000 // Length of time before the first autotransfer vote is called
var/vote_autotransfer_interval = 3600 // length of time before next sequential autotransfer vote
var/vote_autotransfer_interval = 36000 // length of time before next sequential autotransfer vote
var/vote_no_default = 0 // vote does not default to nochange/norestart (tbi)
var/vote_no_dead = 0 // dead people can't vote (tbi)
// var/enable_authentication = 0 // goon authentication
+1 -1
View File
@@ -113,7 +113,7 @@ VOTE_PERIOD 600
VOTE_AUTOTRANSFER_INITIAL 108000
##autovote delay (deciseconds) before sequential automatic transfer votes are called (default 60 minutes)
Vote_AUTOTRANSFER_INTERVAL 36000
VOTE_AUTOTRANSFER_INTERVAL 36000
## prevents dead players from voting or starting votes
#NO_DEAD_VOTE