summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorHaruna <haru@dotalux.com>2015-10-21 23:53:19 +0200
committerHaruna <haru@dotalux.com>2015-10-21 23:53:19 +0200
commite4c30aeb788c34865325df7189ddc21b9542e86e (patch)
tree84df335dd0ad350c20f8c2a018b2a7096907b636 /conf
parent8b198db1e0ccc8209b7bcf54b4df62d4747f75b2 (diff)
parent198aef7133713b47a4c4fadaac6811c9d3812d19 (diff)
downloadhercules-e4c30aeb788c34865325df7189ddc21b9542e86e.tar.gz
hercules-e4c30aeb788c34865325df7189ddc21b9542e86e.tar.bz2
hercules-e4c30aeb788c34865325df7189ddc21b9542e86e.tar.xz
hercules-e4c30aeb788c34865325df7189ddc21b9542e86e.zip
Merge pull request #790 from ErMaqui/master
Error message when talking to a pre-defined channel and you aren't on channel
Diffstat (limited to 'conf')
-rw-r--r--conf/messages.conf4
1 files changed, 3 insertions, 1 deletions
diff --git a/conf/messages.conf b/conf/messages.conf
index 2b5f8eb63..f4098ae30 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -1235,7 +1235,8 @@
// @mobinfo ...
1291: ATK:%d~%d MATK:%d~%d Range:%d~%d~%d Size:%s Race: %s Element: %s (Lv:%d)
-//1292-1294 FREE
+//1292-1293 FREE
+//1294 used by hercules chat feature
// @version
1295: %s revision '%s' (src) / '%s' (scripts)
@@ -1416,6 +1417,7 @@
1402: You're not in that channel, type '@join <#channel_name>'
1435: You're now in the '#%s' channel for '%s'
1436: You're already in the '%s' channel
+1294: You're not allowed to talk on this channel
// @channel
1404: %s failed