From 609096da39667f2982e690ae9a223e02065a831e Mon Sep 17 00:00:00 2001 From: Doubleumc Date: Tue, 23 Jul 2024 04:37:02 -0400 Subject: [PATCH 1/3] initial --- code/controllers/subsystem/ticker.dm | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index e06e1ac458..29cb614673 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -109,14 +109,7 @@ SUBSYSTEM_DEF(ticker) mode.declare_completion(force_ending) REDIS_PUBLISH("byond.round", "type" = "round-complete") flash_clients() - addtimer(CALLBACK( - SSvote, - /datum/controller/subsystem/vote/proc/initiate_vote, - "gamemode", - "SERVER", - CALLBACK(src, PROC_REF(handle_map_reboot)), - TRUE - ), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(Reboot())), 30 SECONDS) Master.SetRunLevel(RUNLEVEL_POSTGAME) /// Attempt to start game asynchronously if applicable @@ -161,16 +154,6 @@ SUBSYSTEM_DEF(ticker) return FALSE return TRUE -/datum/controller/subsystem/ticker/proc/handle_map_reboot() - addtimer(CALLBACK( - SSvote, - /datum/controller/subsystem/vote/proc/initiate_vote, - "groundmap", - "SERVER", - CALLBACK(src, PROC_REF(Reboot)), - TRUE - ), 3 SECONDS) - /datum/controller/subsystem/ticker/proc/setup() to_chat(world, SPAN_BOLDNOTICE("Enjoy the game!")) var/init_start = world.timeofday From 21885f64bfe858bf4f624dc0d3a2522cf6d73947 Mon Sep 17 00:00:00 2001 From: Doubleumc Date: Tue, 23 Jul 2024 04:45:34 -0400 Subject: [PATCH 2/3] Update ticker.dm --- code/controllers/subsystem/ticker.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 29cb614673..d96be54389 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -109,7 +109,7 @@ SUBSYSTEM_DEF(ticker) mode.declare_completion(force_ending) REDIS_PUBLISH("byond.round", "type" = "round-complete") flash_clients() - addtimer(CALLBACK(src, PROC_REF(Reboot())), 30 SECONDS) + addtimer(CALLBACK(src, PROC_REF(Reboot)), 30 SECONDS) Master.SetRunLevel(RUNLEVEL_POSTGAME) /// Attempt to start game asynchronously if applicable From 23e61161be38b1ac071210ab2fbe5b1d940610c3 Mon Sep 17 00:00:00 2001 From: Doubleumc Date: Tue, 23 Jul 2024 05:04:27 -0400 Subject: [PATCH 3/3] remove round end reboot --- code/controllers/subsystem/ticker.dm | 35 ---------------------------- 1 file changed, 35 deletions(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index d96be54389..ef796bc439 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -109,7 +109,6 @@ SUBSYSTEM_DEF(ticker) mode.declare_completion(force_ending) REDIS_PUBLISH("byond.round", "type" = "round-complete") flash_clients() - addtimer(CALLBACK(src, PROC_REF(Reboot)), 30 SECONDS) Master.SetRunLevel(RUNLEVEL_POSTGAME) /// Attempt to start game asynchronously if applicable @@ -332,40 +331,6 @@ SUBSYSTEM_DEF(ticker) fdel("data/mode.txt") WRITE_FILE(file("data/mode.txt"), the_mode) - -/datum/controller/subsystem/ticker/proc/Reboot(reason, delay) - set waitfor = FALSE - - if(usr && !check_rights(R_SERVER)) - return - - if(graceful) - to_chat_forced(world, "

[SPAN_BOLDNOTICE("Shutting down...")]

") - world.Reboot(FALSE) - return - - if(!delay) - delay = CONFIG_GET(number/round_end_countdown) * 10 - - var/skip_delay = check_rights() - if(delay_end && !skip_delay) - to_chat(world, SPAN_BOLDNOTICE("An admin has delayed the round end.")) - return - - to_chat(world, SPAN_BOLDNOTICE("Rebooting World in [DisplayTimeText(delay)]. [reason]")) - - var/start_wait = world.time - sleep(delay - (world.time - start_wait)) - - if(delay_end && !skip_delay) - to_chat(world, SPAN_BOLDNOTICE("Reboot was cancelled by an admin.")) - return - - log_game("Rebooting World. [reason]") - to_chat_forced(world, "

[SPAN_BOLDNOTICE("Rebooting...")]

") - - world.Reboot(TRUE) - /datum/controller/subsystem/ticker/proc/create_characters() if(!RoleAuthority) return