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/re/quests/quests_13_1.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/re/quests/quests_13_1.txt')
| -rw-r--r-- | npc/re/quests/quests_13_1.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/npc/re/quests/quests_13_1.txt b/npc/re/quests/quests_13_1.txt index 3e4626fd5..ec208ad97 100644 --- a/npc/re/quests/quests_13_1.txt +++ b/npc/re/quests/quests_13_1.txt @@ -11,8 +11,8 @@ //= 1.1 Added Izlude duplicates. [Euphy] //============================================================ -izlude,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz 100 -izlude_a,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz_a 100 -izlude_b,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz_b 100 -izlude_c,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz_c 100 -izlude_d,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz_d 100 +izlude,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz 4W_SAILOR +izlude_a,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz_a 4W_SAILOR +izlude_b,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz_b 4W_SAILOR +izlude_c,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz_c 4W_SAILOR +izlude_d,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz_d 4W_SAILOR |