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/airports/izlude.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/airports/izlude.txt')
| -rw-r--r-- | npc/re/airports/izlude.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/npc/re/airports/izlude.txt b/npc/re/airports/izlude.txt index fedb3e868..69ba5b115 100644 --- a/npc/re/airports/izlude.txt +++ b/npc/re/airports/izlude.txt @@ -12,8 +12,8 @@ //= 1.1 Added Izlude duplicates. [Euphy] //============================================================ -izlude,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude 90 -izlude_a,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude_a 90 -izlude_b,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude_b 90 -izlude_c,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude_c 90 -izlude_d,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude_d 90 +izlude,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude 4_F_01 +izlude_a,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude_a 4_F_01 +izlude_b,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude_b 4_F_01 +izlude_c,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude_c 4_F_01 +izlude_d,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude_d 4_F_01 |