From 35fea39ce875f2b356d00cc26dae044cfb5c9140 Mon Sep 17 00:00:00 2001
From: Micksha <Micksha@users.noreply.github.com>
Date: Mon, 10 Sep 2018 13:08:06 +0200
Subject: add a bunch of hurns NPCs - most of them LEGACY versions, to be
 changed one by one

---
 npcs.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'npcs.xml')

diff --git a/npcs.xml b/npcs.xml
index 83bba7fd..7f29da7f 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -344,7 +344,11 @@ IDs 900-999 = Special
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
     <npc id="165">
+<<<<<<< a934ccc6b08044005ed62f27e9503b21b46a6ed3
         <!-- LEGACY - Waitress, former Melinda. -->
+=======
+        <!-- LEGACY - Waitress, Melinda. -->
+>>>>>>> add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
         <sprite variant="16">npcs/xml/unanimated-legacy.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
@@ -369,6 +373,14 @@ IDs 900-999 = Special
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
     <npc id="170">
+<<<<<<< a934ccc6b08044005ed62f27e9503b21b46a6ed3
+=======
+        <!-- LEGACY - Young Boy, Mike.  -->
+        <sprite variant="20">npcs/xml/unanimated-legacy.xml</sprite>
+        <menu name="Talk" command="talk 'NAME'"/>
+    </npc>
+    <npc id="170">
+>>>>>>> add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
         <!-- LEGACY - Princess, Celestia.  -->
         <sprite variant="0">npcs/xml/unanimated-legacy-tall.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
@@ -393,6 +405,7 @@ IDs 900-999 = Special
         <sprite variant="4">npcs/xml/unanimated-legacy-tall.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
+<<<<<<< a934ccc6b08044005ed62f27e9503b21b46a6ed3
     <npc id="175">
         <!-- LEGACY - Drinker Roamingo, sitting.  -->
         <sprite variant="22">npcs/xml/unanimated-legacy.xml</sprite>
@@ -448,6 +461,8 @@ IDs 900-999 = Special
         <sprite variant="28">npcs/xml/unanimated-legacy.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
+=======
+>>>>>>> add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
 
     <!-- Animated NPCs -->
 
@@ -794,6 +809,7 @@ IDs 900-999 = Special
         <sprite>npcs/xml/hinnak.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
+<<<<<<< a934ccc6b08044005ed62f27e9503b21b46a6ed3
     <npc id="454">
         <!-- Human Male, removing his monocle for winking. -->
         <sprite>npcs/xml/richard.xml</sprite>
@@ -811,6 +827,8 @@ IDs 900-999 = Special
         <sprite>equipment/chest/shirt-male.xml|#2b2b2b,382140,3f3f3f,3a254e,585858,3b3769,858585,3c3d83,a7a7a7,4246a6,d6d6d6,5a9cdb,ffffff,afedd2</sprite>
         <sprite>hairstyles/hairstyle01.xml</sprite>
     </npc>
+=======
+>>>>>>> add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
 
     <!-- Test NPCs -->
     <npc id="800" allowDelete="false">
-- 
cgit v1.2.3-60-g2f50