From a1f820be451d18c6889b4179b1687a5ce1d2cd2f Mon Sep 17 00:00:00 2001 From: Putnam Date: Wed, 11 Mar 2020 03:00:07 -0700 Subject: [PATCH 1/2] maybe check the rest of the codebase --- code/controllers/subsystem/autotransfer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/autotransfer.dm b/code/controllers/subsystem/autotransfer.dm index 4f8fc3631d..2f4eac6197 100644 --- a/code/controllers/subsystem/autotransfer.dm +++ b/code/controllers/subsystem/autotransfer.dm @@ -20,7 +20,7 @@ SUBSYSTEM_DEF(autotransfer) /datum/controller/subsystem/autotransfer/fire() if(maxvotes > curvotes) if(world.time > targettime) - SSvote.initiate_vote("transfer",null) //TODO figure out how to not use null as the user + SSvote.initiate_vote("transfer","server") targettime = targettime + voteinterval curvotes += 1 else From 8a00a156217c2523a2cad71e1ba73387e8abec34 Mon Sep 17 00:00:00 2001 From: Putnam Date: Wed, 11 Mar 2020 03:01:05 -0700 Subject: [PATCH 2/2] removed no-votes mattering more than votes (??) --- code/controllers/subsystem/vote.dm | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 20e0d647c5..a42c08fc5a 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -89,20 +89,6 @@ SUBSYSTEM_DEF(vote) choices[GLOB.master_mode] += non_voters.len if(choices[GLOB.master_mode] >= greatest_votes) greatest_votes = choices[GLOB.master_mode] - else if(mode == "transfer") // austation begin -- Crew autotransfer vote - var/factor = 1 - switch(world.time / (1 MINUTES)) - if(0 to 60) - factor = 0.5 - if(61 to 120) - factor = 0.8 - if(121 to 240) - factor = 1 - if(241 to 300) - factor = 1.2 - else - factor = 1.4 - choices["Initiate Crew Transfer"] += round(non_voters.len * factor) // austation end //get all options with that many votes and return them in a list . = list() if(greatest_votes)