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

diff --git a/npc/001-2/manakins.txt b/npc/001-2/manakins.txt
new file mode 100644
index 00000000..db8ea1dd
--- /dev/null
+++ b/npc/001-2/manakins.txt
@@ -0,0 +1,45 @@
+
+001-2,29,57,0	script	Terranite Armor#Female	NPC401,{
+    mes "A complete set of female Terranite armor stands on display. These appear to be made to order.";
+    next;
+    mes "An inscription on the helmet reads \"Made by Heathin.\"";
+    close;
+}
+
+001-2,34,57,0	script	Terranite Armor#Male	NPC402,{
+    mes "A complete set of male Terranite armor stands on display. These appear to be made to order.";
+    next;
+    mes "An inscription on the helmet reads \"Made by Heathin.\"";
+    close;
+}
+
+001-2,34,62,0	script	Terranite	NPC403,{
+    mes "Ahhh! A Terranite!";
+    next;
+    mes "Wait a minute...";
+    next;
+    mes "It appears to just be a display model.";
+    close;
+}
+
+
+001-2,91,39,0	script	Talponian#Female	NPC404,{
+    mes "A female Talponian manakin stands on display.";
+    close;
+}
+
+001-2,91,44,0	script	Talponian#Male	NPC405,{
+    mes "A male Talponian manakin stands on display.";
+    close;
+}
+
+001-2,118,39,0	script	Gispaan#Female	NPC406,{
+    mes "A female Gispaan manakin stands on display.";
+    close;
+}
+
+001-2,118,44,0	script	Gispaan#Male	NPC407,{
+    mes "A male Gispaan manakin stands on display.";
+    close;
+}
+