Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Allow mods to soft reboot the server, also allows admins to reboot the server ignoring tickets #12299

Merged
JamieD1 merged 2 commits into from
Sep 17, 2021
Merged

Allow mods to soft reboot the server, also allows admins to reboot the server ignoring tickets #12299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba76764
Allow mods to soft reboot the server, also allows admins to reboot th…
adamsong Sep 12, 2021
16b025e
Merge branch 'master' into mod-powercreep
JamieD1 Sep 17, 2021
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
4 changes: 2 additions & 2 deletions code/controllers/subsystem/ticker.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/proc/Reboot(reason, end_string, delay, force = FALSE)
set waitfor = FALSE
if(usr && !force)
if(!check_rights(R_SERVER, TRUE))
if(!check_rights(R_ADMIN, TRUE))
return
// yogs end

Expand All @@ -664,7 +664,7 @@ SUBSYSTEM_DEF(ticker)
if(GLOB.ahelp_tickets && GLOB.ahelp_tickets.ticketAmount)
var/list/adm = get_admin_counts(R_BAN)
var/list/activemins = adm["present"]
if(activemins.len > 0)
if(activemins.len > 0 && !force) // Ignore tickets if forced
to_chat(world, span_boldannounce("Not all tickets have been resolved. Server restart delayed."))
return
else
Expand Down
10 changes: 6 additions & 4 deletions code/modules/admin/admin.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,9 +476,11 @@
if (!usr.client.holder)
return

var/list/options = list("Regular Restart", "Hard Restart (No Delay/Feeback Reason)", "Hardest Restart (No actions, just reboot)")
if(world.TgsAvailable())
options += "Server Restart (Kill and restart DD)";
var/list/options = list("Regular Restart")
if(check_rights(R_SERVER, FALSE))
options += list("Hard Restart (No Delay/Feeback Reason)", "Hardest Restart (No actions, just reboot)")
if(world.TgsAvailable())
options += "Server Restart (Kill and restart DD)";

var/rebootconfirm
if(SSticker.admin_delay_notice)
Expand All @@ -493,7 +495,7 @@
var/init_by = "Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]."
switch(result)
if("Regular Restart")
SSticker.Reboot(init_by, "admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]", 10)
SSticker.Reboot(init_by, "admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]", 10 SECONDS, check_rights(R_SERVER, FALSE)) // Force if they have +SERVER
if("Hard Restart (No Delay, No Feeback Reason)")
to_chat(world, "World reboot - [init_by]")
world.Reboot()
Expand Down