cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

tgchat day zero changes (#23872)

Browse Source 
* tgchat day zero changes

* Update code/game/verbs/ooc.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
GDN
2024-01-21 22:07:57 +00:00
committed by GitHub
co-authored by Henri215
parent 54a144301d
commit 0b8c196f67
67 changed files with 141 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/SSticker.dm
+3 -3
View File
@@ -713,7 +713,7 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/proc/reboot_helper(reason, end_string, delay)
// Admins delayed round end. Just alert and dont bother with anything else.
if(delay_end)
to_chat(world, "<span class='boldannounce'>An admin has delayed the round end.</span>")
to_chat(world, "<span class='boldannounceooc'>An admin has delayed the round end.</span>")
return
if(!isnull(delay))
@@ -723,14 +723,14 @@ SUBSYSTEM_DEF(ticker)
// Use default restart timeout
delay = restart_timeout
to_chat(world, "<span class='boldannounce'>Rebooting world in [delay/10] [delay > 10 ? "seconds" : "second"]. [reason]</span>")
to_chat(world, "<span class='boldannounceooc'>Rebooting world in [delay/10] [delay > 10 ? "seconds" : "second"]. [reason]</span>")
real_reboot_time = world.time + delay
UNTIL(world.time > real_reboot_time) // Hold it here
// And if we re-delayed, bail again
if(delay_end)
to_chat(world, "<span class='boldannounce'>Reboot was cancelled by an admin.</span>")
to_chat(world, "<span class='boldannounceooc'>Reboot was cancelled by an admin.</span>")
return
if(end_string)