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

Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge

Browse Source
This commit is contained in:
Erik
2020-02-13 20:36:32 -08:00
parent 335745d4b7 0990e92def
commit 11268a3ff4
254 changed files with 65558 additions and 229875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/configuration.dm
View File

@@ -34,6 +34,7 @@ var/list/gamemode_cache = list()
var/vote_period = 600 // length of voting period (deciseconds, default 1 minute)
var/vote_autotransfer_initial = 108000 // Length of time before the first autotransfer vote is called
var/vote_autotransfer_interval = 36000 // length of time before next sequential autotransfer vote
var/vote_autotransfer_amount = 1 // number of extension votes before the final one
var/vote_autogamemode_timeleft = 100 //Length of time before round start when autogamemode vote is called (in seconds, default 100).
var/vote_no_default = 0 // vote does not default to nochange/norestart (tbi)
var/vote_no_dead = 0 // dead people can't vote (tbi)
@@ -417,6 +418,9 @@ var/list/gamemode_cache = list()
if ("vote_autotransfer_interval")
config.vote_autotransfer_interval = text2num(value)
if ("vote_autotransfer_amount")
config.vote_autotransfer_amount = text2num(value) //YW addition, vote transfer amount
if ("vote_autogamemode_timeleft")
config.vote_autogamemode_timeleft = text2num(value)

5
code/controllers/subsystems/events.dm
View File

@@ -21,7 +21,8 @@ SUBSYSTEM_DEF(events)
/datum/controller/subsystem/events/fire(resumed)
for(var/datum/event/E in active_events)
E.process()
if(E.processing_active)
E.process()
for(var/i = EVENT_LEVEL_MUNDANE to EVENT_LEVEL_MAJOR)
var/list/datum/event_container/EC = event_containers[i]
@@ -46,7 +47,7 @@ SUBSYSTEM_DEF(events)
if(EM.add_to_queue)
EC.available_events += EM
log_debug("Event '[EM.name]' has completed at [worldtime2stationtime(world.time)].")
log_debug("Event '[EM.name]' has completed at [stationtime2text()].")
/datum/controller/subsystem/events/proc/delay_events(var/severity, var/delay)
var/list/datum/event_container/EC = event_containers[severity]