cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +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() datum/controller/transfer_controller/proc/process()
currenttick = currenttick + 1 currenttick = currenttick + 1
<<<<<<< HEAD //VOREStation Edit START
if (round_duration_in_ticks >= shift_last_vote - 2 MINUTES) //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. 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 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) if (round_duration_in_ticks >= shift_hard_end - 1 MINUTE)
init_shift_change(null, 1) 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. 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. 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 else if (round_duration_in_ticks >= timerbuffer - 1 MINUTE)
vote.autotransfer()
=======
if (round_duration_in_ticks >= timerbuffer - 1 MINUTE)
SSvote.autotransfer() SSvote.autotransfer()
>>>>>>> eee9c50... Merge pull request #5675 from kevinz000/PS_PORT_VOTE //VOREStation Edit END
timerbuffer = timerbuffer + config.vote_autotransfer_interval timerbuffer = timerbuffer + config.vote_autotransfer_interval

3
code/controllers/verbs.dm
View File

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

5
code/game/gamemodes/gameticker.dm
View File

@@ -44,10 +44,7 @@ var/global/datum/controller/gameticker/ticker
'sound/music/title2.ogg',\ 'sound/music/title2.ogg',\
'sound/music/clouds.s3m',\ 'sound/music/clouds.s3m',\
'sound/music/space_oddity.ogg') //Ground Control to Major Tom, this song is cool, what's going on? 'sound/music/space_oddity.ogg') //Ground Control to Major Tom, this song is cool, what's going on?
<<<<<<< HEAD */ //VOREStation Edit End
*/
=======
>>>>>>> eee9c50... Merge pull request #5675 from kevinz000/PS_PORT_VOTE
send2mainirc("Server lobby is loaded and open at byond://[config.serverurl ? config.serverurl : (config.server ? config.server : "[world.address]:[world.port]")]") send2mainirc("Server lobby is loaded and open at byond://[config.serverurl ? config.serverurl : (config.server ? config.server : "[world.address]:[world.port]")]")

6
code/game/verbs/ooc.dm
View File

@@ -34,9 +34,11 @@
log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]") log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]")
message_admins("[key_name_admin(src)] has attempted to advertise in OOC: [msg]") message_admins("[key_name_admin(src)] has attempted to advertise in OOC: [msg]")
return return
if(vote && vote.mode) //VOREStation Add - No talking during voting
src << "<span class='danger'>OOC is not allowed during voting.</span>" if(SSvote && SSvote.mode)
to_chat(src,"<span class='danger'>OOC is not allowed during voting.</span>")
return return
//VOREStation Add End
log_ooc(msg, src) log_ooc(msg, src)

3
vorestation.dme
View File

@@ -231,11 +231,8 @@
#include "code\controllers\subsystems\persist_vr.dm" #include "code\controllers\subsystems\persist_vr.dm"
#include "code\controllers\subsystems\planets.dm" #include "code\controllers\subsystems\planets.dm"
#include "code\controllers\subsystems\shuttles.dm" #include "code\controllers\subsystems\shuttles.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\controllers\subsystems\transcore_vr.dm" #include "code\controllers\subsystems\transcore_vr.dm"
=======
#include "code\controllers\subsystems\vote.dm" #include "code\controllers\subsystems\vote.dm"
>>>>>>> eee9c50... Merge pull request #5675 from kevinz000/PS_PORT_VOTE:polaris.dme
#include "code\controllers\subsystems\xenoarch.dm" #include "code\controllers\subsystems\xenoarch.dm"
#include "code\datums\ai_law_sets.dm" #include "code\datums\ai_law_sets.dm"
#include "code\datums\ai_laws.dm" #include "code\datums\ai_laws.dm"