Merge branch 'master' into legacy

Override all files with 'master' version.

This version is meant to preserve git history as requested by bjorn.

1 files changed, 16 insertions, 0 deletions

diff --git a/npc/012-3/warningsigns.txt b/npc/012-3/warningsigns.txt
new file mode 100644
index 00000000..082ed2a5
--- /dev/null
+++ b/npc/012-3/warningsigns.txt
@@ -0,0 +1,16 @@
+
+012-3,455,70,0	script	sign#pvp-1	NPC187,{
+    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;
+}
+
+012-3,461,70,0	script	sign#pvp-2	NPC186,{
+    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;
+}