修复

1.6/1.6/Defs/AbilityDefs/Abilities_EggSpew.xml

@@ -287,7 +287,7 @@
     </comps>
   </AbilityDef>
   <AbilityDef ParentName="ARA_CocoonSpew_Base">
-    <defName>ARA_Cocoon_Cloth_From_Corpse</defName>
+    <defName>ARA_Cocoon_Cloth_From_Death</defName>
     <label>尸织：织物孵化茧</label>
     <description>指定一具尚未腐烂或轻微腐烂的尸体，将其转化为一枚织物茧，尸体剩余的营养值会转化为茧的营养值——参阅茧的超链接，了解其能生产的所有装备的特点。</description>
     <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Cocoon_Cloth_From_Corpse</iconPath>
@@ -311,7 +311,7 @@
     <cooldownPerCharge>true</cooldownPerCharge>
     <comps>
       <li Class="ArachnaeSwarm.CompProperties_AbilityTransformCorpse">
-        <buildingDef>ARA_Cocoon_Cloth_From_Corpse</buildingDef>
+        <buildingDef>ARA_Cocoon_Cloth_From_Death</buildingDef>
         <nutritionToFuelRatio>1</nutritionToFuelRatio>
         <requireFreshCorpse>false</requireFreshCorpse>
         <maxRotStage>Rotting</maxRotStage> <!-- 允许新鲜和略腐烂的尸体 -->
@@ -332,7 +332,7 @@
     </comps>
   </AbilityDef>
   <AbilityDef ParentName="ARA_CocoonSpew_Base">
-    <defName>ARA_Cocoon_Weapon_From_Corpse</defName>
+    <defName>ARA_Cocoon_Weapon_From_Death</defName>
     <label>尸织：武装器官孵化茧</label>
     <description>指定一具尚未腐烂或轻微腐烂的尸体，将其转化为一枚武装器官茧，尸体剩余的营养值会转化为茧的营养值——参阅茧的超链接，了解其能生产的所有装备的特点。</description>
     <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Cocoon_Weapon_From_Corpse</iconPath>
@@ -356,7 +356,7 @@
     <cooldownPerCharge>true</cooldownPerCharge>
     <comps>
       <li Class="ArachnaeSwarm.CompProperties_AbilityTransformCorpse">
-        <buildingDef>ARA_Cocoon_Weapon_From_Corpse</buildingDef>
+        <buildingDef>ARA_Cocoon_Weapon_From_Death</buildingDef>
         <nutritionToFuelRatio>1</nutritionToFuelRatio>
         <requireFreshCorpse>false</requireFreshCorpse>
         <maxRotStage>Rotting</maxRotStage> <!-- 允许新鲜和略腐烂的尸体 -->
@@ -424,7 +424,7 @@
     </comps>
   </AbilityDef>
   <AbilityDef ParentName="ARA_CocoonSpew_Base">
-    <defName>ARA_Cocoon_Cloth_1Stage_From_Corpse</defName>
+    <defName>ARA_Cocoon_Cloth_1Stage_From_Death</defName>
     <label>尸织：织物孵化茧——等级1</label>
     <description>指定一具尚未腐烂或轻微腐烂的尸体，将其转化为一枚织物茧，尸体剩余的营养值会转化为茧的营养值——参阅茧的超链接，了解其能生产的所有装备的特点。</description>
     <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Cocoon_Cloth_1Stage_From_Corpse</iconPath>
@@ -448,7 +448,7 @@
     <cooldownPerCharge>true</cooldownPerCharge>
     <comps>
       <li Class="ArachnaeSwarm.CompProperties_AbilityTransformCorpse">
-        <buildingDef>ARA_Cocoon_Cloth_1Stage_From_Corpse</buildingDef>
+        <buildingDef>ARA_Cocoon_Cloth_1Stage_From_Death</buildingDef>
         <nutritionToFuelRatio>1</nutritionToFuelRatio>
         <requireFreshCorpse>false</requireFreshCorpse>
         <maxRotStage>Rotting</maxRotStage> <!-- 允许新鲜和略腐烂的尸体 -->
@@ -469,7 +469,7 @@
     </comps>
   </AbilityDef>
   <AbilityDef ParentName="ARA_CocoonSpew_Base">
