diff options
author | shennetsind <ind@henn.et> | 2013-11-06 21:23:31 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-11-06 21:23:31 -0200 |
commit | d56017e3d1bf783cfdc67a702d2b70a0a27c8863 (patch) | |
tree | a47bd0ef6340ce1d011d198f430c7d96d620afe0 /npc/re/quests/quests_malangdo.txt | |
parent | 5c94e76753c0cdb4ffb7dabbd6e135f1f7d42ef2 (diff) | |
parent | 3a3d2297068809d25ca43e19fd2977f97b2728f5 (diff) | |
download | hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.gz hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.bz2 hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.xz hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.zip |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/pc.c
Diffstat (limited to 'npc/re/quests/quests_malangdo.txt')
-rw-r--r-- | npc/re/quests/quests_malangdo.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt index ea03d66bb..62b356c23 100644 --- a/npc/re/quests/quests_malangdo.txt +++ b/npc/re/quests/quests_malangdo.txt @@ -2468,7 +2468,7 @@ OnTouch: close; } -malangdo,246,184,0 script 1st Rate Point 111,{ +malangdo,246,184,0 script 1st Rate Point HIDDEN_NPC,{ if (checkweight(1201,1) == 0) { mes " - Notice !! -"; mes " - Since you have too many items - "; |