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

diff --git a/npc/006-1/traveler.txt b/npc/006-1/traveler.txt
new file mode 100644
index 00000000..a16b502a
--- /dev/null
+++ b/npc/006-1/traveler.txt
@@ -0,0 +1,7 @@
+
+006-1,25,95,0	script	Rhutan the Traveler	NPC103,{
+    @npcname$ = "Rhutan";
+    @NpcTravelBit = $@pachua_bit;
+    callfunc "Traveler";
+    end;
+}