diff --git a/1.5/Defs/Dragonianlike/HediffDefs/Hediffs_Local_AddedParts.xml b/1.5/Defs/Dragonianlike/HediffDefs/Hediffs_Local_AddedParts.xml
index a0c55bf..5871c94 100644
--- a/1.5/Defs/Dragonianlike/HediffDefs/Hediffs_Local_AddedParts.xml
+++ b/1.5/Defs/Dragonianlike/HediffDefs/Hediffs_Local_AddedParts.xml
@@ -184,73 +184,6 @@
 	  <addsHediff>FlareDragonianOrb</addsHediff>
 	</RecipeDef>
 
-	<HediffDef ParentName="AddedBodyPartBase">
-		<defName>NecroDragonianOrb</defName>
-		<label>Necro DragonianOrb</label>
-		<labelNoun>a Necro DragonianOrb.</labelNoun>
-		<description>An installed Flare DragonianOrb. Allow owner to spray deadlifedust.</description>
-		<priceImpact>false</priceImpact>
-		<abilities>
-			<li>ReleaseDeadlifeDust</li>
-		</abilities>
-		<addedPartProps>
-		  <solid>true</solid>
-		</addedPartProps>
-		<spawnThingOnRemoved>NecroDragonianOrb</spawnThingOnRemoved>
-	  </HediffDef>
-
-	<ThingDef ParentName="BodyPartDROrbsBase">
-	  <defName>NecroDragonianOrb</defName>
-	  <label>Necro DragonianOrb</label>
-	  <description>An Necro DragonianOrb. Allow owner to spray deadlifedust.</description>
-	  <graphicData>
-		<texPath>Dragonian/Things/Item/Resource/Dorb_AP</texPath>
-		<graphicClass>Graphic_Single</graphicClass>
-	  </graphicData>
-	  <techHediffsTags>
-		<li>NecroDragonianOrb</li>
-		<li>DragonianOrbAdvanced</li>
-	  </techHediffsTags>
-	  <statBases>
-		<MarketValue>1000</MarketValue>
-		<Mass>0.3</Mass>
-	  </statBases>
-	  <thingSetMakerTags>
-		<li>RewardStandardCore</li>
-	  </thingSetMakerTags>
-	</ThingDef>	
-
-	<RecipeDef ParentName="SurgeryInstallBodyPartArtificialBase">
-	  <defName>InstallNecroDragonianOrb</defName>
-	  <label>install Necro DragonianOrb</label>
-	  <description>Install Necro DragonianOrb.</description>
-	  <descriptionHyperlinks>
-	    <ThingDef>NecroDragonianOrb</ThingDef>
-	    <HediffDef>NecroDragonianOrb</HediffDef>
-	  </descriptionHyperlinks>
-	  <jobString>Installing Necro DragonianOrb.</jobString>
-	  <surgeryOutcomeEffect IsNull="True" /> <!-- Always succeeds -->
-	  <ingredients>
-	    <li>
-	      <filter>
-	        <thingDefs>
-	          <li>NecroDragonianOrb</li>
-	        </thingDefs>
-	      </filter>
-	      <count>1</count>
-	    </li>
-	  </ingredients>
-	  <fixedIngredientFilter>
-	    <thingDefs>
-	      <li>NecroDragonianOrb</li>
-	    </thingDefs>
-	  </fixedIngredientFilter>
-	  <appliedOnFixedBodyParts>
-	    <li>DragonianOrb</li>
-	  </appliedOnFixedBodyParts>
-	  <addsHediff>NecroDragonianOrb</addsHediff>
-	</RecipeDef>
-
 	<HediffDef ParentName="AddedBodyPartBase">
 		<defName>HyperhealDragonianOrb</defName>
 		<label>Hyperheal DragonianOrb</label>
diff --git a/1.5/Defs/Dragonianlike/PawnKinds/PawnKinds_Dragonian_NPC.xml b/1.5/Defs/Dragonianlike/PawnKinds/PawnKinds_Dragonian_NPC.xml
index 6f8879a..34b362e 100644
--- a/1.5/Defs/Dragonianlike/PawnKinds/PawnKinds_Dragonian_NPC.xml
+++ b/1.5/Defs/Dragonianlike/PawnKinds/PawnKinds_Dragonian_NPC.xml
@@ -732,6 +732,7 @@
 	  <techHediffsTags>
       <li>DragonianOrbAdvanced</li>
     </techHediffsTags>
+<<<<<<< HEAD
     <techHediffsRequired>
       <li>HyperhealDragonianOrb</li>
     </techHediffsRequired>
@@ -817,8 +818,10 @@
 	  <techHediffsTags>
       <li>DragonianOrbAdvanced</li>
     </techHediffsTags>
+=======
+>>>>>>> 7ad7ac28b2efb7a9afd330c984c5eb6851687ce7
     <techHediffsRequired>
-      <li>NecroDragonianOrb</li>
+      <li>HyperhealDragonianOrb</li>
     </techHediffsRequired>
 
     <inventoryOptions>
