From 830bd238856eb86975cc5a8bc34ec7e69073c976 Mon Sep 17 00:00:00 2001 From: Cadyn Date: Tue, 24 Aug 2021 20:53:58 -0700 Subject: [PATCH 1/3] Make PR merge script executable --- tools/ch-merge-upstream-pull-request.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tools/ch-merge-upstream-pull-request.sh diff --git a/tools/ch-merge-upstream-pull-request.sh b/tools/ch-merge-upstream-pull-request.sh old mode 100644 new mode 100755 From 35a0eb279a05c5388567b71c7862403e28b4b7ae Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Mon, 16 Aug 2021 18:17:21 -0400 Subject: [PATCH 2/3] Merge pull request #11395 from lbnesquik/Kot-restart Increase the round restart timer from 3 to 4 --- code/controllers/subsystems/ticker.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index 90e4254d2b..20a9ffeaa4 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -9,7 +9,7 @@ SUBSYSTEM_DEF(ticker) flags = SS_NO_TICK_CHECK | SS_KEEP_TIMING 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 /* Relies upon the following globals (TODO move those in here) */