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

diff --git a/npc/001-1/tombstones.txt b/npc/001-1/tombstones.txt
new file mode 100644
index 00000000..ce7a9ae8
--- /dev/null
+++ b/npc/001-1/tombstones.txt
@@ -0,0 +1,65 @@
+
+001-1,56,103,0	script	RIP#1	NPC400,{
+
+    mes "~ wushin ~";
+    mes "\"Tonori swallowed him whole.\"";
+    close;
+}
+
+001-1,57,103,0	script	RIP#2	NPC400,{
+
+    mes "~ Nard ~";
+    mes "\"Crushed by a loom.\"";
+    close;
+}
+
+001-1,58,103,0	script	RIP#3	NPC400,{
+
+    mes "~ tux9th ~";
+    mes "\"Eaten by bugs.\"";
+    close;
+}
+
+001-1,59,103,0	script	RIP#4	NPC400,{
+
+    mes "~ o11c ~";
+    mes "\"He asked for it, so they gave it to him.\"";
+    close;
+}
+
+001-1,60,103,0	script	RIP#5	NPC400,{
+
+    mes "~ " + strcharinfo(0) + " ~";
+    mes "The epitath is blank and the grave freshly dug.";
+    close;
+}
+001-1,56,106,0	script	RIP#6	NPC400,{
+
+    mes "~ Cassy ~";
+    mes "\"Eaten by trolls.\"";
+    close;
+}
+
+001-1,57,106,0	script	RIP#7	NPC400,{
+    mes "~ George ~";
+    mes "\"Eaten by snakes.\"";
+    close;
+}
+
+001-1,58,106,0	script	RIP#8	NPC400,{
+    mes "~ Kieron ~";
+    mes "\"He was right; monsters were in the cave.\"";
+    close;
+}
+
+001-1,59,106,0	script	RIP#9	NPC400,{
+    mes "~ William ~";
+    mes "\"Kieron was definitely right.\"";
+    close;
+}
+
+001-1,60,106,0	script	RIP#10	NPC400,{
+    mes "~ Tyer ~";
+    mes "\"An experiement went wrong.\"";
+    close;
+}