diff --git a/Ano1.5/HediffDefs/Hediffs_Local_AddedParts.xml b/Ano1.5/HediffDefs/Hediffs_Local_AddedParts.xml
new file mode 100644
index 0000000..a998399
--- /dev/null
+++ b/Ano1.5/HediffDefs/Hediffs_Local_AddedParts.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+	<HediffDef ParentName="AddedBodyPartBase">
+		<defName>NecroDragonianOrb</defName>
+		<label>Necro DragonianOrb</label>
+		<labelNoun>a Necro DragonianOrb.</labelNoun>
+		<description>An installed Flare DragonianOrb. Allow owner to spray deadlifedust.</description>
+		<priceImpact>false</priceImpact>
+		<abilities>
+			<li>ReleaseDeadlifeDust</li>
+		</abilities>
+		<addedPartProps>
+		  <solid>true</solid>
+		</addedPartProps>
+		<spawnThingOnRemoved>NecroDragonianOrb</spawnThingOnRemoved>
+	  </HediffDef>
+
+	<ThingDef ParentName="BodyPartDROrbsBase">
+	  <defName>NecroDragonianOrb</defName>
+	  <label>Necro DragonianOrb</label>
+	  <description>An Necro DragonianOrb. Allow owner to spray deadlifedust.</description>
+	  <graphicData>
+		<texPath>Dragonian/Things/Item/Resource/Dorb_AP</texPath>
+		<graphicClass>Graphic_Single</graphicClass>
+	  </graphicData>
+	  <techHediffsTags>
+		<li>NecroDragonianOrb</li>
+		<li>DragonianOrbAdvanced</li>
+	  </techHediffsTags>
+	  <statBases>
+		<MarketValue>1000</MarketValue>
+		<Mass>0.3</Mass>
+	  </statBases>
+	  <thingSetMakerTags>
+		<li>RewardStandardCore</li>
+	  </thingSetMakerTags>
+	</ThingDef>	
+
+	<RecipeDef ParentName="SurgeryInstallBodyPartArtificialBase">
+	  <defName>InstallNecroDragonianOrb</defName>
+	  <label>install Necro DragonianOrb</label>
+	  <description>Install Necro DragonianOrb.</description>
+	  <descriptionHyperlinks>
+	    <ThingDef>NecroDragonianOrb</ThingDef>
+	    <HediffDef>NecroDragonianOrb</HediffDef>
+	  </descriptionHyperlinks>
+	  <jobString>Installing Necro DragonianOrb.</jobString>
+	  <surgeryOutcomeEffect IsNull="True" /> <!-- Always succeeds -->
+	  <ingredients>
+	    <li>
+	      <filter>
+	        <thingDefs>
+	          <li>NecroDragonianOrb</li>
+	        </thingDefs>
+	      </filter>
+	      <count>1</count>
+	    </li>
+	  </ingredients>
+	  <fixedIngredientFilter>
+	    <thingDefs>
+	      <li>NecroDragonianOrb</li>
+	    </thingDefs>
+	  </fixedIngredientFilter>
+	  <appliedOnFixedBodyParts>
+	    <li>DragonianOrb</li>
+	  </appliedOnFixedBodyParts>
+	  <addsHediff>NecroDragonianOrb</addsHediff>
+	</RecipeDef>
+
+</Defs>
diff --git a/Ano1.5/PawnKinds/PawnKinds_Dragonian_NPC.xml b/Ano1.5/PawnKinds/PawnKinds_Dragonian_NPC.xml
new file mode 100644
index 0000000..09bcce7
--- /dev/null
+++ b/Ano1.5/PawnKinds/PawnKinds_Dragonian_NPC.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+  <PawnKindDef ParentName="DRMDragonianBasePawnKind">
+    <defName>Dragonian_Necro_Warrier</defName>
+    <label>Dragonian necro Warrier</label>
+    <labelPlural>Dragonian necro Warrier</labelPlural>
+    <combatPower>40</combatPower>
+    <isFighter>true</isFighter>
+    <itemQuality>Normal</itemQuality>
+
+    <apparelTags>
+      <li>DR_Apparel</li>
+      <li>DR_BattleDress</li>
+      <li>DR_BattleHelm</li>
+      <li>RoyalCombatGear</li>
+    </apparelTags>
+    <gearHealthRange>1~1</gearHealthRange>
+    <apparelMoney>
+      <min>1500</min>
+      <max>2500</max>
+    </apparelMoney>
+    <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
+
+    <specificApparelRequirements>
+      <li>
+        <bodyPartGroup>Torso</bodyPartGroup>
+        <requiredTag>DR_BattleDress</requiredTag>
+      </li>
+      <li>
+        <bodyPartGroup>UpperHead</bodyPartGroup>
+        <requiredTag>DR_BattleHelm</requiredTag>
+      </li>
+      <li>
+        <bodyPartGroup>Torso</bodyPartGroup>
+        <alternateTagChoices>
+          <li>
+            <tag>BeltDefenseNecro</tag>
+            <chance>1</chance>
+          </li>
+        </alternateTagChoices>
+      </li>
+    </specificApparelRequirements>
+
+    <apparelRequired>
+      <li>DR_BattleDress</li>
+      <li>DR_BattleHelmA</li>
+    </apparelRequired>
+
+    <weaponTags>
+      <li>DR_Battlesword</li>
+    </weaponTags>
+    <weaponMoney>
+      <min>850</min>
+      <max>1500</max>
+    </weaponMoney>
+
+    <backstoryFiltersOverride>
+      <li>
+        <categoriesChildhood>
+          <li>Dragonian_spawnCategoriesA</li>
+        </categoriesChildhood>
+        <categoriesAdulthood>
+          <li>Dragonian_Necromancer</li>
+        </categoriesAdulthood>
+      </li>
+    </backstoryFiltersOverride>
+
+    <techHediffsMoney>600~5500</techHediffsMoney>
+	  <techHediffsTags>
+      <li>DragonianOrbAdvanced</li>
+    </techHediffsTags>
+    <techHediffsRequired>
+      <li>NecroDragonianOrb</li>
+    </techHediffsRequired>
+
+    <inventoryOptions>
+      <skipChance>0.70</skipChance>
+      <subOptionsChooseOne>
+        <li>
+          <choiceChance>90</choiceChance>
+          <thingDef>Silver</thingDef>
+          <countRange>30~100</countRange>
+        </li>
+      </subOptionsChooseOne>
+    </inventoryOptions>
+  </PawnKindDef>
+
+</Defs>