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

diff --git a/npc/036-2/emblems.txt b/npc/036-2/emblems.txt
new file mode 100644
index 00000000..de61902b
--- /dev/null
+++ b/npc/036-2/emblems.txt
@@ -0,0 +1,26 @@
+036-2,29,27,0	script	#k2city1e	NPC412,{
+  end;
+  OnInit:
+    disablenpc "#k2city1e";
+  end;
+}
+036-2,29,27,0	script	#k2city1d	NPC413,{
+  end;
+}
+
+036-2,31,27,0	script	#k2city2e	NPC416,{
+  end;
+  OnInit:
+    disablenpc "#k2city2e";
+  end;
+}
+036-2,31,27,0	script	#k2city2d	NPC417,{
+  end;
+}
+
+036-2,32,27,0	script	#k2sound	NPC127,{
+  end;
+  OnCommandDing:
+    specialeffect 402;
+    end;
+}