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/events/RWC_2011.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/events/RWC_2011.txt')
-rw-r--r-- | npc/events/RWC_2011.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/events/RWC_2011.txt b/npc/events/RWC_2011.txt index 4f46020a8..992bd7bd3 100644 --- a/npc/events/RWC_2011.txt +++ b/npc/events/RWC_2011.txt @@ -12,7 +12,7 @@ //= 1.0 First Version. [Euphy] //============================================================ -prontera,114,81,5 script RWC2011 Agent#2 407,{ +prontera,114,81,5 script RWC2011 Agent#2 4_M_ATEIL,{ if (checkweight(1201,1) == 0 || MaxWeight - Weight < 500) { mes "[New Agent]"; mes "You have too many items. Please make room in your inventory and come back."; |