Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove automatic end of round vote and reboot #341

Merged
merged 3 commits into from
Jul 23, 2024
Merged

Remove automatic end of round vote and reboot #341

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
609096d
initial
Doubleumc Jul 23, 2024
21885f6
Update ticker.dm
Doubleumc Jul 23, 2024
23e6116
remove round end reboot
Doubleumc Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 0 additions & 52 deletions code/controllers/subsystem/ticker.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,6 @@ 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)
Master.SetRunLevel(RUNLEVEL_POSTGAME)

/// Attempt to start game asynchronously if applicable
Expand Down Expand Up @@ -161,16 +153,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
Expand Down Expand Up @@ -349,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, "<h3>[SPAN_BOLDNOTICE("Shutting down...")]</h3>")
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, "<h3>[SPAN_BOLDNOTICE("Rebooting...")]</h3>")

world.Reboot(TRUE)

/datum/controller/subsystem/ticker/proc/create_characters()
if(!RoleAuthority)
return
Expand Down
Loading