summaryrefslogtreecommitdiff
path: root/conf/msg_athena.conf
diff options
context:
space:
mode:
authorKisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-03-09 12:50:24 +0000
committerKisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-03-09 12:50:24 +0000
commit5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0 (patch)
tree1f546bf12a99017b41ae2fd90e0ac452f97b0282 /conf/msg_athena.conf
parentb4208257ea0906e375024f811d8e51208d539d35 (diff)
downloadhercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.tar.gz
hercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.tar.bz2
hercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.tar.xz
hercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.zip
* Merged changes from trunk [14688:14739/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14740 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf/msg_athena.conf')
-rw-r--r--conf/msg_athena.conf9
1 files changed, 2 insertions, 7 deletions
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf
index 1c9b994c0..1d88c076a 100644
--- a/conf/msg_athena.conf
+++ b/conf/msg_athena.conf
@@ -423,12 +423,7 @@
502: Day Mode is activated
503: Night Mode is activated
-//Supernovice's Guardian Angel
-//actually.. new client msgtxt file contains these 3 lines... [Lupus]
-//----------------------------
-504: Guardian Angel, can you hear my voice? ^^;
-505: My name is %s, and I'm a Super Novice~
-506: Please help me~ T.T
+// 504~506 are not used (previously super novice's guardian angel prayer)
// Trade Spoof Messages
507: This player has been banned for %d minute(s).
@@ -455,7 +450,7 @@
//542: %.0s%.0sSomeone stole %s
// 543~548 are not used (previously @away messages)
// @Autotrade
-549: You should be vending to use @autotrade.
+549: You should have a shop open to use @autotrade.
//550 -> 650: Job Names
550: Novice