summaryrefslogtreecommitdiff
path: root/world/map/conf
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2015-05-11 20:53:17 -0500
committerWushin <pasekei@gmail.com>2015-05-11 20:53:17 -0500
commit1437955dc1ccd6543cd88634f0bbbdb524a77c18 (patch)
tree095e2726534d6f846c1fe389302ffe2818294450 /world/map/conf
parent4b6d30bbee8b02bc60457c4a2f747009db783829 (diff)
parentd40e9ab167749ff8f388c90f67457b36c6216aa9 (diff)
downloadserverdata-1437955dc1ccd6543cd88634f0bbbdb524a77c18.tar.gz
serverdata-1437955dc1ccd6543cd88634f0bbbdb524a77c18.tar.bz2
serverdata-1437955dc1ccd6543cd88634f0bbbdb524a77c18.tar.xz
serverdata-1437955dc1ccd6543cd88634f0bbbdb524a77c18.zip
Merge pull request #376 from mekolat/motd
death to the motd!
Diffstat (limited to 'world/map/conf')
-rw-r--r--world/map/conf/.gitignore1
-rw-r--r--world/map/conf/map_athena.conf3
-rw-r--r--world/map/conf/motd.txt.example2
3 files changed, 0 insertions, 6 deletions
diff --git a/world/map/conf/.gitignore b/world/map/conf/.gitignore
index 88c1dc21..c2b48eb6 100644
--- a/world/map/conf/.gitignore
+++ b/world/map/conf/.gitignore
@@ -1,5 +1,4 @@
/*_local.conf
/magic-secrets.conf
/magic-secrets.sex
-/motd.txt
/secrets-build
diff --git a/world/map/conf/map_athena.conf b/world/map/conf/map_athena.conf
index f0f59fd7..86f7f072 100644
--- a/world/map/conf/map_athena.conf
+++ b/world/map/conf/map_athena.conf
@@ -3,9 +3,6 @@
// Database autosave time, in seconds.
autosave_time: 60
-// Message of the day file, when a character logs on, this message is displayed.
-motd_txt: conf/motd.txt
-
mapreg_txt: save/mapreg.txt
import: npc/scripts.conf
diff --git a/world/map/conf/motd.txt.example b/world/map/conf/motd.txt.example
deleted file mode 100644
index 9c949dda..00000000
--- a/world/map/conf/motd.txt.example
+++ /dev/null
@@ -1,2 +0,0 @@
-Welcome to The Mana World! (running on tmwAthena)
-You can report abuse by typing in chat: @wgm Player XYZ is abusing me