-    <defName>ARA_Cocoon_Weapon_1Stage_From_Corpse</defName>
+    <defName>ARA_Cocoon_Weapon_1Stage_From_Death</defName>
     <label>尸织：武装器官孵化茧——等级1</label>
     <description>指定一具尚未腐烂或轻微腐烂的尸体，将其转化为一枚武装器官茧，尸体剩余的营养值会转化为茧的营养值——参阅茧的超链接，了解其能生产的所有装备的特点。</description>
     <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Cocoon_Weapon_1Stage_From_Corpse</iconPath>
@@ -493,7 +493,7 @@
     <cooldownPerCharge>true</cooldownPerCharge>
     <comps>
       <li Class="ArachnaeSwarm.CompProperties_AbilityTransformCorpse">
-        <buildingDef>ARA_Cocoon_Weapon_1Stage_From_Corpse</buildingDef>
+        <buildingDef>ARA_Cocoon_Weapon_1Stage_From_Death</buildingDef>
         <nutritionToFuelRatio>1</nutritionToFuelRatio>
         <requireFreshCorpse>false</requireFreshCorpse>
         <maxRotStage>Rotting</maxRotStage> <!-- 允许新鲜和略腐烂的尸体 -->
@@ -561,7 +561,7 @@
     </comps>
   </AbilityDef>
   <AbilityDef ParentName="ARA_CocoonSpew_Base">
-    <defName>ARA_Cocoon_Cloth_2Stage_From_Corpse</defName>
+    <defName>ARA_Cocoon_Cloth_2Stage_From_Death</defName>
     <label>尸织：织物孵化茧——等级2</label>
     <description>指定一具尚未腐烂或轻微腐烂的尸体，将其转化为一枚织物茧，尸体剩余的营养值会转化为茧的营养值——参阅茧的超链接，了解其能生产的所有装备的特点。</description>
     <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Cocoon_Cloth_2Stage_From_Corpse</iconPath>
@@ -585,7 +585,7 @@
     <cooldownPerCharge>true</cooldownPerCharge>
     <comps>
       <li Class="ArachnaeSwarm.CompProperties_AbilityTransformCorpse">
-        <buildingDef>ARA_Cocoon_Cloth_2Stage_From_Corpse</buildingDef>
+        <buildingDef>ARA_Cocoon_Cloth_2Stage_From_Death</buildingDef>
         <nutritionToFuelRatio>1</nutritionToFuelRatio>
         <requireFreshCorpse>false</requireFreshCorpse>
         <maxRotStage>Rotting</maxRotStage> <!-- 允许新鲜和略腐烂的尸体 -->
@@ -606,7 +606,7 @@
     </comps>
   </AbilityDef>
   <AbilityDef ParentName="ARA_CocoonSpew_Base">
-    <defName>ARA_Cocoon_Weapon_2Stage_From_Corpse</defName>
+    <defName>ARA_Cocoon_Weapon_2Stage_From_Death</defName>
     <label>尸织：武装器官孵化茧——等级2</label>
     <description>指定一具尚未腐烂或轻微腐烂的尸体，将其转化为一枚武装器官茧，尸体剩余的营养值会转化为茧的营养值——参阅茧的超链接，了解其能生产的所有装备的特点。</description>
     <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Cocoon_Weapon_2Stage_From_Corpse</iconPath>
@@ -630,7 +630,7 @@
     <cooldownPerCharge>true</cooldownPerCharge>
     <comps>
       <li Class="ArachnaeSwarm.CompProperties_AbilityTransformCorpse">
-        <buildingDef>ARA_Cocoon_Weapon_2Stage_From_Corpse</buildingDef>
+        <buildingDef>ARA_Cocoon_Weapon_2Stage_From_Death</buildingDef>
         <nutritionToFuelRatio>1</nutritionToFuelRatio>
         <requireFreshCorpse>false</requireFreshCorpse>
         <maxRotStage>Rotting</maxRotStage> <!-- 允许新鲜和略腐烂的尸体 -->
@@ -668,7 +668,7 @@
     </comps>
   </AbilityDef>
   <AbilityDef ParentName="ARA_CocoonSpew_Base">
-    <defName>ARA_Cocoon_Medicine_From_Corpse</defName>
+    <defName>ARA_Cocoon_Medicine_From_Death</defName>
     <label>尸织：织物医药茧</label>
     <description>指定一具尚未腐烂或轻微腐烂的尸体，将其转化为一枚医药茧，尸体剩余的营养值会转化为茧的营养值——参阅茧的超链接，了解其能生产的所有物品的特点。</description>
     <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Cocoon_Medicine_From_Corpse</iconPath>
