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/quests/newgears/2008_headgears.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/quests/newgears/2008_headgears.txt')
| -rw-r--r-- | npc/quests/newgears/2008_headgears.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/quests/newgears/2008_headgears.txt b/npc/quests/newgears/2008_headgears.txt index 5de069de8..87d1a4693 100644 --- a/npc/quests/newgears/2008_headgears.txt +++ b/npc/quests/newgears/2008_headgears.txt @@ -12,7 +12,7 @@ //= 1.0 First Version. [Masao] //============================================================ -gef_fild05,80,149,3 script Myu#08_hat 877,{ +gef_fild05,80,149,3 script Myu#08_hat 4_F_YUNYANG,{ mes "[Myu]"; mes "Meow..."; emotion e_omg; @@ -197,7 +197,7 @@ gef_fild05,80,149,3 script Myu#08_hat 877,{ close; } -morocc_in,137,102,5 script Trainee#2008hat01 82,{ +morocc_in,137,102,5 script Trainee#2008hat01 4_KID01,{ mes "[Trainee Elgo]"; mes "Welcome."; mes "Please talk to our teacher if you are here to make a dyes."; |