diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-09 20:38:38 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-09 20:38:38 +0200 |
| commit | 7f4410f9d5dce2884368a4b1d01139abd2e65fd5 (patch) | |
| tree | e4f6cd0f6ed40b1852fa5ce28a5d78be982b0a73 /world/map/npc/021-2/_import.txt | |
| parent | 8ac35610a416d3937ccf4b3b74a61622382e8162 (diff) | |
| parent | fa2ffc29c1ef2c33ff0a9c1baf7026a4d9ffe0b6 (diff) | |
| download | serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.gz serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.bz2 serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.xz serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/item_db.txt
Diffstat (limited to 'world/map/npc/021-2/_import.txt')
| -rw-r--r-- | world/map/npc/021-2/_import.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/world/map/npc/021-2/_import.txt b/world/map/npc/021-2/_import.txt index bb80fc32..7b955fb5 100644 --- a/world/map/npc/021-2/_import.txt +++ b/world/map/npc/021-2/_import.txt @@ -4,11 +4,13 @@ map: 021-2.gat npc: npc/021-2/_mobs.txt npc: npc/021-2/_warps.txt npc: npc/021-2/bakery.txt +npc: npc/021-2/bank.txt +npc: npc/021-2/barber.txt npc: npc/021-2/government_building.txt npc: npc/021-2/heathin.txt +npc: npc/021-2/hotel_receptionist.txt npc: npc/021-2/inya.txt npc: npc/021-2/jhedia.txt npc: npc/021-2/kylian.txt npc: npc/021-2/mapflags.txt -npc: npc/021-2/workshop.txt npc: npc/021-2/yanis.txt |