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

diff --git a/npc/031-3/labyrinth.txt b/npc/031-3/labyrinth.txt
new file mode 100644
index 00000000..f08448b4
--- /dev/null
+++ b/npc/031-3/labyrinth.txt
@@ -0,0 +1,10 @@
+
+031-3,46,24,0	script	#YetiBarrier-outside	NPC45,0,0,{
+    if ($@FIGHT_YETI_STATUS == 1) goto L_Blocked;
+    warp "031-4", 40, 70;
+    end;
+
+L_Blocked:
+    message strcharinfo(0), "A force field seems to be blocking you from entering.";
+    end;
+}