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/027-2/innkeeper.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/027-2/innkeeper.txt')
-rw-r--r-- | world/map/npc/027-2/innkeeper.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/world/map/npc/027-2/innkeeper.txt b/world/map/npc/027-2/innkeeper.txt index e3319b76..4204d041 100644 --- a/world/map/npc/027-2/innkeeper.txt +++ b/world/map/npc/027-2/innkeeper.txt @@ -13,8 +13,8 @@ // state 10: she spoke with hamond and savaric, gives reward mylarin dust (needed for a crafting quest in thermin) // state 11: done, can ask about mylarin dust again -027-2.gat,104,39,0|script|Reid's Ghost|315,{ - +027-2.gat,104,39,0|script|Reid's Ghost|315, +{ set @Graveyard_Inn_MASK, NIBBLE_0_MASK; set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT; |