diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
| commit | 0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch) | |
| tree | 4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/003-1/_warps.txt | |
| parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
| parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
| download | serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2 serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/003-1/_warps.txt')
| -rw-r--r-- | world/map/npc/003-1/_warps.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/world/map/npc/003-1/_warps.txt b/world/map/npc/003-1/_warps.txt index fc6128df..0adea8a4 100644 --- a/world/map/npc/003-1/_warps.txt +++ b/world/map/npc/003-1/_warps.txt @@ -5,3 +5,4 @@ 003-1.gat,141,19|warp|To Beach|1,-1,004-1.gat,37,110 003-1.gat,48,36|warp|To Beach House|-1,-1,003-2.gat,22,28 003-1.gat,59,29|warp|To Beach Storage|-1,-1,003-2.gat,56,28 +003-1.gat,114,117|warp|To Beach|1,-1,043-1.gat,44,20 |