Merge pull request #34470 from Cyberboss/MoveMotd

Moves load_motd to config controller
This commit is contained in:
oranges
2018-01-17 09:27:35 +13:00
committed by CitadelStationBot
parent d2d1a063a7
commit 2dd1f1f799
5 changed files with 15 additions and 9 deletions
@@ -18,6 +18,8 @@ GLOBAL_PROTECT(config_dir)
var/list/mode_reports
var/list/mode_false_report_weight
var/motd
/datum/controller/configuration/New()
config = src
InitEntries()
@@ -28,6 +30,7 @@ GLOBAL_PROTECT(config_dir)
LoadEntries("dbconfig.txt")
LoadEntries("comms.txt")
loadmaplist(CONFIG_MAPS_FILE)
LoadMOTD()
/datum/controller/configuration/Destroy()
entries_by_type.Cut()
@@ -192,6 +195,12 @@ GLOBAL_PROTECT(config_dir)
qdel(M)
votable_modes += "secret"
/datum/controller/configuration/proc/LoadMOTD()
motd = file2text("[GLOB.config_dir]/motd.txt")
var/tm_info = GLOB.revdata.GetTestMergeInfo()
if(motd || tm_info)
motd = motd ? "[motd]<br>[tm_info]" : tm_info
/datum/controller/configuration/proc/loadmaplist(filename)
log_config("Loading config file [filename]...")
filename = "[GLOB.config_dir][filename]"