Merge pull request #4877 from Citadel-Station-13/upstream-merge-34470

[MIRROR] Moves load_motd to config controller
This commit is contained in:
LetterJay
2018-01-17 09:36:43 -06:00
committed by GitHub
5 changed files with 15 additions and 9 deletions
-4
View File
@@ -24,7 +24,6 @@ GLOBAL_PROTECT(security_mode)
SERVER_TOOLS_ON_NEW
load_motd()
load_admins()
LoadVerbs(/datum/verbs/menu)
if(CONFIG_GET(flag/usewhitelist))
@@ -195,9 +194,6 @@ GLOBAL_PROTECT(security_mode)
log_world("World rebooted at [time_stamp()]")
..()
/world/proc/load_motd()
GLOB.join_motd = file2text("config/motd.txt") + "<br>" + GLOB.revdata.GetTestMergeInfo()
/world/proc/update_status()
var/list/features = list()