cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

VS edit merges

Browse Source
This commit is contained in:
Arokha Sieyes
2018-10-20 17:37:08 -04:00
parent 3a9c13b937
commit 30a8a3ce31
5 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/controllers/autotransfer.dm
View File

@@ -16,18 +16,15 @@ datum/controller/transfer_controller/Destroy()
datum/controller/transfer_controller/proc/process()
currenttick = currenttick + 1
<<<<<<< HEAD
if (round_duration_in_ticks >= shift_last_vote - 2 MINUTES) //VOREStation Edit START
//VOREStation Edit START
if (round_duration_in_ticks >= shift_last_vote - 2 MINUTES)
shift_last_vote = 999999999999 //Setting to a stupidly high number since it'll be not used again.
to_world("<b>Warning: This upcoming round-extend vote will be your ONLY extend vote. Wrap up your scenes in the next 60 minutes if the round is extended.</b>") //VOREStation Edit
if (round_duration_in_ticks >= shift_hard_end - 1 MINUTE)
init_shift_change(null, 1)
shift_hard_end = timerbuffer + config.vote_autotransfer_interval //If shuttle somehow gets recalled, let's force it to call again next time a vote would occur.
timerbuffer = timerbuffer + config.vote_autotransfer_interval //Just to make sure a vote doesn't occur immediately afterwords.
else if (round_duration_in_ticks >= timerbuffer - 1 MINUTE) //VOREStation Edit END
vote.autotransfer()
=======
if (round_duration_in_ticks >= timerbuffer - 1 MINUTE)
else if (round_duration_in_ticks >= timerbuffer - 1 MINUTE)
SSvote.autotransfer()
>>>>>>> eee9c50... Merge pull request #5675 from kevinz000/PS_PORT_VOTE
//VOREStation Edit END
timerbuffer = timerbuffer + config.vote_autotransfer_interval

3
code/controllers/verbs.dm
View File

@@ -131,7 +131,6 @@
debug_variables(chemistryProcess)
feedback_add_details("admin_verb", "DChem")
message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.")
<<<<<<< HEAD
return
/client/proc/debug_process_scheduler()
@@ -156,5 +155,3 @@
debug_variables(P)
feedback_add_details("admin_verb", "DProcCtrl")
message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.")
=======
>>>>>>> eee9c50... Merge pull request #5675 from kevinz000/PS_PORT_VOTE