@@ -692,7 +692,7 @@
     <cooldownPerCharge>true</cooldownPerCharge>
     <comps>
       <li Class="ArachnaeSwarm.CompProperties_AbilityTransformCorpse">
-        <buildingDef>ARA_Cocoon_Medicine_From_Corpse</buildingDef>
+        <buildingDef>ARA_Cocoon_Medicine_From_Death</buildingDef>
         <nutritionToFuelRatio>1</nutritionToFuelRatio>
         <requireFreshCorpse>false</requireFreshCorpse>
         <maxRotStage>Rotting</maxRotStage> <!-- 允许新鲜和略腐烂的尸体 -->

1.6/1.6/Defs/EvolutionDefs/ARA_Evolution.xml

@@ -174,8 +174,8 @@
         <abilityDefs>
           <li>ARA_Cocoon_Cloth</li>
           <li>ARA_Cocoon_Weapon</li>
-          <li>ARA_Cocoon_Cloth_From_Corpse</li>
+          <li>ARA_Cocoon_Cloth_From_Death</li>
-          <li>ARA_Cocoon_Weapon_From_Corpse</li>
+          <li>ARA_Cocoon_Weapon_From_Death</li>
           <li>ARA_WeaponSmith_Upgrade_1_Stage</li>
         </abilityDefs>
       </li>
@@ -249,8 +249,8 @@
         <abilityDefs>
           <li>ARA_Cocoon_Cloth_1Stage</li>
           <li>ARA_Cocoon_Weapon_1Stage</li>
-          <li>ARA_Cocoon_Cloth_1Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Cloth_1Stage_From_Death</li>
-          <li>ARA_Cocoon_Weapon_1Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Weapon_1Stage_From_Death</li>
           <li>ARA_WeaponSmith_Upgrade_2_Stage</li>
         </abilityDefs>
       </li>
@@ -324,8 +324,8 @@
         <abilityDefs>
           <li>ARA_Cocoon_Cloth_2Stage</li>
           <li>ARA_Cocoon_Weapon_2Stage</li>
-          <li>ARA_Cocoon_Cloth_2Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Cloth_2Stage_From_Death</li>
-          <li>ARA_Cocoon_Weapon_2Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Weapon_2Stage_From_Death</li>
         </abilityDefs>
       </li>
     </comps>
@@ -484,7 +484,7 @@
       <li Class="HediffCompProperties_GiveAbility">
         <abilityDefs>
           <li>ARA_Cocoon_Medicine</li>
-          <li>ARA_Cocoon_Medicine_From_Corpse</li>
+          <li>ARA_Cocoon_Medicine_From_Death</li>
           <li>ARA_MimicNematode_Needle_Fire</li>
         </abilityDefs>
       </li>

1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml

@@ -792,8 +792,8 @@
         <freeProduction>true</freeProduction>
         <disableHediff>ARA_RaceBaseSwarmProduceSwitchHediff</disableHediff>
         <fixedIngredient>ARA_InsectJelly</fixedIngredient>
-        <maxIngredientCount>500</maxIngredientCount>
+        <maxIngredientCount>1</maxIngredientCount>
-        <startingIngredientCount>500</startingIngredientCount>
+        <startingIngredientCount>1</startingIngredientCount>
         <costPerPawn>999</costPerPawn>
         <cooldownTicks>9999</cooldownTicks>
         <productionQueue>
@@ -952,8 +952,8 @@
         <freeProduction>true</freeProduction>
         <disableHediff>ARA_RaceBaseSwarmProduceSwitchHediff</disableHediff>
         <fixedIngredient>ARA_InsectJelly</fixedIngredient>
-        <maxIngredientCount>500</maxIngredientCount>
+        <maxIngredientCount>1</maxIngredientCount>
-        <startingIngredientCount>500</startingIngredientCount>
+        <startingIngredientCount>1</startingIngredientCount>
         <costPerPawn>999</costPerPawn>
         <cooldownTicks>9999</cooldownTicks>
         <productionQueue>
@@ -1072,8 +1072,8 @@
         <freeProduction>true</freeProduction>
         <disableHediff>ARA_RaceBaseSwarmProduceSwitchHediff</disableHediff>
         <fixedIngredient>ARA_InsectJelly</fixedIngredient>
