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, 8 insertions, 0 deletions

diff --git a/npc/006-1/mika.txt b/npc/006-1/mika.txt
new file mode 100644
index 00000000..c1134b05
--- /dev/null
+++ b/npc/006-1/mika.txt
@@ -0,0 +1,8 @@
+006-1,39,22,0	script	Mika	NPC114,{
+    mes "[Mika]";
+    mes "\"My father told me about a man living in this desert who makes clothes out of snake skin.\"";
+    next;
+    mes "[Mika]";
+    mes "\"Maybe you can find him, but be careful you don't get lost in the tunnels!\"";
+    close;
+}