diff options
| author | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
| commit | 803b7fd5e4224276e5db57e8fa3d351d6529e80f (patch) | |
| tree | 67dff994f7673c7ed2efaef9d496631268668b2f /world/map/npc/012-3/warningsigns.txt | |
| parent | 36c6803069bfe3be37d482e682a3167b8bf0363d (diff) | |
| parent | b3fc5b76efb0031277ad039d3f332b7c2b874d1c (diff) | |
| download | serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.gz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.bz2 serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.xz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/item_db.txt
Diffstat (limited to 'world/map/npc/012-3/warningsigns.txt')
| -rw-r--r-- | world/map/npc/012-3/warningsigns.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/world/map/npc/012-3/warningsigns.txt b/world/map/npc/012-3/warningsigns.txt index 4dd2336d..bb92d1fe 100644 --- a/world/map/npc/012-3/warningsigns.txt +++ b/world/map/npc/012-3/warningsigns.txt @@ -1,6 +1,6 @@ //warning signs at pvp entrance! -012-3.gat,445,61,0|script|sign|187, +012-3.gat,445,61,0|script|sign#pvp-1|187, { mes "You are about to enter a dangerous area!"; next; @@ -9,11 +9,11 @@ close; } -012-3.gat,451,61,0|script|sign|186, +012-3.gat,451,61,0|script|sign#pvp-2|186, { mes "You are about to enter a dangerous area!"; next; mes "This area has a great distance to town. So the protection spell of the town is not active in that cave!"; mes "That is why other players are able to attack you."; close; -}
\ No newline at end of file +} |