-        <maxIngredientCount>500</maxIngredientCount>
+        <maxIngredientCount>1</maxIngredientCount>
-        <startingIngredientCount>500</startingIngredientCount>
+        <startingIngredientCount>1</startingIngredientCount>
         <costPerPawn>999</costPerPawn>
         <cooldownTicks>9999</cooldownTicks>
         <productionQueue>
@@ -1407,8 +1407,8 @@
         <freeProduction>true</freeProduction>
         <disableHediff>ARA_RaceBaseSwarmProduceSwitchHediff</disableHediff>
         <fixedIngredient>ARA_InsectJelly</fixedIngredient>
-        <maxIngredientCount>500</maxIngredientCount>
+        <maxIngredientCount>1</maxIngredientCount>
-        <startingIngredientCount>500</startingIngredientCount>
+        <startingIngredientCount>1</startingIngredientCount>
         <costPerPawn>999</costPerPawn>
         <cooldownTicks>9999</cooldownTicks>
         <productionQueue>

1.6/1.6/Defs/Thing_Misc/Apparels/ARA_Apparel.xml

@@ -62,7 +62,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Cloth</li>
-          <li>ARA_Cocoon_Cloth_From_Corpse</li>
+          <li>ARA_Cocoon_Cloth_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -95,7 +95,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Cloth</li>
-          <li>ARA_Cocoon_Cloth_From_Corpse</li>
+          <li>ARA_Cocoon_Cloth_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -128,7 +128,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Cloth</li>
-          <li>ARA_Cocoon_Cloth_From_Corpse</li>
+          <li>ARA_Cocoon_Cloth_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -161,7 +161,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Cloth</li>
-          <li>ARA_Cocoon_Cloth_From_Corpse</li>
+          <li>ARA_Cocoon_Cloth_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -194,7 +194,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Cloth</li>
-          <li>ARA_Cocoon_Cloth_From_Corpse</li>
+          <li>ARA_Cocoon_Cloth_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -325,7 +325,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Cloth</li>
-          <li>ARA_Cocoon_Cloth_From_Corpse</li>
+          <li>ARA_Cocoon_Cloth_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -376,7 +376,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Cloth_1Stage</li>
-          <li>ARA_Cocoon_Cloth_1Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Cloth_1Stage_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -428,7 +428,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Cloth_1Stage</li>
-          <li>ARA_Cocoon_Cloth_1Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Cloth_1Stage_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -480,7 +480,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Cloth_2Stage</li>
-          <li>ARA_Cocoon_Cloth_2Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Cloth_2Stage_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -532,7 +532,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Cloth_2Stage</li>
-          <li>ARA_Cocoon_Cloth_2Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Cloth_2Stage_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>

1.6/1.6/Defs/Thing_Misc/Apparels/ARA_PowerArmor.xml

@@ -104,12 +104,12 @@
       <li Class="CompProperties_CauseHediff_Apparel">
         <hediff>ARA_TerrainMoveSpeedHediff</hediff>
       </li>
-      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
+      <!-- <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Cloth_1Stage</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
-      </li>
+      </li> -->
       <li Class="ArachnaeSwarm.CompProperties_RefuelableNutrition">
         <silent>true</silent>
         <fuelCapacity>100.0</fuelCapacity>

1.6/1.6/Defs/Thing_Misc/Weapons/ARA_Weapon.xml

