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/custom/quests/sunglasses.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/custom/quests/sunglasses.txt')
| -rw-r--r-- | npc/custom/quests/sunglasses.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/custom/quests/sunglasses.txt b/npc/custom/quests/sunglasses.txt index e58639cb1..a4c828457 100644 --- a/npc/custom/quests/sunglasses.txt +++ b/npc/custom/quests/sunglasses.txt @@ -15,7 +15,7 @@ //= 1.8 Cleaning. [Euphy] //============================================================ -alberta,88,193,5 script Sunglasses Trader 73,{ +alberta,88,193,5 script Sunglasses Trader 1_F_MERCHANT_01,{ mes "[Sunglasses Trader]"; if(SG_QUEST1 == 1) { mes "There is nothing more I can tell you."; @@ -67,7 +67,7 @@ alberta,88,193,5 script Sunglasses Trader 73,{ close; } -moc_fild07,334,186,5 script Maseph 702,{ +moc_fild07,334,186,5 script Maseph 4_F_GON,{ mes "[Maseph]"; if(SG_QUEST1 != 1) { mes "Lovely day, isn't it ?"; |