shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

manual merge

Browse Source
This commit is contained in:
LetterJay
2017-04-29 11:42:28 -05:00
parent bde5d6253a
commit 991fb8335c
25 changed files with 301 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/world.dm
+3 -4
View File
@@ -209,12 +209,11 @@
WORLD_REBOOT(0)
#undef WORLD_REBOOT
/world/proc/OnReboot(reason, feedback_c, feedback_r, round_end_sound_sent)
feedback_set_details("[feedback_c]","[feedback_r]")
SSblackbox.set_details("[feedback_c]","[feedback_r]")
log_game("<span class='boldannounce'>Rebooting World. [reason]</span>")
feedback_set("ahelp_unresolved", GLOB.ahelp_tickets.active_tickets.len)
if(GLOB.blackbox)
GLOB.blackbox.save_all_data_to_sql()
SSblackbox.set_val("ahelp_unresolved", GLOB.ahelp_tickets.active_tickets.len)
Master.Shutdown() //run SS shutdowns
RoundEndAnimation(round_end_sound_sent)
kick_clients_in_lobby("<span class='boldannounce'>The round came to an end with you in the lobby.</span>", 1) //second parameter ensures only afk clients are kicked