diff options
| author | Er_Maqui <er_maqui@darkbolt.net> | 2015-10-21 14:54:40 +0200 |
|---|---|---|
| committer | Er_Maqui <er_maqui@darkbolt.net> | 2015-10-21 14:54:40 +0200 |
| commit | 198aef7133713b47a4c4fadaac6811c9d3812d19 (patch) | |
| tree | 84df335dd0ad350c20f8c2a018b2a7096907b636 /npc/re | |
| parent | 6977d6d31b58afc5095c0a59e754f21ea1080054 (diff) | |
| parent | 8b198db1e0ccc8209b7bcf54b4df62d4747f75b2 (diff) | |
| download | hercules-198aef7133713b47a4c4fadaac6811c9d3812d19.tar.gz hercules-198aef7133713b47a4c4fadaac6811c9d3812d19.tar.bz2 hercules-198aef7133713b47a4c4fadaac6811c9d3812d19.tar.xz hercules-198aef7133713b47a4c4fadaac6811c9d3812d19.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'npc/re')
| -rw-r--r-- | npc/re/quests/eden/eden_iro.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt index 3236313f3..4f65498ea 100644 --- a/npc/re/quests/eden/eden_iro.txt +++ b/npc/re/quests/eden/eden_iro.txt @@ -429,7 +429,7 @@ L_Exchange: // Merry Badger //============================================================ -moc_para01,13,22,4 script Merry Badger#xch 882,{ +moc_para01,13,22,4 script Merry Badger#xch 4_F_SITDOWN,{ mes "[Merry Badger]"; mes "Hello there! I'm Merry Badger and I was hired to exchange the ^00CC00Eden Merit Badges^000000!"; next; |