Merge pull request #4304 from Citadel-Station-13/upstream-merge-33423

[MIRROR] Undelaying roundend will now reboot the server normally.
2017-12-10 21:43:26 +00:00
parent 4dde93c027 d78143bddc
commit 215a8f47ed
2 changed files with 13 additions and 4 deletions
@@ -393,6 +393,8 @@
 		log_admin("[key_name(usr)] [msg]")
 		message_admins("[key_name_admin(usr)] [msg]")
 		href_list["secrets"] = "check_antagonist"
+		if(SSticker.ready_for_reboot && !SSticker.delay_end) //we undelayed after standard reboot would occur
+			SSticker.standard_reboot()

 	else if(href_list["end_round"])
 		if(!check_rights(R_ADMIN))