mmm that's compiling i don't like that
This commit is contained in:
@@ -403,10 +403,6 @@
|
||||
lowercase = FALSE
|
||||
splitter = ","
|
||||
|
||||
/datum/config_entry/number/auto_transfer_delay
|
||||
config_entry_value = 72000
|
||||
min_val = 0
|
||||
|
||||
/datum/config_entry/flag/pai_custom_holoforms
|
||||
|
||||
/datum/config_entry/number/marauder_delay_non_reebe
|
||||
|
||||
@@ -5,12 +5,14 @@ SUBSYSTEM_DEF(autotransfer)
|
||||
|
||||
var/starttime
|
||||
var/targettime
|
||||
var/voteinterval
|
||||
var/maxvotes
|
||||
var/curvotes
|
||||
|
||||
/datum/controller/subsystem/autotransfer/Initialize(timeofday)
|
||||
starttime = world.time
|
||||
targettime = starttime + CONFIG_GET(number/vote_autotransfer_initial)
|
||||
voteinterval = CONFIG_GET(number/vote_autotransfer_interval)
|
||||
maxvotes = CONFIG_GET(number/vote_autotransfer_maximum)
|
||||
curvotes = 0
|
||||
return ..()
|
||||
@@ -19,7 +21,7 @@ SUBSYSTEM_DEF(autotransfer)
|
||||
if(maxvotes > curvotes)
|
||||
if(world.time > targettime)
|
||||
SSvote.initiate_vote("transfer",null) //TODO figure out how to not use null as the user
|
||||
targettime = targettime + CONFIG_GET(number/vote_autotransfer_interval)
|
||||
targettime = targettime + voteinterval
|
||||
curvotes += 1
|
||||
else
|
||||
SSshuttle.autoEnd()
|
||||
|
||||
@@ -55,7 +55,7 @@ SUBSYSTEM_DEF(shuttle)
|
||||
|
||||
var/lockdown = FALSE //disallow transit after nuke goes off
|
||||
|
||||
var/extendvote_passed = FALSE
|
||||
var/endvote_passed = FALSE
|
||||
|
||||
var/realtimeofstart = 0
|
||||
|
||||
@@ -650,4 +650,4 @@ SUBSYSTEM_DEF(shuttle)
|
||||
log_game("Round end vote passed. Shuttle has been auto-called.")
|
||||
message_admins("Round end vote passed. Shuttle has been auto-called.")
|
||||
emergencyNoRecall = TRUE
|
||||
extendvote_passed = TRUE
|
||||
endvote_passed = TRUE
|
||||
|
||||
Reference in New Issue
Block a user