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/husband.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/husband.txt')
| -rw-r--r-- | world/map/npc/027-2/husband.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/world/map/npc/027-2/husband.txt b/world/map/npc/027-2/husband.txt index 9e1b0c04..4217d9a4 100644 --- a/world/map/npc/027-2/husband.txt +++ b/world/map/npc/027-2/husband.txt @@ -9,8 +9,8 @@ // state 6: is set in reid, gives as reward a special bowler hat // state 7: done -027-2.gat,22,84,0|script|Hamond|319,{ - +027-2.gat,22,84,0|script|Hamond|319, +{ set @Graveyard_Inn_MASK, NIBBLE_3_MASK; set @Graveyard_Inn_SHIFT, NIBBLE_3_SHIFT; |