Merge pull request #832 from Citadel-Station-13/upstream-merge-23201

[MIRROR] [READY]DATUM VERBS AND TOP MENUS!
2017-05-10 23:05:37 -04:00
parent 746da812bf 43318a88a5
commit a66e0c949e
17 changed files with 590 additions and 256 deletions
@@ -55,6 +55,7 @@
 	load_mode()
 	load_motd()
 	load_admins()
+	load_menu()
 //disabled to prevent runtimes until it's fixed
 //	load_mentors()
 	if(config.usewhitelist)
@@ -339,5 +340,6 @@

 	status = s

+
 /world/proc/has_round_started()
-	return SSticker.HasRoundStarted()
+	return SSticker.HasRoundStarted()