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

diff --git a/npc/051-1/janitor.txt b/npc/051-1/janitor.txt
new file mode 100644
index 00000000..15a849c1
--- /dev/null
+++ b/npc/051-1/janitor.txt
@@ -0,0 +1,23 @@
+051-1,1,1,0	script	#IlliaJanitor1	NPC32767,{
+end;
+
+OnCommandClean:
+    // Nothing to do here.
+    end;
+
+}
+
+051-1,1,1,0	script	#IlliaJanitor3	NPC32767,{
+end;
+
+OnCommandClean:
+    killmonster "051-1", "IlliaDMobs051-1::On1096";
+    // Kill the soul eaters that were spawned
+    killmonster "051-1", "#SoulEaters0::OnSoulEaterDeath";
+    killmonster "051-1", "#SoulEaters1::OnSoulEaterDeath";
+    killmonster "051-1", "#SoulEaters2::OnSoulEaterDeath";
+    killmonster "051-1", "#SoulEaters3::OnSoulEaterDeath";
+    killmonster "051-1", "#SoulEaters4::OnSoulEaterDeath";
+    end;
+
+}