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/airports/lighthalzen.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/airports/lighthalzen.txt')
| -rw-r--r-- | npc/airports/lighthalzen.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/npc/airports/lighthalzen.txt b/npc/airports/lighthalzen.txt index 7fbe8ae6d..e2c5f67b4 100644 --- a/npc/airports/lighthalzen.txt +++ b/npc/airports/lighthalzen.txt @@ -8,7 +8,7 @@ //= Official NPCs. //============================================================ -lhz_airport,143,43,5 script Airport Staff#lhz_air1a::lhz_airport1 90,{ +lhz_airport,143,43,5 script Airport Staff#lhz_air1a::lhz_airport1 4_F_01,{ mes "[Airport Staff]"; mes "Welcome to the"; mes "Lighthalzen Airport,"; @@ -47,10 +47,10 @@ lhz_airport,143,43,5 script Airport Staff#lhz_air1a::lhz_airport1 90,{ close; } -lhz_airport,158,43,5 duplicate(lhz_airport1) Airship Staff#lhz_air1b 90 -lhz_airport,126,43,5 duplicate(lhz_airport1) Airship Staff#lhz_air1c 90 +lhz_airport,158,43,5 duplicate(lhz_airport1) Airship Staff#lhz_air1b 4_F_01 +lhz_airport,126,43,5 duplicate(lhz_airport1) Airship Staff#lhz_air1c 4_F_01 -lhz_airport,143,49,3 script Arrival Staff#lhz_air2a::lhz_airport2 90,{ +lhz_airport,143,49,3 script Arrival Staff#lhz_air2a::lhz_airport2 4_F_01,{ mes "[Arrival Staff]"; mes "Welcome to Lighthalzen Airport."; mes "Please let me guide you to the"; @@ -77,5 +77,5 @@ lhz_airport,143,49,3 script Arrival Staff#lhz_air2a::lhz_airport2 90,{ close; } -lhz_airport,126,51,3 duplicate(lhz_airport2) Arrival Staff#lhz_air2b 90 -lhz_airport,158,50,3 duplicate(lhz_airport2) Arrival Staff#lhz_air2c 90 +lhz_airport,126,51,3 duplicate(lhz_airport2) Arrival Staff#lhz_air2b 4_F_01 +lhz_airport,158,50,3 duplicate(lhz_airport2) Arrival Staff#lhz_air2c 4_F_01 |