cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2863 from cadyn/upstream-merge-11395

Browse Source 
Merge Upstream Pull Request 11395
This commit is contained in:
Nadyr
2021-08-25 20:35:18 -04:00
committed by GitHub
parent 4b1c148522 f773cda438
commit 103fe2c88d
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/subsystems/ticker.dm
View File

@@ -9,7 +9,7 @@ SUBSYSTEM_DEF(ticker)
flags = SS_NO_TICK_CHECK | SS_KEEP_TIMING flags = SS_NO_TICK_CHECK | SS_KEEP_TIMING
runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME // Every runlevel! runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME // Every runlevel!
var/const/restart_timeout = 3 MINUTES // Default time to wait before rebooting in desiseconds. var/const/restart_timeout = 4 MINUTES // Default time to wait before rebooting in desiseconds.
var/current_state = GAME_STATE_INIT // We aren't even at pregame yet // TODO replace with CURRENT_GAME_STATE var/current_state = GAME_STATE_INIT // We aren't even at pregame yet // TODO replace with CURRENT_GAME_STATE
/* Relies upon the following globals (TODO move those in here) */ /* Relies upon the following globals (TODO move those in here) */

0
tools/ch-merge-upstream-pull-request.sh Normal file → Executable file
View File