diff options
author | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
commit | cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22 (patch) | |
tree | 73815027b00f2519fda6ce5fe313f13b71fa2595 /npc/pre-re/other/msg_boards.txt | |
parent | b2f125a5f3f25b9bcb68d4b755bacf988f0f1fcd (diff) | |
parent | 566529c819bcf9aeb1bd3a4a691c443c2b88d076 (diff) | |
download | hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.gz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.bz2 hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.xz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.zip |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
sql-files/main.sql
sql-files/upgrades/index.txt
src/common/mmo.h
Diffstat (limited to 'npc/pre-re/other/msg_boards.txt')
-rw-r--r-- | npc/pre-re/other/msg_boards.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/pre-re/other/msg_boards.txt b/npc/pre-re/other/msg_boards.txt index 01c10e265..60c7133f0 100644 --- a/npc/pre-re/other/msg_boards.txt +++ b/npc/pre-re/other/msg_boards.txt @@ -13,13 +13,13 @@ // Izlude //============================================================ -izlude,54,139,1 script Sign#Iz1 111,{ +izlude,54,139,1 script Sign#Iz1 HIDDEN_NPC,{ mes "^993300- The Sign Reads -^000000"; mes "Welcome to the Swordsman Academy."; close; } -izlude,144,148,1 script Sign#Iz2 111,{ +izlude,144,148,1 script Sign#Iz2 HIDDEN_NPC,{ mes "^993300- The Sign Reads -^000000"; mes "Welcome."; close; |