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/010-2/workers.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/010-2/workers.txt')
| -rw-r--r-- | world/map/npc/010-2/workers.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/world/map/npc/010-2/workers.txt b/world/map/npc/010-2/workers.txt index ab2e6d5d..3dc6e928 100644 --- a/world/map/npc/010-2/workers.txt +++ b/world/map/npc/010-2/workers.txt @@ -1,12 +1,14 @@ // -010-2.gat,23,70,0|script|Josh|155,{ +010-2.gat,23,70,0|script|Josh|155, +{ mes "[Josh]"; mes "\"We're working on getting the cellar pass open.\""; close; } -010-2.gat,39,75,0|script|Zack|155,{ +010-2.gat,39,75,0|script|Zack|155, +{ set @hw2011_npc_id, $@hw2011_npc_zack; if (gettime(7) == $@hw2011_year && gettime(6) == 10 && gettime(5) >= $@hw2011_start_day) goto L_TrickOrTreat; |