@@ -73,7 +73,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Weapon</li>
-          <li>ARA_Cocoon_Weapon_From_Corpse</li>
+          <li>ARA_Cocoon_Weapon_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -144,7 +144,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Weapon_1Stage</li>
-          <li>ARA_Cocoon_Weapon_1Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Weapon_1Stage_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -224,7 +224,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Weapon_2Stage</li>
-          <li>ARA_Cocoon_Weapon_2Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Weapon_2Stage_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -338,7 +338,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Weapon</li>
-          <li>ARA_Cocoon_Weapon_From_Corpse</li>
+          <li>ARA_Cocoon_Weapon_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -435,7 +435,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Weapon_1Stage</li>
-          <li>ARA_Cocoon_Weapon_1Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Weapon_1Stage_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -532,7 +532,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Weapon_1Stage</li>
-          <li>ARA_Cocoon_Weapon_1Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Weapon_1Stage_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -645,7 +645,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Weapon_2Stage</li>
-          <li>ARA_Cocoon_Weapon_2Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Weapon_2Stage_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -760,7 +760,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Weapon_2Stage</li>
-          <li>ARA_Cocoon_Weapon_2Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Weapon_2Stage_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -862,7 +862,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Weapon</li>
-          <li>ARA_Cocoon_Weapon_From_Corpse</li>
+          <li>ARA_Cocoon_Weapon_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -977,7 +977,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Weapon_1Stage</li>
-          <li>ARA_Cocoon_Weapon_1Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Weapon_1Stage_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -1126,7 +1126,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Weapon_2Stage</li>
-          <li>ARA_Cocoon_Weapon_2Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Weapon_2Stage_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -1244,7 +1244,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Weapon_2Stage</li>
-          <li>ARA_Cocoon_Weapon_2Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Weapon_2Stage_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -1378,7 +1378,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Weapon_2Stage</li>
-          <li>ARA_Cocoon_Weapon_2Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Weapon_2Stage_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -1514,7 +1514,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Weapon_1Stage</li>
-          <li>ARA_Cocoon_Weapon_1Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Weapon_1Stage_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -1666,7 +1666,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Weapon_1Stage</li>
-          <li>ARA_Cocoon_Weapon_1Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Weapon_1Stage_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>
@@ -1772,7 +1772,7 @@
       <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
         <cocoonDefs>
           <li>ARA_Cocoon_Weapon_1Stage</li>
-          <li>ARA_Cocoon_Weapon_1Stage_From_Corpse</li>
+          <li>ARA_Cocoon_Weapon_1Stage_From_Death</li>
           <li>ARA_BioforgeIncubator_Thing</li>
         </cocoonDefs>
       </li>

1.6/1.6/Defs/Thing_building/ARA_InteractiveEggSac.xml

@@ -699,7 +699,7 @@
     </comps>
   </ThingDef>
   <ThingDef ParentName="ARA_Cocoon_Cloth">
-    <defName>ARA_Cocoon_Cloth_From_Corpse</defName>
+    <defName>ARA_Cocoon_Cloth_From_Death</defName>
 
     <comps>
       <!-- The new, GrowthVat-style fuel component -->
@@ -809,7 +809,7 @@
     </comps>
   </ThingDef>
   <ThingDef ParentName="ARA_Cocoon_Weapon">
-    <defName>ARA_Cocoon_Weapon_From_Corpse</defName>
+    <defName>ARA_Cocoon_Weapon_From_Death</defName>
 
     <comps>
       <!-- The new, GrowthVat-style fuel component -->
@@ -927,7 +927,7 @@
     </comps>
   </ThingDef>
   <ThingDef ParentName="ARA_Cocoon_Cloth_1Stage">
-    <defName>ARA_Cocoon_Cloth_1Stage_From_Corpse</defName>
+    <defName>ARA_Cocoon_Cloth_1Stage_From_Death</defName>
 
     <comps>
       <!-- The new, GrowthVat-style fuel component -->
@@ -1040,7 +1040,7 @@
     </comps>
   </ThingDef>
   <ThingDef ParentName="ARA_Cocoon_Weapon_1Stage">
-    <defName>ARA_Cocoon_Weapon_1Stage_From_Corpse</defName>
+    <defName>ARA_Cocoon_Weapon_1Stage_From_Death</defName>
 
     <comps>
       <!-- The new, GrowthVat-style fuel component -->
@@ -1150,7 +1150,7 @@
     </comps>
   </ThingDef>
   <ThingDef ParentName="ARA_Cocoon_Cloth_2Stage">
-    <defName>ARA_Cocoon_Cloth_2Stage_From_Corpse</defName>
+    <defName>ARA_Cocoon_Cloth_2Stage_From_Death</defName>
 
     <comps>
       <!-- The new, GrowthVat-style fuel component -->
@@ -1284,7 +1284,7 @@
     </comps>
   </ThingDef>
   <ThingDef ParentName="ARA_Cocoon_Weapon_2Stage">
-    <defName>ARA_Cocoon_Weapon_2Stage_From_Corpse</defName>
+    <defName>ARA_Cocoon_Weapon_2Stage_From_Death</defName>
 
     <comps>
       <!-- The new, GrowthVat-style fuel component -->
@@ -1413,7 +1413,7 @@
     </comps>
   </ThingDef>
   <ThingDef ParentName="ARA_Cocoon_Medicine">
-    <defName>ARA_Cocoon_Medicine_From_Corpse</defName>
+    <defName>ARA_Cocoon_Medicine_From_Death</defName>
 
     <comps>
       <!-- The new, GrowthVat-style fuel component -->