Merge commit 'mainline/master'

Conflicts:
	npc/001-1_Tulimshar/elanore.txt
	npc/013-3_Cave/barrier.txt
	npc/015-3/katze.txt

1 files changed, 7 insertions, 0 deletions

diff --git a/npc/botcheck/_mobs.txt b/npc/botcheck/_mobs.txt
new file mode 100644
index 00000000..8df9159f
--- /dev/null
+++ b/npc/botcheck/_mobs.txt
@@ -0,0 +1,7 @@
+// botcheck mobs
+
+
+
+botcheck.gat,0,0,0	script	Mobbotcheck	-1,{
+	end;
+}