cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes most of the issues

Browse Source
This commit is contained in:
Unknown
2019-03-27 00:38:44 -04:00
parent 86174593bf
commit 03dcb65c01
17 changed files with 57 additions and 694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/autotransfer.dm
View File

@@ -7,13 +7,9 @@ datum/controller/transfer_controller
var/shift_last_vote = 0 //VOREStation Edit
datum/controller/transfer_controller/New()
timerbuffer = config.vote_autotransfer_initial
<<<<<<< HEAD
shift_hard_end = config.vote_autotransfer_initial + (config.vote_autotransfer_interval * 1) //VOREStation Edit //Change this "1" to how many extend votes you want there to be.
shift_last_vote = shift_hard_end - config.vote_autotransfer_interval //VOREStation Edit
processing_objects += src
=======
START_PROCESSING(SSobj, src)
>>>>>>> 2c4b5af... Merge pull request #5677 from kevinz000/PS_PORT_SCHEDULER
datum/controller/transfer_controller/Destroy()
STOP_PROCESSING(SSobj, src)