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/056-2/notes.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/056-2/notes.txt')
-rw-r--r-- | world/map/npc/056-2/notes.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/world/map/npc/056-2/notes.txt b/world/map/npc/056-2/notes.txt index acc9ef87..fb29cd68 100644 --- a/world/map/npc/056-2/notes.txt +++ b/world/map/npc/056-2/notes.txt @@ -1,11 +1,13 @@ -056-2.gat,77,34,0|script|Warning|400,{ +056-2.gat,77,34,0|script|Warning|400, +{ mes "Turn around. Do not come any closer!"; mes "Go back upstairs and leave! I don't want to see anybody!"; mes "This is the last warning!"; mes "- Mirak"; close; } -056-2.gat,29,30,0|script|Note|400,{ +056-2.gat,29,30,0|script|Note|400, +{ mes "DO NOT GO ANY FURTHER!"; mes "Put the supplies on the table and do not come downstairs. I don't want to be bothered."; mes "- Mirak"; |