Merge pull request #109 from vegapnk/dev

2.1.0 Release

.gitignore

@@ -1,7 +1,8 @@
+*.user
+
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
-
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 

About/About.xml

@@ -1,12 +1,25 @@
 <ModMetaData>
 	<name>RJW Genes</name>
 	<author>Vegapnk</author>
-    <packageId>Vegapnk.rjw.genes</packageId>
+	<packageId>Vegapnk.rjw.genes</packageId>
 	<supportedVersions>
-		<li>1.4</li>
+		<li>1.5</li>
 	</supportedVersions>
-	<description>Adds Genes for RJW Content</description>
+	<description>
-	<url>https://steamcommunity.com/id/Vegapnk/myworkshopfiles/?appid=294100</url>
+Adds Genes for RJW Content.
+Adds:
+- Genes for Genitalia Types and Sizes
+- Fertilin, a resource similiar to Hemogen, and accompanying sex-vampires
+- Mechanics for Breeding and being Breed by Animals and Insects
+- Inherit genes from bestiality or produce VGE-Hybrids
+- Male / Female Only, MPreg, Genderfluid Pawns
+- Orgasmic Mytosis, Orgasmic Supercharging, Age-Transfer on Sex, Pheromones
+- Cum-Amount changes, Cumflation Immunity
+- Horny Pheromones, Animal Mating Call
+- Patches for some popular Xenotypes from the Workshop
+- Sexual Taming of Animals
+	</description>
+	<url>https://github.com/vegapnk/RJW-Genes</url>
 	<modDependencies>
 		<li>
 			<packageId>Ludeon.RimWorld.Biotech</packageId>

About/Manifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
 	<identifier>RJW-Genes</identifier>
-	<version>1.3.1</version>
+	<version>2.0.0</version>
 	<dependencies>
         <li>RimJobWorld</li>
 		<li>HugsLib</li>

CHANGELOG.md

@@ -1,3 +1,110 @@
+# 2.1.0
+
+**Additions**:
+
+- New Ability Gene *Mating-Call*: Get bred by all nearby animals. 
+- New Ability Gene *Pheromone Spit*: Mark a target to be bred by nearby animals
+- New Passive Gene *Sexual Tamer*: Chance to tame or train animals on bestiality.
+- Human + Animal Pregnancy can (if enabled in settings) produce Vanilla Expanded Genetics Hybrids. Thanks to @Jaaldabaoth (#88)
+- Xenogenes for "Big and Small" Xenotypes thanks to @Flock-of-birds (#83)
+- Xenogenes for "Biotech Expansion Mammalia" and "Biotech Expansion - Mythic" thanks to @Ohreallyow (#86)
+- Xenogenes update for (many?) "Vanilla Races Expanded (VRE)" Mods - Thanks to @Jaaldabaoth (#84 / #88 )
+- Genes can now fulfill RJW Quirks, configurable in XML. Thanks to @Jaaldabaoth (#84 / #88)
+- "Genes" to support VRE Androids having Mechanical Genitalia. Thanks to @Jaaldabaoth (#88)
+- "Curiosity Genes" alongside other Curiosities from VRE. Thanks to @Jaaldabaoth (#88)
+- Support for many VE-Genetics Animals into the Animal-Framework. Thanks to @Jaaldabaoth (#88)
+- "Likes Cumflation"-Gene now also makes pawns immune against the effects of cumflations. They are still cumflated. 
+- Gasmasks make immune against Aphrodisiac Pheromones (#108)
+
+**Fixes**:
+
+- Licentia Genes are back in and should work again. I used the [updated for by Jaaldabaoth](https://gitgud.io/Jaaldabaoth/licentia-labs) for my testing.
+- Lower-casing most labels to fit rimworld standards, thanks to @Flock-of-birds (#83)
+- X-Gender-Only Genes leave / re-add artificial genitalia. Thanks to @Jaaldabaoth (#84 / #88)
+- Issues with Elasticity References (#87)
+- Null Pointer for LoveFeeding when finding Mechs. Thanks to @Jaaldabaoth (Fixes #90)
+- Changes to the Implants introduced in 2.0.0 - they imposed a hidden dependency on Royalty (Fixes #89)
+- Issues when generating relations (#98, fixed in #106 thanks @Jaaldabaoth)
+- Hardening of Licentia Dependencies (#105)
+- Littered Birth and Chest-Burst Pregnancy are now mutually exclusive (#96)
+- Youth Fountain cannot youth on masturbation anymore (#99)
+- Documented the HasActiveGene Error Message (#104)
+- Pawns with "rjw_genes_no_sexneed" wont go raping (or atleast way less, #100)
+- Extra Nullcheck for Genes in Orgasmic Mytosis (#95)
+- Orgasmic Mytosis Pawns *should* inherit the Xenotypename and favorite colour now 
+- Babies should not have "SexChangeThoughts" anymore when they had a (fe)male-only gene (#103)
+
+**Changes**:
+
+- Minified some Race-Patches, thanks to @Flock-of-birds (#83)
+- XML-Genitalia-Genes can now also provide Breasts. Thanks to @Jaaldabaoth (#84 / #88)
+- Many patches and files went into a `Mods`Folder and use an `LoadFolders.xml`. Thanks to @Jaaldabaoth (#84 / #88)
+- Translate-Keys for Settings 
+- Translate-Key for Animal Hybrid Race-Names
+- "Tick-Speed" for Evergrowth moved from Mod-Settings to XML
+- Some new Icons thanks to Kira-Bad-Artist
+- Some new Icons thanks to Archer 
+
+# 2.0.0
+
+**Summary**:
+
+- 1.5 Support 
+- Femboys, MPReg
+- Couple Implants around Fertility / Sex / Pregnancy
+- Hive Removal (to be reintroduced somewhere else)
+- Licentia Genes became placeholders, no functions until Licentia is on 1.5
+
+**Additions**: 
+
+- initial Rimworld 1.5 thanks to @jaaldabaoth
+- Fertile Anus Gene, thanks to @jaaldabaoth
+- Femboy Genes, for male pawns with Vaginas @jaaldabaoth
+- Udder Gene @jaaldabaoth , Fixes #57
+- Some other Genitalia Sets (Crocodilian, Racoon, ...) thanks to @jaaldabaoth, Closes #57
+- LitteredBirthsGene thanks to @jaaldabaoth
+- OvaryAgitator that allows for a cyclic fertility. Thanks @jaaldabaoth. See [its description](./Common/Defs/ThingDefs/OvaryAgitator.xml)
+- LimbicStimulator / Scrambler thanks to @jaaldabaoth. See [Scrambler Description](Common/Defs/ThingDefs/Scrambler.xml) and [Limbic Stimulator](./Common/Defs/ThingDefs/LimbicStimulator.xml)
+- Bioscaffold that allows for faster pregnancies. thanks to @jaaldabaoth. See [its description](./Common/Defs/ThingDefs/Bioscaffold.xml)
+- Multi-Pregnancy Gene thanks to @jaaldabaoth
+- Many genes have settings configurable in their xml - tick speeds and distances.
+
+**Changes**: 
+
+- Modularised many "change gentialia sets"-genes into a XML configurations. Thanks to @flock-of-birds
+- **Removed** Hive Logic for now! This might break some of your save-games. 
+- Highmates "Initiate Loving" uses Succubus "Seduce" ability, thanks to @jaaldabaoth
+- Slider for Evergrowth Tick-Speed, thanks to @jaaldabaoth
+- Resizing Age for resizing Genes can be set in Settings @jaaldabaoth
+- **Licentia related genes are only placeholders**, as Licentia is not 1.5 yet
+- InsectIncubator only does self-fertilization now, but does not increase storage capacities for eggs anymore
+- Some Genes (GenitaliaTypes, Cum, some others) cannot be in quest-rewards anymore. Special, Size, Breeding and Lifeforce genes still can be quest rewards.
+
+**Fixes:** 
+
+- Small changes to drawing Succubus Wings
+- Minor Format changes to lots of XML files
+- Pawns with ONLY an Archotech penis will not give Fertilin, and will not receive debuffs (Fixes #71)
+
+**Hidden Changes:** 
+
+- Patches for "Same Mother" / "Same Father" to account for Male-Pregs. This should only extend behaviour but be warned a bit. 
+- Patches to RJW-Pregnancy Helper to account for Male Pregs. 
+- Some replacements from `hasGene` to `hasActiveGene` 
+
+# 1.3.3
+
+**Fixes:** 
+
+- Added another check to the AG Malachai Xenotype (Fixes #68)
+- Fixed the `GatheredCum`Fertilin Ingestion Patch throwing an Error for people without Sexperience (Fixes #69 (nice))
+
+# 1.3.2
+
+**Fixes:**
+
+- Removed patch for Malachai, needs a different patching operator but I don't want to have broken fixes for now (Tracked in a new Issue)
+
 # 1.3.1 
 
 **Changes**

CONTRIBUTING.md

@@ -17,6 +17,8 @@ But please consider also the following:
 
 - Shabalox (MechBreeding, InsectBreeding, Animal Gene Inheritance)
 - WasMachenDennSachen (Various Icons)
+- Jaaldabaoth (1.5 Migration, MPreg, Femboys)
+- Flock-of-Birds (Cosmetic Genitalia per XML)
 
 ## Other Credits 
 
@@ -27,3 +29,7 @@ But please consider also the following:
 - Hypersexual & Zoophile comes from [RJW](https://gitgud.io/Ed86/rjw)
 - Cockeater & Naked Prowess come from *WasMachenDennSachen* but I copied it from Discord Chat. 
 - Fertilin, Fertilin Drain, Healpussy, Succubus Wing & Tail come from Shabakur
+- Littered Birth, Many of the Penis Types are from Jaaldabaoth
+- Feline Genitalia, Animal Mating Call and Udder are from Kira-Bad-Artist
+- Sexual Tamer, Pheromone Spit and Mating call are from Archer
+- The Preview was started with [Yodayo](https://yodayo.com/) 

Common/Defs/AbilityDefs/Ability_CockEater.xml

@@ -2,7 +2,7 @@
 <Defs>
   <AbilityDef ParentName="AbilityTouchBase">
     <defName>rjw_genes_ability_cockeater</defName>
-    <label>Eat Cock</label>
+    <label>eat cock</label>
     <description>Eat the cock of another pawn, restoring fertilin based on the size of the cock.</description>
     <iconPath>Genes/Icons/cockeater</iconPath>
     <stunTargetWhileCasting>true</stunTargetWhileCasting>

Common/Defs/AbilityDefs/Ability_CocoonWeaver.xml

@@ -2,7 +2,7 @@
 <Defs>
   <AbilityDef ParentName="AbilityTouchBase">
     <defName>rjw_genes_ability_cocoonweaver</defName>
-    <label>Cocoon</label>
+    <label>cocoon</label>
     <description>Weaves the victim into a (self-sustaining) cocoon. The victim cannot move, but can be bred.</description>
     <iconPath>Genes/Icons/Cocoon</iconPath>
     <stunTargetWhileCasting>true</stunTargetWhileCasting>

Common/Defs/AbilityDefs/Ability_MatingCall.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+  <AbilityDef>
+    <defName>rjw_genes_ability_mating_call</defName>
+    <label>Mating Call</label>
+    <description>Calls nearby animals to breed me.</description>
+    <iconPath>Genes/Icons/Mating_Call_2</iconPath>
+    
+    <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
+    <disableGizmoWhileUndrafted>false</disableGizmoWhileUndrafted>
+
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <statBases>
+        <Ability_Duration>50</Ability_Duration>
+        <Ability_EffectRadius>0</Ability_EffectRadius>
+    </statBases>
+
+    <displayOrder>410</displayOrder>
+    <!-- 30k Ticks = 12h -->
+    <cooldownTicksRange>30000</cooldownTicksRange>
+    <verbProperties>
+        <warmupTime>5</warmupTime>
+        <verbClass>Verb_CastAbility</verbClass>
+        <targetParams>
+          <canTargetHumans>False</canTargetHumans>
+          <canTargetMechs>False</canTargetMechs>
+          <canTargetAnimals>True</canTargetAnimals>
+          <canTargetLocations>True</canTargetLocations>
+        </targetParams>
+      </verbProperties>
+    
+      <comps>
+        <li Class="CompProperties_AbilityFleckOnTarget">
+          <fleckDef>PsycastPsychicEffect</fleckDef>
+        </li>
+        <li Class="RJW_Genes.CompProperties_AbilityMatingCall">
+            <calldistance>40</calldistance>
+        </li>
+        <li Class="CompProperties_AbilityGiveHediff">
+            <compClass>CompAbilityEffect_GiveHediff</compClass>
+            <hediffDef>Hediff_Submitting</hediffDef>
+            <onlyApplyToSelf>True</onlyApplyToSelf>
+        </li>
+     </comps>   
+     <confirmationDialogText>Being Bred is not an easy business.\nThis might lead to a broken pawn, torn genitalia and hybrid-pregnancies.\nMaybe this is what you want.\nThe pawn will `submit` and e.g. Insects might cocoon him.\n\nAre you sure to proceed?</confirmationDialogText>
+      
+  </AbilityDef>
+
+</Defs>

Common/Defs/AbilityDefs/Ability_PheromoneSpit.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+<AbilityDef>
+    <defName>rjw_genes_ability_pheromone_spit</defName>
+    <label>pheromone spit</label>
+    <description>Spit a condensed ball of animal pheromones to mark a target. Nearby Animals will try to breed the target. This means all animals - hostile, friendly and wild.</description>
+    <iconPath>Genes/Icons/RJW_Genes_PheromoneSpit</iconPath>
+
+    <cooldownTicksRange>3000</cooldownTicksRange>
+    <displayOrder>201</displayOrder>
+    <aiCanUse>true</aiCanUse>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <range>11</range>
+      <warmupTime>1.2</warmupTime>
+      <soundCast>PiercingSpine_Launch</soundCast>
+      <targetParams>
+        <canTargetHumans>True</canTargetHumans>
+        <canTargetMechs>False</canTargetMechs>
+        <canTargetAnimals>False</canTargetAnimals>
+        <canTargetLocations>False</canTargetLocations>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="RJW_Genes.CompProperties_AbilityPheromoneSpit">
+        <calldistance>25</calldistance>
+      </li>
+    </comps>
+  </AbilityDef>
+</Defs>

Common/Defs/AbilityDefs/Ability_PussyHeal.xml

@@ -2,7 +2,7 @@
 <Defs>
   <AbilityDef ParentName="AbilityTouchBase">
     <defName>rjw_genes_ability_pussyheal</defName>
-    <label>SexHeal</label>
+    <label>sexheal</label>
     <description>Rape another pawn, so you can heal them with your vagina's special healing power.</description>
     <iconPath>Things/Mote/Heart</iconPath>
     <stunTargetWhileCasting>false</stunTargetWhileCasting>

Common/Defs/AbilityDefs/Ability_Seduce.xml

@@ -9,13 +9,13 @@
     <stunTargetWhileCasting>true</stunTargetWhileCasting>
     <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
     <disableGizmoWhileUndrafted>false</disableGizmoWhileUndrafted>
-	  <statBases>
+    <statBases>
       <Ability_Duration>10</Ability_Duration>
     </statBases>
     <warmupMote>Mote_CoagulateStencil</warmupMote>
     <warmupEffecter>Coagulate</warmupEffecter>
     <warmupStartSound>Coagulate_Cast</warmupStartSound>
-	<verbProperties>
+    <verbProperties>
       <verbClass>Verb_CastAbility</verbClass>
       <range>10</range>
       <warmupTime>1</warmupTime>
@@ -35,9 +35,10 @@
       <li Class="CompProperties_AbilityFleckOnTarget">
         <fleckDef>Heart</fleckDef>
       </li>
-	  <li Class="RJW_Genes.CompProperties_AbilityLifeForceCost">
+      <li Class="RJW_Genes.CompProperties_AbilityLifeForceCost">
         <fertilinCost>0.20</fertilinCost>
       </li>
     </comps>
   </AbilityDef>
+  
 </Defs>

Common/Defs/AbilityDefs/Ability_SpawnSpelopede.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-  <AbilityDef>
-    <defName>rjw_genes_ability_spawn_spelopede</defName>
-    <label>Insect Ally</label>
-    <description>Generates a tame spelopede, ready to serve their master.</description>
-    <iconPath>Genes/Icons/Spelopede_Dispenser</iconPath>
-    <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
-    <disableGizmoWhileUndrafted>false</disableGizmoWhileUndrafted>
-
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <warmupTime>3</warmupTime>
-      <drawAimPie>False</drawAimPie>
-      <requireLineOfSight>False</requireLineOfSight>
-      <range>2</range>
-      <targetParams>
-        <canTargetPawns>False</canTargetPawns>
-        <canTargetLocations>True</canTargetLocations>
-      </targetParams>
-    </verbProperties>
-    
-    <canUseAoeToGetTargets>False</canUseAoeToGetTargets>
-    <cooldownTicksRange>1800000</cooldownTicksRange>
-
-    <comps>
-      <li Class = "RJW_Genes.CompProperties_AbilitySpawnSpelopede">
-        <compClass>RJW_Genes.CompAbilityEffect_SpawnSpelopede</compClass>
-        <pawnKindDef>Spelopede</pawnKindDef>
-        <tamed>true</tamed>
-        <sensitivityMultiplier>1.00</sensitivityMultiplier>
-      </li>
-    </comps>
-  </AbilityDef>
-
-</Defs>

Common/Defs/GeneDefs/GeneCategories.xml

@@ -15,63 +15,57 @@
 
   <GeneCategoryDef>
     <defName>rjw_genes_gender</defName>
-    <label>Gender</label>
+    <label>gender</label>
     <displayPriorityInXenotype>21</displayPriorityInXenotype>
   </GeneCategoryDef>
 
   <GeneCategoryDef>
     <defName>rjw_genes_genitalia_type</defName>
-    <label>Genitalia Types</label>
+    <label>cosmetic - genitalia type</label>
     <displayPriorityInXenotype>19</displayPriorityInXenotype>
   </GeneCategoryDef>
 
   <GeneCategoryDef>
     <defName>rjw_genes_genitalia_extras</defName>
-    <label>Genitalia Amounts</label>
+    <label>genitalia count</label>
     <displayPriorityInXenotype>17</displayPriorityInXenotype>
   </GeneCategoryDef>
 
   <GeneCategoryDef>
     <defName>rjw_genes_genitalia_size</defName>
-    <label>Genitalia Size / Attributes</label>
+    <label>genitalia size / attributes</label>
     <displayPriorityInXenotype>15</displayPriorityInXenotype>
   </GeneCategoryDef>
 
   <GeneCategoryDef>
     <defName>rjw_genes_fertilin</defName>
-    <label>Fertilin</label>
+    <label>fertilin</label>
     <displayPriorityInXenotype>14</displayPriorityInXenotype>
   </GeneCategoryDef>
 
   <GeneCategoryDef>
     <defName>rjw_genes_breeding</defName>
-    <label>Breeding</label>
+    <label>breeding</label>
     <displayPriorityInXenotype>13</displayPriorityInXenotype>
   </GeneCategoryDef>
 
   <GeneCategoryDef>
     <defName>rjw_genes_cum</defName>
-    <label>Cum</label>
+    <label>cum</label>
     <displayPriorityInXenotype>12</displayPriorityInXenotype>
   </GeneCategoryDef>
 
   <GeneCategoryDef>
     <defName>rjw_genes_damage</defName>
-    <label>Genital Related Damage</label>
+    <label>genital-related damage</label>
     <displayPriorityInXenotype>11</displayPriorityInXenotype>
   </GeneCategoryDef>
 
   <GeneCategoryDef>
     <defName>rjw_genes_special</defName>
-    <label>Genital Based Special Abilities</label>
+    <label>genital-based special abilities</label>
     <displayPriorityInXenotype>8</displayPriorityInXenotype>
   </GeneCategoryDef>
   
-  <GeneCategoryDef>
-    <defName>rjw_genes_hive</defName>
-    <label>Hive</label>
-    <displayPriorityInXenotype>7</displayPriorityInXenotype>
-  </GeneCategoryDef>
-  
   
 </Defs>

Common/Defs/GeneDefs/GeneDefs_Breeding.xml

@@ -1,44 +1,118 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Defs>
-  <!-- rjw_genes_mechbreeder,rjw_genes_insectincubator and rjw_genes_insectbreeder were kindly supplied by `Shabalox` https://github.com/Shabalox/RJW_Genes_Addons/ -->
+  <!-- rjw_genes_mechbreeder,rjw_genes_insectincubator and rjw_genes_insectbreeder were kindly
+  supplied by `Shabalox` https://github.com/Shabalox/RJW_Genes_Addons/ -->
 
-  <GeneDef>
+  <GeneDef Name="BreedingBase" Abstract="True">
+    <displayCategory>rjw_genes_breeding</displayCategory>
+
+    <modExtensions>
+      <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
+        Class="VanillaGenesExpanded.GeneExtension">
+        <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+        <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+      </li>
+    </modExtensions>
+  </GeneDef>
+
+
+  <GeneDef ParentName="BreedingBase">
     <defName>rjw_genes_mechbreeder</defName>
-    <label>Mechbreeder</label>
+    <label>mechbreeder</label>
     <description>Pawns with this gene are able to birth mechanoids unharmed.</description>
     <iconPath>World/WorldObjects/Expanding/Mechanoids</iconPath>
     <displayOrderInCategory>51</displayOrderInCategory>
-	  <displayCategory>rjw_genes_breeding</displayCategory>
     <biostatCpx>1</biostatCpx>
     <biostatMet>-1</biostatMet>
-
-    <modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-			</li>
-		</modExtensions>
   </GeneDef>
 
-  <GeneDef>
+  <GeneDef ParentName="BreedingBase">
-      <defName>rjw_genes_zoophile</defName>
+    <defName>rjw_genes_zoophile</defName>
-      <label>Zoophile</label>
+    <label>zoophile</label>
-      <displayCategory>rjw_genes_breeding</displayCategory>
+    <description>Xenotypes with this Gene are Zoophile.</description>
-      <description>Xenotypes with this Gene are Zoophile.</description>
+    <iconPath>Genes/Icons/Zoophile</iconPath>
-      <iconPath>Genes/Icons/Zoophile</iconPath>
+    <displayOrderInCategory>54</displayOrderInCategory>
-      <displayOrderInCategory>54</displayOrderInCategory>    
+    <forcedTraits>
-      <forcedTraits>
+      <li>
-          <li>
+        <def>Zoophile</def>
-              <def>Zoophile</def>
+      </li>
-          </li>
+    </forcedTraits>
-      </forcedTraits>
+  </GeneDef>
 
-    <modExtensions>
+  <GeneDef ParentName="BreedingBase">
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+    <defName>rjw_genes_fertile_anus</defName>
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+    <label>fertile anus</label>
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+    <description>Xenotypes with this gene have a functional uterus connected to the anal cavity even
-			</li>
+      for males</description>
-		</modExtensions>
+    <iconPath>Genes/Icons/Fertile_anus</iconPath>
+    <displayOrderInCategory>54</displayOrderInCategory>
+  </GeneDef>
+
+  <GeneDef ParentName="BreedingBase">
+    <defName>rjw_genes_insectincubator</defName>
+    <label>insect incubator</label>
+    <geneClass>RJW_Genes.Gene_InsectIncubator</geneClass>
+    <description>Pawns with this gene fertilize insect eggs that are placed inside them.</description>
+    <iconPath>Genes/Icons/Egg</iconPath>
+    <displayOrderInCategory>52</displayOrderInCategory>
+    <biostatCpx>1</biostatCpx>
+    <biostatMet>-1</biostatMet>
+  </GeneDef>
+
+  <GeneDef ParentName="BreedingBase">
+    <defName>rjw_genes_insectbreeder</defName>
+    <label>insect breeder</label>
+    <description>Pawns with this gene are able to fertilize eggs with any fertile penis.</description>
+    <iconPath>Genes/Icons/Insect_Breeder</iconPath>
+    <displayOrderInCategory>53</displayOrderInCategory>
+    <biostatCpx>1</biostatCpx>
+    <biostatMet>-1</biostatMet>
+  </GeneDef>
+
+  <GeneDef ParentName="BreedingBase">
+    <defName>rjw_genes_fervent_ovipositor</defName>
+    <label>fervent ovipositor</label>
+    <geneClass>RJW_Genes.Gene_FerventOvipositor</geneClass>
+    <description>Pawns that have a female (egg producing) ovipositor produce eggs at drastically
+      increased speed.</description>
+    <iconPath>Genes/Icons/Fervent_Ovipositor</iconPath>
+    <displayOrderInCategory>55</displayOrderInCategory>
+    <biostatCpx>1</biostatCpx>
+    <biostatMet>-1</biostatMet>
+  </GeneDef>
+
+
+  <GeneDef ParentName="BreedingBase">
+    <defName>rjw_genes_mating_call</defName>
+    <label>Mating Call</label>
+    <description>This gene allows to call nearby animals and invite them for mating.</description>
+    <iconPath>Genes/Icons/RJW_Genes_Mating_Call</iconPath>
+    <displayOrderInCategory>65</displayOrderInCategory>
+    <abilities>
+      <li>rjw_genes_ability_mating_call</li>
+    </abilities>
+    <descriptionHyperlinks>
+      <AbilityDef>rjw_genes_ability_mating_call</AbilityDef>
+    </descriptionHyperlinks>
+    <biostatCpx>2</biostatCpx>
+    <biostatMet>-1</biostatMet>
+  </GeneDef>
+
+
+  <GeneDef ParentName="BreedingBase">
+    <defName>rjw_genes_pheromone_spit</defName>
+    <label>Pheromone Spit</label>
+    <description>This gene allows to mark targets for breeding, enticing nearby animals for a ride.</description>
+    <iconPath>Genes/Icons/RJW_Genes_PheromoneSpit</iconPath>
+    <displayOrderInCategory>66</displayOrderInCategory>
+    <abilities>
+      <li>rjw_genes_ability_pheromone_spit</li>
+    </abilities>
+    <descriptionHyperlinks>
+      <AbilityDef>rjw_genes_ability_pheromone_spit</AbilityDef>
+    </descriptionHyperlinks>
+    <biostatCpx>2</biostatCpx>
+    <biostatMet>-1</biostatMet>
   </GeneDef>
 
 </Defs>

Common/Defs/GeneDefs/GeneDefs_Cosmetic.xml

@@ -1,78 +1,117 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Defs>
-  <GeneDef Name="rjw_genes_wings" Abstract="True">
+	<GeneDef Name="rjw_genes_wings" Abstract="True">
-    <displayCategory>Miscellaneous</displayCategory>
+		<displayCategory>Miscellaneous</displayCategory>
-    <randomChosen>true</randomChosen>
+		<randomChosen>true</randomChosen>
-    <exclusionTags>
+		<exclusionTags>
-      <li>Wing</li>
+			<li>Wing</li>
-    </exclusionTags>
+		</exclusionTags>
-    <graphicData>
+	</GeneDef>
-      <drawLoc>Tailbone</drawLoc>
-    </graphicData>
-  </GeneDef>
 
-  <GeneDef ParentName="rjw_genes_wings">
+	<GeneDef ParentName="rjw_genes_wings">
-    <defName>rjw_genes_succubus_wings</defName>
+		<defName>rjw_genes_succubus_wings</defName>
-    <label>succubus wings</label>
+		<label>succubus wings</label>
-    <description>Carriers of this gene grow succubus wings.</description>
+		<description>Carriers of this gene grow succubus wings.</description>
-    <iconPath>Genes/Icons/Succubus_Wings</iconPath>
+		<iconPath>Genes/Icons/Succubus_Wings</iconPath>
-    <iconColor>(0.75, 0.75, 0.75)</iconColor>
+		<iconColor>(0.75, 0.75, 0.75)</iconColor>
-    <displayOrderInCategory>1000</displayOrderInCategory>
+		<displayOrderInCategory>1000</displayOrderInCategory>
-	<abilities>
+		<abilities>
-		 <li>rjw_genes_ability_flight</li>
+			<li>rjw_genes_ability_flight</li>
-	</abilities>
+		</abilities>
-	<descriptionHyperlinks>
+		<descriptionHyperlinks>
-		<AbilityDef>rjw_genes_ability_flight</AbilityDef>
+			<AbilityDef>rjw_genes_ability_flight</AbilityDef>
-	</descriptionHyperlinks>
+		</descriptionHyperlinks>
-    <biostatCpx>1</biostatCpx>
+		<biostatCpx>1</biostatCpx>
-	<biostatMet>-1</biostatMet>
+		<biostatMet>-1</biostatMet>
-    <graphicData>
+		<selectionWeight>0</selectionWeight>
-      <graphicPath>Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings/RJW_Genes_Succubus_Wings</graphicPath>
+		<renderNodeProperties>
-      <colorType>Skin</colorType>
+			<li>
-	    <drawScale>2</drawScale>
+				<workerClass>PawnRenderNodeWorker_AttachmentBody</workerClass>
-      <drawOffsetNorth>(0.0, 0.01, -0.1)</drawOffsetNorth>
+				<texPath>Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings</texPath>
-      <drawOffsetSouth>(0.0, 0.0, -0.1)</drawOffsetSouth>
+				<drawSize>1.5</drawSize>
-      <drawOffsetEast>(0.1, 0.0, 0.0)</drawOffsetEast>
+				<parentTagDef>Body</parentTagDef>
-    </graphicData>
+				<colorType>Skin</colorType>
+				<drawData>
+					<defaultData>
+						<layer>-2</layer>
+					</defaultData>
+					<scaleOffsetByBodySize>true</scaleOffsetByBodySize>
+					<dataNorth>
+						<layer>90</layer>
+					</dataNorth>
+				</drawData>
+			</li>
+		</renderNodeProperties>
 
-    <modExtensions>
+		<modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
+				Class="VanillaGenesExpanded.GeneExtension">
 				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
 				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
 			</li>
+			<li Class="RJW_Genes.QirkExtension">
+				<Satisfiedquirk>DemonLoverQuirk</Satisfiedquirk>
+			</li>
 		</modExtensions>
-  </GeneDef>
+	</GeneDef>
 
-   <GeneDef ParentName="GeneTailBase">
+	<GeneDef ParentName="GeneTailBase">
-    <defName>rjw_genes_succubus_tail</defName>
+		<defName>rjw_genes_succubus_tail</defName>
-    <label>succubus tail</label>
+		<label>succubus tail</label>
-    <description>Carriers of this gene grow a slender tail ending with a heart that can act as a dexterous fifth limb.</description>
+		<description>Carriers of this gene grow a slender tail ending with a heart that can act as a
-    <iconPath>Genes/Icons/Succubus_Tail</iconPath>
+			dexterous fifth limb.</description>
-    <iconColor>(1, 0, 0)</iconColor>
+		<iconPath>Genes/Icons/Succubus_Tail</iconPath>
-    <displayOrderInCategory>1000</displayOrderInCategory>
+		<iconColor>(1, 0, 0)</iconColor>
-    <capMods>
+		<displayOrderInCategory>1000</displayOrderInCategory>
-      <li>
+		<capMods>
-        <capacity>Manipulation</capacity>
+			<li>
-        <offset>0.05</offset>
+				<capacity>Manipulation</capacity>
-      </li>
+				<offset>0.05</offset>
-    </capMods>
+			</li>
-    <biostatCpx>1</biostatCpx>
+		</capMods>
-    <biostatMet>-1</biostatMet>
+		<biostatCpx>1</biostatCpx>
-    <graphicData>
+		<biostatMet>-1</biostatMet>
-      <graphicPath>Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail/RJW_Genes_Succubus_Tail</graphicPath>
+		<selectionWeight>0</selectionWeight>
-      <colorType>Skin</colorType>
+		<renderNodeProperties>
-	    <drawScale>2</drawScale>
+			<li>
-      <drawOffsetNorth>(0, 0.2, -0.1)</drawOffsetNorth>
+				<workerClass>PawnRenderNodeWorker_AttachmentBody</workerClass>
-      <drawOffsetSouth>(0, -0.1, 0.1)</drawOffsetSouth>
+				<texPath>Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail</texPath>
-      <drawOffsetEast>(0.2, 0.2, 0.1)</drawOffsetEast>
+				<overrideMeshSize>(1.5, 1.5)</overrideMeshSize>
-    </graphicData>
+				<parentTagDef>Body</parentTagDef>
-	  <randomChosen>true</randomChosen>
+				<colorType>Skin</colorType>
+				<rotDrawMode>Fresh, Rotting</rotDrawMode>
+				<drawData>
+					<scaleOffsetByBodySize>true</scaleOffsetByBodySize>
+					<defaultData>
+						<layer>-2</layer>
+					</defaultData>
+					<dataNorth>
+						<offset>(0, 0, -0.15)</offset>
+						<layer>90</layer>
+					</dataNorth>
+					<dataSouth>
+						<offset>(-0, 0, -0.15)</offset>
+					</dataSouth>
+					<dataEast>
+						<offset>(-0.2, 0, -0.15)</offset>
+					</dataEast>
+					<dataWest>
+						<offset>(0.2, 0, -0.15)</offset>
+					</dataWest>
+				</drawData>
+			</li>
+		</renderNodeProperties>
+		<randomChosen>true</randomChosen>
 
-    <modExtensions>
+		<modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
+				Class="VanillaGenesExpanded.GeneExtension">
 				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
 				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
 			</li>
+			<li Class="RJW_Genes.QirkExtension">
+				<Satisfiedquirk>DemonLoverQuirk</Satisfiedquirk>
+			</li>
 		</modExtensions>
-  </GeneDef>
+	</GeneDef>
 </Defs>

Common/Defs/GeneDefs/GeneDefs_Cum.xml

@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Defs>
-    <GeneDef Name="GeneCumAmount" Abstract="True">
+  <GeneDef Name="GeneCumAmount" Abstract="True">
-      <displayCategory>rjw_genes_cum</displayCategory>
+    <displayCategory>rjw_genes_cum</displayCategory>
-      <exclusionTags>
+    <exclusionTags>
-          <li>CumAmount</li>
+      <li>CumAmount</li>
-      </exclusionTags>  
+    </exclusionTags>
-        
+    <randomChosen>false</randomChosen>
-      <modExtensions>
+    <modExtensions>
-        <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+      <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
-          <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+        Class="VanillaGenesExpanded.GeneExtension">
-          <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+        <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-        </li>
+        <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-      </modExtensions>
+      </li>
-    </GeneDef>
+    </modExtensions>
+  </GeneDef>
 
   <!-- Penis -->
   <GeneDef ParentName="GeneCumAmount">
     <defName>rjw_genes_no_cum</defName>
-    <label>No Cum</label>
+    <label>no cum</label>
     <description>Males of these species have no fluid.</description>
     <iconPath>Genes/Icons/No_Cum</iconPath>
     <geneClass>RJW_Genes.Gene_NoCum</geneClass>
@@ -28,7 +29,7 @@
 
   <GeneDef ParentName="GeneCumAmount">
     <defName>rjw_genes_much_cum</defName>
-    <label>Much Cum</label>
+    <label>much cum</label>
     <description>Males of this species produce a lot of fluid.</description>
     <iconPath>Genes/Icons/Much_Cum</iconPath>
     <geneClass>RJW_Genes.Gene_MuchCum</geneClass>
@@ -39,8 +40,9 @@
 
   <GeneDef ParentName="GeneCumAmount">
     <defName>rjw_genes_very_much_cum</defName>
-    <label>Very Much Cum</label>
+    <label>very much cum</label>
-    <description>Males of this species produce a whole lot of fluid. They are like fountains basically.</description>
+    <description>Males of this species produce a whole lot of fluid. They are like fountains
+      basically.</description>
     <iconPath>Genes/Icons/Very_Much_Cum</iconPath>
     <geneClass>RJW_Genes.Gene_VeryMuchCum</geneClass>
     <displayOrderInCategory>535</displayOrderInCategory>
@@ -48,64 +50,4 @@
     <biostatMet>-2</biostatMet>
   </GeneDef>
 
-  <GeneDef MayRequire="LustLicentia.RJWLabs">
-    <defName>rjw_genes_likes_cumflation</defName>
-    <label>Likes Cumflation</label>
-    <displayCategory>rjw_genes_cum</displayCategory>
-    <description>This Xenotype loves being cumflated.</description>
-    <iconPath>Genes/Icons/Cumflation</iconPath>
-    <displayOrderInCategory>536</displayOrderInCategory>
-    <forcedTraits>
-      <li>
-        <def>LikesCumflation</def>
-      </li>
-    </forcedTraits>
-    <exclusionTags>
-        <li>NotCumflatable</li>
-    </exclusionTags>
-    
-    <modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-			</li>
-		</modExtensions>
-  </GeneDef>
-
-  <GeneDef MayRequire="LustLicentia.RJWLabs">
-    <defName>rjw_genes_cumflation_immunity</defName>
-    <label>Cumflation Immunity</label>
-    <displayCategory>rjw_genes_cum</displayCategory>
-    <description>This Xenotype cannot get cumflated.</description>
-    <iconPath>Genes/Icons/Cumflation_Immunity</iconPath>
-    <displayOrderInCategory>537</displayOrderInCategory>
-    <exclusionTags>
-        <li>NotCumflatable</li>
-    </exclusionTags>
-    
-    <modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-			</li>
-		</modExtensions>
-  </GeneDef>
-
-
-  <GeneDef MayRequire="LustLicentia.RJWLabs">
-    <defName>rjw_genes_generous_donor</defName>
-    <label>Generous Donor</label>
-    <displayCategory>rjw_genes_cum</displayCategory>
-    <description>When this Xenotype transfers nutrition via cumshot, the giver will not get hungry. (Licentia Configuration for Transfer Nutrition must be enabled).</description>
-    <iconPath>Genes/Icons/Generous_Donor</iconPath>
-    <displayOrderInCategory>538</displayOrderInCategory>
-    
-    <modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-			</li>
-		</modExtensions>
-  </GeneDef>
-
 </Defs>

Common/Defs/GeneDefs/GeneDefs_Damage.xml

@@ -1,30 +1,12 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Defs>
 
-  <GeneDef MayRequire="LustLicentia.RJWLabs">
+  <GeneDef>
-    <defName>rjw_genes_elasticity</defName>
-    <label>Elasticity</label>
-    <displayCategory>rjw_genes_damage</displayCategory>
-    <description>This Xenotype cannot get stretched by huge penetrators.</description>
-    <iconPath>Genes/Icons/Elasticity</iconPath>
-    <geneClass>RJW_Genes.Gene_Elasticity</geneClass>
-    <biostatMet>-1</biostatMet>
-    <biostatCpx>1</biostatCpx>
-    <displayOrderInCategory>1</displayOrderInCategory>
-    
-    <modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-			</li>
-		</modExtensions>
-  </GeneDef>
-
-  <GeneDef >
     <defName>rjw_genes_unbreakable</defName>
-    <label>Unbreakable</label>
+    <label>unbreakable</label>
     <displayCategory>rjw_genes_damage</displayCategory>
-    <description>This Gene makes the Carrier unable to get mood or social penalties from being raped and they cannot be broken for a long period of time.</description>
+    <description>This Gene makes the Carrier unable to get mood or social penalties from being raped
+      and they cannot be broken for a long period of time.</description>
     <iconPath>UI/Icons/Rituals/TrialDefend</iconPath>
     <displayOrderInCategory>2</displayOrderInCategory>
     <biostatMet>-1</biostatMet>
@@ -36,11 +18,12 @@
     </hediffGiversCannotGive>
 
     <modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+      <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+        Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+        <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-			</li>
+        <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-		</modExtensions>
+      </li>
+    </modExtensions>
   </GeneDef>
 
 </Defs>

Common/Defs/GeneDefs/GeneDefs_ExtraGenitalia.xml

@@ -1,19 +1,22 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Defs>
   <GeneDef Name="GeneExtraGenitaliaBase" Abstract="True">
-    <displayCategory>rjw_genes_genitalia_extras</displayCategory>
 
+    <randomChosen>false</randomChosen>
     <modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+      <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+        Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+        <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-			</li>
+        <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-		</modExtensions>
+      </li>
+    </modExtensions>
   </GeneDef>
 
   <GeneDef ParentName="GeneExtraGenitaliaBase">
     <defName>rjw_genes_extra_penis</defName>
     <label>extra penis</label>
+    <displayCategory>rjw_genes_genitalia_extras</displayCategory>
+
     <description>Males of this species grow an additional penis .</description>
     <iconPath>Genes/Icons/extra_male</iconPath>
     <geneClass>RJW_Genes.Gene_ExtraPenis</geneClass>
@@ -26,6 +29,7 @@
   <GeneDef ParentName="GeneExtraGenitaliaBase">
     <defName>rjw_genes_no_penis</defName>
     <label>no penis</label>
+    <displayCategory>rjw_genes_genitalia_extras</displayCategory>
     <description>Males of this do not have a penis.</description>
     <iconPath>Genes/Icons/No_Male_Genitalia</iconPath>
     <geneClass>RJW_Genes.Gene_NoPenis</geneClass>
@@ -39,6 +43,7 @@
   <GeneDef ParentName="GeneExtraGenitaliaBase">
     <defName>rjw_genes_extra_vagina</defName>
     <label>extra vagina</label>
+    <displayCategory>rjw_genes_genitalia_extras</displayCategory>
     <description>Females of this species grow an additional vagina .</description>
     <iconPath>Genes/Icons/Extra_Vagina</iconPath>
     <geneClass>RJW_Genes.Gene_ExtraVagina</geneClass>
@@ -51,6 +56,7 @@
   <GeneDef ParentName="GeneExtraGenitaliaBase">
     <defName>rjw_genes_no_vagina</defName>
     <label>no vagina</label>
+    <displayCategory>rjw_genes_genitalia_extras</displayCategory>
     <description>Females of this do not have a vagina.</description>
     <iconPath>Genes/Icons/No_Vagina</iconPath>
     <geneClass>RJW_Genes.Gene_NoVagina</geneClass>
@@ -64,6 +70,7 @@
   <GeneDef ParentName="GeneExtraGenitaliaBase">
     <defName>rjw_genes_extra_breasts</defName>
     <label>extra breasts</label>
+    <displayCategory>rjw_genes_genitalia_extras</displayCategory>
     <description>Females of this species grow an additional pair of breasts .</description>
     <iconPath>Genes/Icons/Extra_Breasts</iconPath>
     <geneClass>RJW_Genes.Gene_ExtraBreasts</geneClass>
@@ -76,6 +83,7 @@
   <GeneDef ParentName="GeneExtraGenitaliaBase">
     <defName>rjw_genes_no_breasts</defName>
     <label>no breasts</label>
+    <displayCategory>rjw_genes_genitalia_extras</displayCategory>
     <description>Females of this do not have a pair of breasts, but only nipples.</description>
     <iconPath>Genes/Icons/No_Breasts</iconPath>
     <geneClass>RJW_Genes.Gene_NoBreasts</geneClass>
@@ -88,6 +96,7 @@
   <GeneDef ParentName="GeneExtraGenitaliaBase">
     <defName>rjw_genes_extra_anus</defName>
     <label>extra anus</label>
+    <displayCategory>rjw_genes_genitalia_extras</displayCategory>
     <description>This specias has an extra anus.</description>
     <iconPath>Genes/Icons/Extra_Anus</iconPath>
     <geneClass>RJW_Genes.Gene_ExtraAnus</geneClass>
@@ -100,6 +109,7 @@
   <GeneDef ParentName="GeneExtraGenitaliaBase">
     <defName>rjw_genes_no_anus</defName>
     <label>no anus</label>
+    <displayCategory>rjw_genes_genitalia_extras</displayCategory>
     <description>This specias has no anus.</description>
     <iconPath>Genes/Icons/No_Anus</iconPath>
     <geneClass>RJW_Genes.Gene_NoAnus</geneClass>
@@ -109,22 +119,39 @@
     </exclusionTags>
   </GeneDef>
 
-    <GeneDef ParentName="GeneExtraGenitaliaBase">
+  <GeneDef ParentName="GeneExtraGenitaliaBase">
-	    <defName>rjw_genes_futa</defName>
+    <defName>rjw_genes_futa</defName>
-	    <label>futanari</label>
+    <label>futanari</label>
-	    <description>Males with this gene grow additional female genitalia, females grow additional male genitalia.</description>
+    <displayCategory>rjw_genes_gender</displayCategory>
-	    <iconPath>Genes/Icons/Futa</iconPath>
+    <description>Males with this gene grow additional female genitalia, females grow additional male
-	    <geneClass>RJW_Genes.Gene_Futa</geneClass>
+      genitalia.</description>
-	    <displayOrderInCategory>709</displayOrderInCategory>
+    <iconPath>Genes/Icons/Futa</iconPath>
-	    <exclusionTags>
+    <geneClass>RJW_Genes.Gene_Futa</geneClass>
-		    <li>PenisAmount</li>
+    <displayOrderInCategory>709</displayOrderInCategory>
-		    <li>VaginaAmount</li>
+    <exclusionTags>
-	    </exclusionTags>
+      <li>PenisAmount</li>
-    </GeneDef>
+      <li>VaginaAmount</li>
+    </exclusionTags>
+  </GeneDef>
+
+  <GeneDef ParentName="GeneExtraGenitaliaBase">
+    <defName>rjw_genes_femboy</defName>
+    <label>femboy</label>
+    <displayCategory>rjw_genes_gender</displayCategory>
+    <description>Males with this gene are considered female despite having a penis</description>
+    <iconPath>Genes/Icons/Futa</iconPath>
+    <geneClass>RJW_Genes.Gene_Femboy</geneClass>
+    <displayOrderInCategory>709</displayOrderInCategory>
+    <exclusionTags>
+      <li>PenisAmount</li>
+      <li>VaginaAmount</li>
+    </exclusionTags>
+  </GeneDef>
 
   <GeneDef ParentName="GeneExtraGenitaliaBase">
     <defName>rjw_genes_featureless_chest</defName>
-    <label>Featureless Chest</label>
+    <displayCategory>rjw_genes_genitalia_extras</displayCategory>
+    <label>featureless chest</label>
     <description>Carriers of this gene do not have breasts or nipples.</description>
     <iconPath>Genes/Icons/No_Breasts</iconPath>
     <geneClass>RJW_Genes.Gene_FeaturelessChest</geneClass>
@@ -133,19 +160,18 @@
       <li>BreastAmount</li>
     </exclusionTags>
   </GeneDef>
-  <!-- 
-  See Comment in `RJW_Genes.Gene_UdderBreasts` why this is currently commented out.
 
   <GeneDef ParentName="GeneExtraGenitaliaBase">
     <defName>rjw_genes_udder</defName>
     <label>udder</label>
-    <description>Carriers of this gene have udders instead of breasts.</description>
+    <displayCategory>rjw_genes_genitalia_extras</displayCategory>
-    <iconPath>Things/Mote/Heart</iconPath>
+    <description>Carriers of this gene have udders and breasts.</description>
+    <iconPath>Genes/Icons/RJW_Genes_Udder</iconPath>
     <geneClass>RJW_Genes.Gene_UdderBreasts</geneClass>
     <displayOrderInCategory>711</displayOrderInCategory>
     <exclusionTags>
       <li>BreastAmount</li>
     </exclusionTags>
   </GeneDef>
-  -->
+
 </Defs>

Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml

@@ -15,7 +15,7 @@
   <!-- Penis -->
   <GeneDef ParentName="GeneGenitaliaSizeBase">
     <defName>rjw_genes_big_male_genitalia</defName>
-    <label>Big Male Genitaliasize</label>
+    <label>big male genitalia</label>
     <description>Penises of this Xenotype are bigger.(Resizing takes place at 20th Birthday)</description>
     <iconPath>Genes/Icons/Big_Male_Genitalia</iconPath>
     <geneClass>RJW_Genes.Gene_BigMaleGenitalia</geneClass>
@@ -27,7 +27,7 @@
 
   <GeneDef ParentName="GeneGenitaliaSizeBase">
     <defName>rjw_genes_small_male_genitalia</defName>
-    <label>Small Male Genitaliasize</label>
+    <label>small male genitalia</label>
     <description>Penises of this Xenotype are smaller. (Resizing takes place at 20th Birthday)</description>
     <iconPath>Genes/Icons/Small_Male_Genitalia</iconPath>
     <geneClass>RJW_Genes.Gene_SmallMaleGenitalia</geneClass>
@@ -40,7 +40,7 @@
   <!-- Vagina -->
   <GeneDef ParentName="GeneGenitaliaSizeBase">
     <defName>rjw_genes_loose_female_genitalia</defName>
-    <label>Loose Female Genitalia</label>
+    <label>loose female genitalia</label>
     <description>Vaginas of this Xenotype are quite spacy. (Resizing takes place at 20th Birthday)</description>
     <iconPath>Genes/Icons/Loose_Vagina</iconPath>
     <geneClass>RJW_Genes.Gene_LooseFemaleGenitalia</geneClass>
@@ -52,7 +52,7 @@
 
   <GeneDef ParentName="GeneGenitaliaSizeBase">
     <defName>rjw_genes_tight_female_genitalia</defName>
-    <label>Tight Female Genitalia</label>
+    <label>tight female genitalia</label>
     <description>Vaginas of this Xenotype are pretty tight.(Resizing takes place at 20th Birthday)</description>
     <iconPath>Genes/Icons/Tight_Vagina</iconPath>
     <geneClass>RJW_Genes.Gene_TightFemaleGenitalia</geneClass>
@@ -65,7 +65,7 @@
   <!-- Breasts -->
   <GeneDef ParentName="GeneGenitaliaSizeBase">
     <defName>rjw_genes_big_breasts</defName>
-    <label>Big Breasts</label>
+    <label>big breasts</label>
     <description>Females of this Xenotype have big honkers.(Resizing takes place at 20th Birthday)</description>
     <iconPath>Genes/Icons/Big_Breasts</iconPath>
     <geneClass>RJW_Genes.Gene_BigBreasts</geneClass>
@@ -77,7 +77,7 @@
 
   <GeneDef ParentName="GeneGenitaliaSizeBase">
     <defName>rjw_genes_small_breasts</defName>
-    <label>Small Breasts</label>
+    <label>small breasts</label>
     <description>Females of this Xenotype have smaller breasts.(Resizing takes place at 20th Birthday)</description>
     <iconPath>Genes/Icons/Small_Breasts</iconPath>
     <geneClass>RJW_Genes.Gene_SmallBreasts</geneClass>
@@ -90,7 +90,7 @@
   <!-- Anus -->
   <GeneDef ParentName="GeneGenitaliaSizeBase">
     <defName>rjw_genes_loose_anus</defName>
-    <label>Loose Anus</label>
+    <label>loose anus</label>
     <description>The Anus of this Xenotype is roomy.(Resizing takes place at 20th Birthday)</description>
     <iconPath>Genes/Icons/Loose_Anus</iconPath>
     <geneClass>RJW_Genes.Gene_LooseAnus</geneClass>
@@ -102,7 +102,7 @@
 
   <GeneDef ParentName="GeneGenitaliaSizeBase">
     <defName>rjw_genes_tight_anus</defName>
-    <label>Tight Anus</label>
+    <label>tight anus</label>
     <description>The anus of this Xenotype is small.(Resizing takes place at 20th Birthday)</description>
     <iconPath>Genes/Icons/Tight_Anus</iconPath>
     <geneClass>RJW_Genes.Gene_TightAnus</geneClass>
@@ -116,7 +116,7 @@
   
   <GeneDef ParentName="GeneGenitaliaSizeBase">
     <defName>rjw_genes_evergrowth</defName>
-    <label>Evergrowth</label>
+    <label>evergrowth</label>
     <description>One of the most regretted gene-modifications in the Glitterworlds: The (primary) genitalia will continue growing forever. This affects size and fluid output. Excessive growth can also effect mental stability! (Resizing takes place at 20th Birthday)</description>
     <iconPath>Genes/Icons/Big_Male_Genitalia</iconPath>
     <geneClass>RJW_Genes.Gene_EvergrowingGenitalia</geneClass>

Common/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml

@@ -1,27 +1,52 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Defs>
 
   <GeneDef Name="GeneGenitalTypeBase" Abstract="True">
     <displayCategory>rjw_genes_genitalia_type</displayCategory>
+    <geneClass>RJW_Genes.Gene_GenitaliaType</geneClass>
     <exclusionTags>
       <li>GenitalType</li>
     </exclusionTags>
+    <randomChosen>true</randomChosen>
     <biostatCpx>0</biostatCpx>
-    
     <modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+      <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+        Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+        <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-			</li>
+        <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-		</modExtensions>
+      </li>
+    </modExtensions>
   </GeneDef>
 
+
   <GeneDef ParentName="GeneGenitalTypeBase">
     <defName>rjw_genes_equine_genitalia</defName>
     <label>equine genitalia</label>
     <description>Carriers of this gene develop equine genitalia.</description>
     <iconPath>Genes/Icons/Genitalia_Equine</iconPath>
-    <geneClass>RJW_Genes.Gene_EquineGenitalia</geneClass>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>HorsePenis</penis>
+        <vagina>HorseVagina</vagina>
+        <anus>GenericAnus</anus>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>802</displayOrderInCategory>
+  </GeneDef>
+
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_human_genitalia</defName>
+    <label>human genitalia</label>
+    <description>Carriers of this gene develop human genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_human</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>Penis</penis>
+        <vagina>Vagina</vagina>
+        <anus>Anus</anus>
+        <breasts>Breasts</breasts>
+      </li>
+    </modExtensions>
     <displayOrderInCategory>802</displayOrderInCategory>
   </GeneDef>
 
@@ -30,7 +55,13 @@
     <label>canine genitalia</label>
     <description>Carriers of this gene develop canine genitalia.</description>
     <iconPath>Genes/Icons/Genitalia_Canine</iconPath>
-    <geneClass>RJW_Genes.Gene_CanineGenitalia</geneClass>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>DogPenis</penis>
+        <vagina>DogVagina</vagina>
+        <anus>GenericAnus</anus>
+      </li>
+    </modExtensions>
     <displayOrderInCategory>803</displayOrderInCategory>
   </GeneDef>
 
@@ -38,8 +69,14 @@
     <defName>rjw_genes_feline_genitalia</defName>
     <label>feline genitalia</label>
     <description>Carriers of this gene develop feline genitalia.</description>
-    <iconPath>Genes/Icons/Genitalia_Feline</iconPath>
+    <iconPath>Genes/Icons/RJW_Genes_Feline_Genitalia</iconPath>
-    <geneClass>RJW_Genes.Gene_FelineGenitalia</geneClass>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>CatPenis</penis>
+        <vagina>CatVagina</vagina>
+        <anus>GenericAnus</anus>
+      </li>
+    </modExtensions>
     <displayOrderInCategory>804</displayOrderInCategory>
   </GeneDef>
 
@@ -48,7 +85,16 @@
     <label>demonic genitalia</label>
     <description>Carriers of this gene have demonic genitalia.</description>
     <iconPath>Genes/Icons/Genitalia_Demon</iconPath>
-    <geneClass>RJW_Genes.Gene_DemonicGenitalia</geneClass>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>DemonPenis</penis>
+        <vagina>DemonVagina</vagina>
+        <anus>DemonAnus</anus>
+      </li>
+      <li Class="RJW_Genes.QirkExtension">
+        <Satisfiedquirk>DemonLoverQuirk</Satisfiedquirk>
+      </li>
+    </modExtensions>
     <displayOrderInCategory>805</displayOrderInCategory>
   </GeneDef>
 
@@ -57,7 +103,16 @@
     <label>dragon genitalia</label>
     <description>Carriers of this gene develop dragon genitalia.</description>
     <iconPath>Genes/Icons/Genitalia_Draconic</iconPath>
-    <geneClass>RJW_Genes.Gene_DragonGenitalia</geneClass>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>DragonPenis</penis>
+        <vagina>DragonVagina</vagina>
+        <anus>GenericAnus</anus>
+      </li>
+      <li Class="RJW_Genes.QirkExtension">
+        <Satisfiedquirk>ScaleLoverQuirk</Satisfiedquirk>
+      </li>
+    </modExtensions>
     <displayOrderInCategory>806</displayOrderInCategory>
   </GeneDef>
 
@@ -66,7 +121,197 @@
     <label>slime genitalia</label>
     <description>Carriers of this gene have slime genitalia.</description>
     <iconPath>Genes/Icons/Slime_Genitalia</iconPath>
-    <geneClass>RJW_Genes.Gene_SlimeGenitalia</geneClass>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>SlimeTentacles</penis>
+        <vagina>SlimeVagina</vagina>
+        <anus>SlimeAnus</anus>
+        <breasts>SlimeBreasts</breasts>
+      </li>
+      <li Class="RJW_Genes.QirkExtension">
+        <Satisfiedquirk>SlimeLoverQuirk</Satisfiedquirk>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>
+
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_demonicT_genitalia</defName>
+    <label>demonic tentacle genitalia</label>
+    <description>Carriers of this gene have demonic tentacle genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_tentacle_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>DemonTentaclePenis</penis>
+        <vagina>DemonVagina</vagina>
+        <anus>DemonAnus</anus>
+      </li>
+      <li Class="RJW_Genes.QirkExtension">
+        <Satisfiedquirk>DemonLoverQuirk</Satisfiedquirk>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>
+
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_crocodilian_genitalia</defName>
+    <label>crocodilian genitalia</label>
+    <description>Carriers of this gene have crocodilian genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_croc_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>CrocodilianPenis</penis>
+      </li>
+      <li Class="RJW_Genes.QirkExtension">
+        <Satisfiedquirk>ScaleLoverQuirk</Satisfiedquirk>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>
+
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_racoon_genitalia</defName>
+    <label>racoon genitalia</label>
+    <description>Carriers of this gene have racoon genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_racoon_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>RaccoonPenis</penis>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>
+
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_reptilian_genitalia</defName>
+    <label>reptilian genitalia</label>
+    <description>Carriers of this gene have reptilian genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_hemi_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>HemiPenis</penis>
+      </li>
+      <li Class="RJW_Genes.QirkExtension">
+        <Satisfiedquirk>ScaleLoverQuirk</Satisfiedquirk>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>
+
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_Ghost_genitalia</defName>
+    <label>ghost genitalia</label>
+    <description>Carriers of this gene have ghost genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_ghost_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>GhostPenis</penis>
+        <vagina>GhostVagina</vagina>
+      </li>
+      <li Class="RJW_Genes.QirkExtension">
+        <Satisfiedquirk>TeratophileQuirk</Satisfiedquirk>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>
+
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_Golem_genitalia</defName>
+    <label>golem genitalia</label>
+    <description>Carriers of this gene have rocky golem genitalia.</description>
+    <iconPath>Genes/Icons/penis_rock_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>GolemPenis</penis>
+      </li>
+      <li Class="RJW_Genes.QirkExtension">
+        <Satisfiedquirk>TeratophileQuirk</Satisfiedquirk>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>
+
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_Marine_genitalia</defName>
+    <label>marine genitalia</label>
+    <description>Carriers of this gene have marine mammal like genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_marine_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>MarinePenis</penis>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>
+
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_Necro_genitalia</defName>
+    <label>undead genitalia</label>
+    <description>Carriers of this gene have necrotic undead genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_necro_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>NecroPenis</penis>
+      </li>
+      <li Class="RJW_Genes.QirkExtension">
+        <Satisfiedquirk>TeratophileQuirk</Satisfiedquirk>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>
+
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_Needle_genitalia</defName>
+    <label>narrow genitalia</label>
+    <description>Carriers of this gene have very thin genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_thin_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>NeedlePenis</penis>
+        <vagina>NarrowVagina</vagina>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>
+
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_Orc_genitalia</defName>
+    <label>orc genitalia</label>
+    <description>Carriers of this gene have orc genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_orc_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>OrcPenis</penis>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>
+
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_Pig_genitalia</defName>
+    <label>screw genitalia</label>
+    <description>Carriers of this gene have screw genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_screw_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>PigPenis</penis>
+      </li>
+    </modExtensions>
+  </GeneDef>
+
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_Tentacle_genitalia</defName>
+    <label>alien genitalia</label>
+    <description>Carriers of this gene have alien genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_alien_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>TentaclePenis</penis>
+      </li>
+      <li Class="RJW_Genes.QirkExtension">
+        <Satisfiedquirk>TeratophileQuirk</Satisfiedquirk>
+      </li>
+    </modExtensions>
     <displayOrderInCategory>807</displayOrderInCategory>
   </GeneDef>
 
@@ -75,15 +320,21 @@
     <label>insect genitalia</label>
     <description>Carriers of this gene have ovipositors similar to insects.</description>
     <iconPath>Genes/Icons/Ovipositor_Genitalia</iconPath>
-    <geneClass>RJW_Genes.Gene_OvipositorGenitalia</geneClass>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>OvipositorM</penis>
+        <vagina>OvipositorF</vagina>
+        <anus>InsectAnus</anus>
+      </li>
+      <li Class="RJW_Genes.QirkExtension">
+        <Satisfiedquirk>ChitinLoverQuirk</Satisfiedquirk>
+      </li>
+    </modExtensions>
     <displayOrderInCategory>808</displayOrderInCategory>
-
     <exclusionTags>
-			<li>Egglaying</li>
+      <li>Egglaying</li>
-			<li>AG_Egglaying</li>
+      <li>AG_Egglaying</li>
-		</exclusionTags>
+    </exclusionTags>
-    
   </GeneDef>
 
-
 </Defs>

Common/Defs/GeneDefs/GeneDefs_Hive.xml

@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-	<GeneDef Name="HiveBase" Abstract="True">
-		<displayCategory>rjw_genes_hive</displayCategory>
-		
-		<modExtensions>
-				<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-					<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-					<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-				</li>
-			</modExtensions>
-	</GeneDef>
-
-	<GeneDef ParentName="HiveBase">
-		<defName>rjw_genes_queen</defName>
-		<label>Hive Queen</label>
-		<labelShortAdj>queen</labelShortAdj>
-		<description>This gene represents the royal caste amongst its xenotype. Children of a queen are usually born as sterile workers, unless the father was a drone. Having multiple (adult) queens leads to intense rivalry and can throw the whole colony into chaos!</description>
-		<iconPath>Genes/Icons/Queen</iconPath>
-		<displayOrderInCategory>1</displayOrderInCategory>
-
-		<statOffsets>
-			<PsychicSensitivity>0.5</PsychicSensitivity>
-			<MeditationFocusGain>0.25</MeditationFocusGain>
-		</statOffsets>
-
-		
-		<conditionalStatAffecters>
-			<li Class="RJW_Genes.ConditionalStatAffecter_MultipleQueens">
-				<statFactors>
-					<MoveSpeed>0.7</MoveSpeed>
-				</statFactors>
-				<statOffsets>
-					<WorkSpeedGlobal>-0.5</WorkSpeedGlobal>
-				</statOffsets>
-			</li>
-			<li Class="RJW_Genes.ConditionalStatAffecter_QueenCloseBy">
-				<statFactors>
-					<MoveSpeed>0.4</MoveSpeed>
-					<WorkSpeedGlobal>0.2</WorkSpeedGlobal>
-				</statFactors>
-			</li>
-		</conditionalStatAffecters>
-
-		<exclusionTags>
-			<li>rjw_genes_hive_caste</li>
-			<li>rjw_genes_swearing_loyalty</li>
-		</exclusionTags>
-
-		<biostatCpx>7</biostatCpx>
-		<biostatMet>-3</biostatMet>
-	</GeneDef>
-
-	<GeneDef ParentName="HiveBase">
-		<defName>rjw_genes_drone</defName>
-		<label>Hive Drone</label>
-		<labelShortAdj>drone</labelShortAdj>
-		<description>This gene represents the drone caste amongst its xenotype. Drones are highly specialised experts that ensure the hives functioning. Other than that, drones are the only xenotypes capable of producing fertile offspring with a queen.</description>
-		<iconPath>Genes/Icons/Drone</iconPath>
-		<displayOrderInCategory>2</displayOrderInCategory>
-
-		<exclusionTags>
-			<li>rjw_genes_hive_caste</li>
-		</exclusionTags>
-
-		<conditionalStatAffecters>
-			<li Class="RJW_Genes.ConditionalStatAffecter_QueenAbsent">
-				<statFactors>
-					<MoveSpeed>0.9</MoveSpeed>
-				</statFactors>
-				<statOffsets>
-					<WorkSpeedGlobal>-0.1</WorkSpeedGlobal>
-				</statOffsets>
-			</li>
-		</conditionalStatAffecters>
-
-		<biostatCpx>4</biostatCpx>
-		<biostatMet>-2</biostatMet>
-	</GeneDef>
-
-
-	<GeneDef ParentName="HiveBase">
-		<defName>rjw_genes_worker</defName>
-		<label>Hive Worker</label>
-		<labelShortAdj>worker</labelShortAdj>
-		<description>This gene marks the lowest caste of a hive, the workers. Usually sterile, they are despised by higher castes and only live to serve with labour.</description>
-		<iconPath>Genes/Icons/Worker</iconPath>
-		<displayOrderInCategory>3</displayOrderInCategory>
-
-		<exclusionTags>
-			<li>rjw_genes_hive_caste</li>
-		</exclusionTags>
-
-		<conditionalStatAffecters>
-			<li Class="RJW_Genes.ConditionalStatAffecter_QueenAbsent">
-				<statFactors>
-					<MoveSpeed>0.7</MoveSpeed>
-				</statFactors>
-				<statOffsets>
-					<WorkSpeedGlobal>-0.5</WorkSpeedGlobal>
-				</statOffsets>
-			</li>
-			<li Class="RJW_Genes.ConditionalStatAffecter_MultipleQueens">
-				<statFactors>
-					<MoveSpeed>0.7</MoveSpeed>
-				</statFactors>
-				<statOffsets>
-					<WorkSpeedGlobal>-0.5</WorkSpeedGlobal>
-				</statOffsets>
-			</li>
-			<li Class="RJW_Genes.ConditionalStatAffecter_QueenCloseBy">
-				<statFactors>
-					<MoveSpeed>1.2</MoveSpeed>
-					<WorkSpeedGlobal>1.2</WorkSpeedGlobal>
-				</statFactors>
-			</li>
-		</conditionalStatAffecters>
-
-		<biostatCpx>1</biostatCpx>
-		<biostatMet>0</biostatMet>
-	</GeneDef>
-
-	<GeneDef ParentName="HiveBase">
-		<defName>rjw_genes_zealous_loyalty</defName>
-		<label>Zealous Loyalty</label>
-		<labelShortAdj>loyalty</labelShortAdj>
-		<description>Carriers of this gene are genetically wired to worship carriers of the 'Queen'-gene. They receive a massive relation-ship bonus towards the queen and a slight mood bonus. Having multiple queens in the colony causes severe distress.</description>
-		<iconPath>Genes/Icons/Loyalty</iconPath>
-		<displayOrderInCategory>10</displayOrderInCategory>
-		
-		<exclusionTags>
-			<li>rjw_genes_swearing_loyalty</li>
-		</exclusionTags>
-
-		<biostatCpx>1</biostatCpx>
-		<biostatMet>-1</biostatMet>
-
-		<modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-			</li>
-		</modExtensions>
-	</GeneDef>
-
-	<GeneDef ParentName="HiveBase">
-		<defName>rjw_genes_cocoonweaver</defName>
-		<label>Cocoon Weaver</label>
-		<labelShortAdj>cocooner</labelShortAdj>
-		<description>Carriers of this gene can produce a cocoon to prepare helpless (or willing) victims for breeding.</description>
-		<iconPath>Genes/Icons/Cocoon</iconPath>
-		<displayOrderInCategory>11</displayOrderInCategory>
-		<abilities>
-			<li>rjw_genes_ability_cocoonweaver</li>
-		</abilities>
-		<descriptionHyperlinks>
-			<AbilityDef>rjw_genes_ability_cocoonweaver</AbilityDef>
-		</descriptionHyperlinks>
-		<biostatCpx>1</biostatCpx>
-		<biostatMet>-1</biostatMet>
-	</GeneDef>
-	
-	<GeneDef ParentName="HiveBase">
-		<defName>rjw_genes_spawn_spelopede</defName>
-		<label>Spelopede Dispenser</label>
-		<labelShortAdj>spelopede</labelShortAdj>
-		<description>Carriers of this gene can generate tame spelopedes. Higher psychic-sensitivity will spawn more spelopedes.</description>
-		<iconPath>Genes/Icons/Spelopede_Dispenser</iconPath>
-		<displayOrderInCategory>12</displayOrderInCategory>
-		<abilities>
-			<li>rjw_genes_ability_spawn_spelopede</li>
-		</abilities>
-		<descriptionHyperlinks>
-			<AbilityDef>rjw_genes_ability_spawn_spelopede</AbilityDef>
-		</descriptionHyperlinks>
-		<biostatCpx>1</biostatCpx>
-		<biostatMet>-1</biostatMet>
-	</GeneDef>
-
-	
-  <GeneDef ParentName="HiveBase">
-    <defName>rjw_genes_insectincubator</defName>
-    <label>Insect Incubator</label>	
-	<geneClass>RJW_Genes.Gene_InsectIncubator</geneClass>
-    <description>Pawns with this gene are able to hold more insect eggs.</description>
-    <iconPath>Genes/Icons/Egg</iconPath>
-    <displayOrderInCategory>52</displayOrderInCategory>
-    <biostatCpx>1</biostatCpx>
-    <biostatMet>-1</biostatMet>
-  </GeneDef>
-
-  <GeneDef ParentName="HiveBase">
-    <defName>rjw_genes_insectbreeder</defName>
-    <label>Insect Breeder</label>	
-    <description>Pawns with this gene are able to fertilize eggs with any fertile penis.</description>
-    <iconPath>Genes/Icons/Insect_Breeder</iconPath>
-    <displayOrderInCategory>53</displayOrderInCategory>
-    <biostatCpx>1</biostatCpx>
-    <biostatMet>-1</biostatMet>
-  </GeneDef>
-  
-  <GeneDef>
-    <defName>rjw_genes_fervent_ovipositor</defName>
-    <label>Fervent Ovipositor</label>	
-	<geneClass>RJW_Genes.Gene_FerventOvipositor</geneClass>
-    <description>Pawns that have a female (egg producing) ovipositor produce eggs at drastically increased speed.</description>
-    <iconPath>Genes/Icons/Fervent_Ovipositor</iconPath>
-    <displayOrderInCategory>55</displayOrderInCategory>
-    <biostatCpx>1</biostatCpx>
-    <biostatMet>-1</biostatMet>
-  </GeneDef>
-  
-</Defs>

Common/Defs/GeneDefs/GeneDefs_LifeForce.xml

@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Defs>
 
 	<GeneDef Name="LifeForceBase" Abstract="True">
 		<displayCategory>rjw_genes_fertilin</displayCategory>
 
 		<modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
+				Class="VanillaGenesExpanded.GeneExtension">
 				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
 				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
 			</li>
@@ -15,29 +16,37 @@
 	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_lifeforce</defName>
 		<label>fertilin</label>
-		<description>Carriers of this gene have a reserve of biological strength powered by a resource called fertilin. The resource can be gained and spent in various ways, some of which are unlocked by other genes.\n\nCarriers lose 5 fertilin per day from biological entropy. \n\nGene is inactive until carrier is able to have sex.</description>
+		<description>Carriers of this gene have a reserve of biological strength powered by a
+			resource called fertilin. The resource can be gained and spent in various ways, some of
+			which are unlocked by other genes.\n\nCarriers lose 5 fertilin per day from biological
+			entropy. \n\nGene is inactive until carrier is able to have sex.</description>
 		<geneClass>RJW_Genes.Gene_LifeForce</geneClass>
 		<resourceGizmoType>RJW_Genes.GeneGizmo_ResourceLifeForce</resourceGizmoType>
 		<resourceLabel>fertilin</resourceLabel>
 		<resourceGizmoThresholds>
-		  <li>0.25</li>
+			<li>0.25</li>
-		  <li>0.5</li>
+			<li>0.5</li>
-		  <li>0.75</li>
+			<li>0.75</li>
 		</resourceGizmoThresholds>
 		<showGizmoOnWorldView>true</showGizmoOnWorldView>
 		<showGizmoWhenDrafted>true</showGizmoWhenDrafted>
-		<resourceDescription>A reserve of biological strength which can be gained and spent in a variety of ways. \n\nFertilin can be increased by absorbing cum, typically through oral sex or stored cum. \n\nIf fertilin reaches zero, {PAWN_nameDef} will become very unhappy and may try to obtain some forcefully.</resourceDescription>
+		<resourceDescription>A reserve of biological strength which can be gained and spent in a
+			variety of ways. \n\nFertilin can be increased by absorbing cum, typically through oral
+			sex or stored cum. \n\nIf fertilin reaches zero, {PAWN_nameDef} will become very unhappy
+			and may try to obtain some forcefully.</resourceDescription>
 		<iconPath>Genes/Icons/FertilinAlt</iconPath>
 		<selectionWeight>0</selectionWeight>
 		<displayOrderInCategory>-2</displayOrderInCategory>
-    	<minAgeActive>18</minAgeActive>
+		<minAgeActive>18</minAgeActive>
 		<customEffectDescriptions>
-		  <li>Gives fertilin supply.</li>
+			<li>Gives fertilin supply.</li>
 		</customEffectDescriptions>
 		<symbolPack>
-		  <prefixSymbols>
+			<prefixSymbols>
-			<li><symbol>fert</symbol></li>
+				<li>
-		  </prefixSymbols>
+					<symbol>fert</symbol>
+				</li>
+			</prefixSymbols>
 		</symbolPack>
 		<resourceLossPerDay>0.025</resourceLossPerDay>
 		<biostatCpx>1</biostatCpx>
@@ -54,7 +63,7 @@
 		<iconPath>Genes/Icons/FertilinDrainAlt</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<resourceLossPerDay>0.075</resourceLossPerDay>
-    	<minAgeActive>18</minAgeActive>
+		<minAgeActive>18</minAgeActive>
 		<displayOrderInCategory>-1</displayOrderInCategory>
 		<biostatCpx>1</biostatCpx>
 		<biostatMet>6</biostatMet>
@@ -62,7 +71,7 @@
 
 	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_pussyhealing</defName>
-		<label>Pussy Healer</label>
+		<label>pussy healer</label>
 		<labelShortAdj>pussyhealer</labelShortAdj>
 		<description>Carriers of this gene are able use vaginal sex to tend to other's wounds.</description>
 		<iconPath>Genes/Icons/Healpussy</iconPath>
@@ -78,18 +87,25 @@
 		<biostatMet>-1</biostatMet>
 		<symbolPack>
 			<suffixSymbols>
-				<li><symbol>life</symbol></li>
+				<li>
-				<li><symbol>pussy</symbol></li>
+					<symbol>life</symbol>
-				<li><symbol>heal</symbol></li>
+				</li>
+				<li>
+					<symbol>pussy</symbol>
+				</li>
+				<li>
+					<symbol>heal</symbol>
+				</li>
 			</suffixSymbols>
 		</symbolPack>
 	</GeneDef>
 
 	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_cockeater</defName>
-		<label>Cockeater</label>
+		<label>cockeater</label>
 		<labelShortAdj>cockeater</labelShortAdj>
-		<description>Carriers of this gene are able eat cocks to restore their fertilin supply. Cocks are consumed during that process.</description>
+		<description>Carriers of this gene are able eat cocks to restore their fertilin supply.
+			Cocks are consumed during that process.</description>
 		<iconPath>Genes/Icons/cockeater</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>11</displayOrderInCategory>
@@ -103,9 +119,15 @@
 		<biostatMet>-1</biostatMet>
 		<symbolPack>
 			<suffixSymbols>
-				<li><symbol>life</symbol></li>
+				<li>
-				<li><symbol>cock</symbol></li>
+					<symbol>life</symbol>
-				<li><symbol>eat</symbol></li>
+				</li>
+				<li>
+					<symbol>cock</symbol>
+				</li>
+				<li>
+					<symbol>eat</symbol>
+				</li>
 			</suffixSymbols>
 		</symbolPack>
 	</GeneDef>
@@ -128,8 +150,12 @@
 		<biostatMet>-1</biostatMet>
 		<symbolPack>
 			<suffixSymbols>
-				<li><symbol>stun</symbol></li>
+				<li>
-				<li><symbol>kiss</symbol></li>
+					<symbol>stun</symbol>
+				</li>
+				<li>
+					<symbol>kiss</symbol>
+				</li>
 			</suffixSymbols>
 		</symbolPack>
 	</GeneDef>
@@ -153,8 +179,12 @@
 
 		<symbolPack>
 			<suffixSymbols>
-				<li><symbol>stun</symbol></li>
+				<li>
-				<li><symbol>kiss</symbol></li>
+					<symbol>stun</symbol>
+				</li>
+				<li>
+					<symbol>kiss</symbol>
+				</li>
 			</suffixSymbols>
 		</symbolPack>
 	</GeneDef>
@@ -162,7 +192,8 @@
 	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_naked_prowess</defName>
 		<label>naked prowess</label>
-		<description>Carriers of this gene are able to temporarily increase their strength and resilience, while they are naked.</description>
+		<description>Carriers of this gene are able to temporarily increase their strength and
+			resilience, while they are naked.</description>
 		<iconPath>Genes/Icons/rjw_naked_prowess</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>14</displayOrderInCategory>
@@ -178,8 +209,9 @@
 
 	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_cum_eater</defName>
-		<label>Cum eater</label>
+		<label>cum eater</label>
-		<description>Carriers of this gene are able to absorb fertilin through eating cum. This includes oral sex, eating cum for food or sucking out cumflated pawns. </description>
+		<description>Carriers of this gene are able to absorb fertilin through eating cum. This
+			includes oral sex, eating cum for food or sucking out cumflated pawns. </description>
 		<iconPath>Genes/Icons/cumeater</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>1</displayOrderInCategory>
@@ -188,8 +220,9 @@
 
 	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_fertilin_absorber</defName>
-		<label>Fertilin Absorber</label>
+		<label>fertilin absorber</label>
-		<description>Carriers of this gene are able to absorb the fertilin inside sperm through their vagina and anus.</description>
+		<description>Carriers of this gene are able to absorb the fertilin inside sperm through
+			their vagina and anus.</description>
 		<iconPath>Genes/Icons/Vaginal_cum_absorption</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>2</displayOrderInCategory>
@@ -200,7 +233,8 @@
 		<defName>rjw_genes_lifeforce_empath</defName>
 		<label>empathic lifeforce</label>
 		<geneClass>RJW_Genes.Gene_LifeForce_Empath</geneClass>
-		<description>Carriers of this gene generate lifeforce if nearby pawns are sexually satisfied. Be careful: Sexually frustrated pawns will make your empath loose lifeforce!</description>
+		<description>Carriers of this gene generate lifeforce if nearby pawns are sexually
+			satisfied. Be careful: Sexually frustrated pawns will make your empath loose lifeforce!</description>
 		<iconPath>Genes/Icons/Hypersexual</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>3</displayOrderInCategory>
@@ -227,7 +261,9 @@
 	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_drainer</defName>
 		<label>vitality drainer</label>
-		<description>Carriers of this gene are able to absorb a great amount of fertilin by draining the vitality of the partner. This is done passively through having sex with a non-drained pawn that does not have this gene.</description>
+		<description>Carriers of this gene are able to absorb a great amount of fertilin by draining
+			the vitality of the partner. This is done passively through having sex with a
+			non-drained pawn that does not have this gene.</description>
 		<iconPath>Genes/Icons/Vitality_Drainer</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>4</displayOrderInCategory>

Common/Defs/GeneDefs/GeneDefs_Reproduction.xml

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Defs>
 
     <GeneDef>
         <defName>rjw_genes_hypersexual</defName>
-        <label>Hypersexuality</label>
+        <label>hypersexuality</label>
         <displayCategory>Reproduction</displayCategory>
         <description>Xenotypes with this Gene are Hypersexual (Nymphs).</description>
         <iconPath>Genes/Icons/Hypersexual</iconPath>
@@ -14,17 +14,19 @@
             </li>
         </forcedTraits>
 
+        <randomChosen>false</randomChosen>
         <modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+            <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+                Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+                <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-			</li>
+                <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-		</modExtensions>
+            </li>
+        </modExtensions>
     </GeneDef>
 
     <GeneDef>
         <defName>rjw_genes_rapist</defName>
-        <label>Rapist</label>
+        <label>rapist</label>
         <displayCategory>Reproduction</displayCategory>
         <description>Xenotypes with this Gene are Rapists.</description>
         <iconPath>Genes/Icons/Rape</iconPath>
@@ -36,17 +38,68 @@
             </li>
         </forcedTraits>
 
+        <randomChosen>false</randomChosen>
         <modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+            <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
+                Class="VanillaGenesExpanded.GeneExtension">
+                <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+                <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+            </li>
+        </modExtensions>
+    </GeneDef>
+
+    <!-- 
+	<GeneDef>
+        <defName>rjw_genes_sadist_gene</defName>
+        <label>sadist</label>
+        <displayCategory>Reproduction</displayCategory>
+        <description>Xenotypes with this Gene are Sadists.</description>
+        <iconPath>Genes/Icons/Rape</iconPath>
+        <biostatMet>1</biostatMet>
+        <displayOrderInCategory>2</displayOrderInCategory>    
+        <forcedTraits>
+            <li>
+                <def>rjw_genes_sadist</def>
+            </li>
+        </forcedTraits>
+
+        <modExtensions>
+			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
+    Class="VanillaGenesExpanded.GeneExtension">
 				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
 				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
 			</li>
 		</modExtensions>
     </GeneDef>
+	-->
+
+    <GeneDef>
+        <defName>rjw_genes_masochist</defName>
+        <label>masochist</label>
+        <displayCategory>Reproduction</displayCategory>
+        <description>Xenotypes with this Gene are Masochists.</description>
+        <iconPath>Genes/Icons/Rape</iconPath>
+        <biostatMet>1</biostatMet>
+        <displayOrderInCategory>2</displayOrderInCategory>
+        <forcedTraits>
+            <li>
+                <def>Masochist</def>
+            </li>
+        </forcedTraits>
+
+        <randomChosen>false</randomChosen>
+        <modExtensions>
+            <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
+                Class="VanillaGenesExpanded.GeneExtension">
+                <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+                <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+            </li>
+        </modExtensions>
+    </GeneDef>
 
     <GeneDef>
         <defName>rjw_genes_homosexual</defName>
-        <label>Homosexual</label>
+        <label>homosexual</label>
         <displayCategory>Reproduction</displayCategory>
         <description>This Gene makes you gay.</description>
         <iconPath>UI\Ideoligions\Universal\RoundC</iconPath>
@@ -61,17 +114,19 @@
             <li>rjw_genes_sexual_orientation</li>
         </exclusionTags>
 
+        <randomChosen>false</randomChosen>
         <modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+            <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+                Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+                <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-			</li>
+                <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-		</modExtensions>
+            </li>
+        </modExtensions>
     </GeneDef>
 
     <GeneDef>
         <defName>rjw_genes_bisexual</defName>
-        <label>Bisexual</label>
+        <label>bisexual</label>
         <displayCategory>Reproduction</displayCategory>
         <description>Carriers of this Gene are Bisexual.</description>
         <iconPath>UI\Ideoligions\Universal\RoundC</iconPath>
@@ -86,37 +141,63 @@
             <li>rjw_genes_sexual_orientation</li>
         </exclusionTags>
 
+        <randomChosen>false</randomChosen>
         <modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+            <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+                Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+                <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-			</li>
+                <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-		</modExtensions>
+            </li>
+        </modExtensions>
     </GeneDef>
 
 
-  <GeneDef>
+    <GeneDef>
-    <defName>rjw_genes_no_sex_need</defName>
+        <defName>rjw_genes_no_sex_need</defName>
-    <label>Asexual</label>
+        <label>asexual</label>
-    <description>Carriers of this gene do not have a sex-need. They can still participate in sex, </description>
+        <description>Carriers of this gene do not have a sex-need. They can still participate in
-    <iconPath>Genes/Icons/Empty</iconPath>
+            sex, </description>
-    <displayOrderInCategory>5</displayOrderInCategory>
+        <iconPath>Genes/Icons/Empty</iconPath>
-    <disablesNeeds>
+        <displayOrderInCategory>5</displayOrderInCategory>
-      <li>Sex</li>
+        <disablesNeeds>
-    </disablesNeeds>
+            <li>Sex</li>
-    <biostatMet>-1</biostatMet>
+        </disablesNeeds>
-    <biostatCpx>2</biostatCpx>
+        <biostatMet>-1</biostatMet>
+        <biostatCpx>2</biostatCpx>
 
-    <exclusionTags>
+        <randomChosen>false</randomChosen>
-        <li>rjw_genes_sexual_orientation</li>
+        <exclusionTags>
-    </exclusionTags>
+            <li>rjw_genes_sexual_orientation</li>
+        </exclusionTags>
 
-    <modExtensions>
+        <modExtensions>
-        <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+            <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
-            <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+                Class="VanillaGenesExpanded.GeneExtension">
-            <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+                <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-        </li>
+                <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-    </modExtensions>
+            </li>
-  </GeneDef>
+        </modExtensions>
+    </GeneDef>
+
+    <GeneDef>
+        <defName>LitteredBirths</defName>
+        <label>littered births</label>
+        <displayCategory>Reproduction</displayCategory>
+        <description>Female carriers of this gene birth litters instead of just one baby, with a
+            chance of having two to four babies per pregnancy.</description>
+        <iconPath>Genes/Icons/Gene_LitteredBirths</iconPath>
+        <displayOrderInCategory>110</displayOrderInCategory>
+        <marketValueFactor>1.10</marketValueFactor>
+        <biostatMet>-2</biostatMet>
+        <biostatCpx>1</biostatCpx>
+        <modExtensions>
+            <li Class="RJW_Genes.QirkExtension">
+                <Satisfiedquirk>ImpregnationFetishQuirk</Satisfiedquirk>
+            </li>
+        </modExtensions>
+        <exclusionTags>
+            <li>rjw_genes_littered_birth_vs_chestburst</li>
+        </exclusionTags>
+    </GeneDef>
 
 </Defs>

Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml

@@ -1,21 +1,22 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Defs>
 
     <GeneDef Name="SpecialBase" Abstract="True">
-      <displayCategory>rjw_genes_special</displayCategory>
+        <displayCategory>rjw_genes_special</displayCategory>
-      
+        <modExtensions>
-      <modExtensions>
+            <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
-          <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+                Class="VanillaGenesExpanded.GeneExtension">
-            <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+                <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-            <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+                <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-          </li>
+            </li>
         </modExtensions>
     </GeneDef>
 
     <GeneDef ParentName="SpecialBase">
         <defName>rjw_genes_orgasm_rush</defName>
-        <label>Orgasm Rush</label>
+        <label>orgasm rush</label>
-        <description>On orgasm, carriers of this gene get a boost in activity. (rest-need is partially filled)</description>
+        <description>On orgasm, carriers of this gene get a boost in activity. (rest-need is
+            partially filled)</description>
         <biostatCpx>1</biostatCpx>
         <biostatMet>-2</biostatMet>
         <iconPath>UI/Memes/FleshPurity</iconPath>
@@ -24,8 +25,9 @@
 
     <GeneDef ParentName="SpecialBase">
         <defName>rjw_genes_youth_fountain</defName>
-        <label>Youth Fountain</label>
+        <label>youth fountain</label>
-        <description>Having sex with a carrier of this gene makes the partner slightly younger. (Partner stays adult)</description>
+        <description>Having sex with a carrier of this gene makes the partner slightly younger.
+            (Partner stays adult)</description>
         <biostatCpx>2</biostatCpx>
         <biostatMet>-2</biostatMet>
         <iconPath>UI/Ideoligions/FireLeaves</iconPath>
@@ -41,8 +43,9 @@
 
     <GeneDef ParentName="SpecialBase">
         <defName>rjw_genes_sex_age_drain</defName>
-        <label>Sexual Age Drain</label>
+        <label>sexual age drain</label>
-        <description>Having sex transfers some of the partners life-time to themselves. (Pawn stays adult)</description>
+        <description>Having sex transfers some of the partners life-time to themselves. (Pawn stays
+            adult)</description>
         <biostatCpx>2</biostatCpx>
         <biostatMet>-1</biostatMet>
         <iconPath>UI/Icons/ColonistBar/Idle</iconPath>
@@ -58,46 +61,49 @@
 
     <GeneDef ParentName="SpecialBase">
         <defName>rjw_genes_aphrodisiac_pheromones</defName>
-        <label>Aphrodisiac Pheromones</label>
+        <label>aphrodisiac pheromones</label>
-		<geneClass>RJW_Genes.Gene_Aphrodisiac_Pheromones</geneClass>
+        <geneClass>RJW_Genes.Gene_Aphrodisiac_Pheromones</geneClass>
         <description>Pheremones of this pawn induce an incressed sexdrive to others nearby.</description>
         <iconPath>Genes/Icons/Pheromones</iconPath>
         <displayOrderInCategory>4</displayOrderInCategory>
         <biostatCpx>1</biostatCpx>
         <biostatMet>1</biostatMet>
-
         <modExtensions>
-			<li Class="RJW_Genes.TickIntervalExtension">
+            <li Class="RJW_Genes.TickIntervalExtension">
-				<!-- One day has 60k ticks, so we check every hour with 60000/48 = 1250-->
+                <!-- One day has 60k ticks, so we check every hour with 60000/48 = 1250-->
-				<tickInterval>1250</tickInterval>
+                <tickInterval>1250</tickInterval>
-			</li>
+            </li>
-			<li Class="RJW_Genes.DistanceExtension">
+            <li Class="RJW_Genes.DistanceExtension">
-				<!-- distance 25 means 25 tiles in every direction from the pheromone-pawn.-->
+                <!-- distance 25 means 25 tiles in every direction from the pheromone-pawn.-->
-				<distance>25</distance>
+                <distance>25</distance>
-			</li>
+            </li>
         </modExtensions>
     </GeneDef>
 
     <GeneDef ParentName="SpecialBase">
         <defName>rjw_genes_sexual_mytosis</defName>
-        <label>Orgasmic Mytosis</label>
+        <label>orgasmic mytosis</label>
-		<!-- <geneClass>RJW_Genes.Gene_Aphrodisiac_Pheromones</geneClass> -->
+        <!-- <geneClass>RJW_Genes.Gene_Aphrodisiac_Pheromones</geneClass> -->
-        <description>Carriers of this gene grow more unstable with ongoing multiple orgasms - climaxing in a process of mytosis. This will result in an (biologically) identical pawn and both twins are set in a regenerative state. Also, the pawn can have multiple orgasms: In a state of higher unstableness, they come quicker.</description>
+        <description>Carriers have malfunctioning regenerative archites that grow more unstable with
+            ongoing multiple orgasms - climaxing in a process of mytosis. This will result in an
+            (biologically) identical pawn and both twins are set in a regenerative state. Also, the
+            pawn can have multiple orgasms: In a state of higher unstableness, they come quicker.</description>
         <iconPath>UI/Icons/Genes/Gene_PsychicBonding</iconPath>
         <displayOrderInCategory>5</displayOrderInCategory>
         <biostatCpx>5</biostatCpx>
         <biostatMet>-5</biostatMet>
+        <biostatArc>1</biostatArc>
     </GeneDef>
 
     <GeneDef ParentName="SpecialBase">
         <defName>rjw_genes_hormonal_saliva</defName>
-        <label>Hormonal Saliva</label>
+        <label>hormonal saliva</label>
-        <description>The saliva of this xenotype stimulates growth in penises. Regular contact will lead to noticable growth.</description>
+        <description>The saliva of this xenotype stimulates growth in penises. Regular contact will
+            lead to noticable growth.</description>
         <biostatCpx>2</biostatCpx>
         <biostatMet>-1</biostatMet>
         <iconPath>Genes/Icons/Big_Male_Genitalia</iconPath>
         <displayOrderInCategory>6</displayOrderInCategory>
-
         <modExtensions>
             <li Class="RJW_Genes.HormonalSalivaExtension">
                 <!-- SizeIncrement is applied "flat" -->
@@ -109,4 +115,38 @@
         </modExtensions>
     </GeneDef>
 
+    <GeneDef ParentName="SpecialBase">
+        <defName>rjw_genes_cocoonweaver</defName>
+        <label>cocoon weaver</label>
+        <labelShortAdj>cocooner</labelShortAdj>
+        <description>Carriers of this gene can produce a cocoon to prepare helpless (or willing)
+            victims for breeding.</description>
+        <iconPath>Genes/Icons/Cocoon</iconPath>
+        <displayOrderInCategory>11</displayOrderInCategory>
+        <abilities>
+            <li>rjw_genes_ability_cocoonweaver</li>
+        </abilities>
+        <descriptionHyperlinks>
+            <AbilityDef>rjw_genes_ability_cocoonweaver</AbilityDef>
+        </descriptionHyperlinks>
+        <biostatCpx>1</biostatCpx>
+        <biostatMet>-1</biostatMet>
+        <modExtensions>
+            <li Class="RJW_Genes.QirkExtension">
+                <Satisfiedquirk>BreederQuirk</Satisfiedquirk>
+            </li>
+        </modExtensions>
+    </GeneDef>
+
+    <GeneDef ParentName="SpecialBase">
+        <defName>rjw_genes_sex_tamer</defName>
+        <label>Sexual Tamer</label>
+        <labelShortAdj>sextamer</labelShortAdj>
+        <description>Bestiality has a chance to tame animals or advance their training.</description>
+        <iconPath>Genes/Icons/RJW_Genes_SexualTamer</iconPath>
+        <displayOrderInCategory>14</displayOrderInCategory>
+        <biostatCpx>2</biostatCpx>
+        <biostatMet>-1</biostatMet>
+    </GeneDef>
+
 </Defs>

Common/Defs/GeneDefs/GeneDefs_SpecifiedGender.xml

@@ -1,81 +1,76 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Defs>
-    <GeneDef>
+  <GeneDef>
-        <defName>rjw_genes_female_only</defName>
+    <defName>rjw_genes_female_only</defName>
-        <label>Female</label>
+    <label>female</label>
-        <displayCategory>rjw_genes_gender</displayCategory>
+    <displayCategory>rjw_genes_gender</displayCategory>
-        <description>This Xenotype only has females.</description>
+    <description>This Xenotype only has females.</description>
-        <biostatCpx>0</biostatCpx>
+    <biostatCpx>0</biostatCpx>
-        <iconPath>Genes/Icons/Female_Only</iconPath>
+    <iconPath>Genes/Icons/Female_Only</iconPath>
-        <geneClass>RJW_Genes.Gene_FemaleOnly</geneClass>
+    <geneClass>RJW_Genes.Gene_FemaleOnly</geneClass>
-        <displayOrderInCategory>1</displayOrderInCategory>
+    <displayOrderInCategory>1</displayOrderInCategory>
+    <exclusionTags>
+      <li>AG_Gender</li>
+      <li>Gender</li>
+    </exclusionTags>
+    <modExtensions>
+      <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
+        Class="VanillaGenesExpanded.GeneExtension">
+        <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+        <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+      </li>
+    </modExtensions>
+  </GeneDef>
 
-        <exclusionTags>
+  <GeneDef>
-          <li>AG_Gender</li>
+    <defName>rjw_genes_male_only</defName>
-          <li>Gender</li>
+    <displayCategory>rjw_genes_gender</displayCategory>
-        </exclusionTags>
+    <label>male</label>
+    <description>This Xenotype only has males.</description>
+    <biostatCpx>0</biostatCpx>
+    <iconPath>Genes/Icons/Male_Only</iconPath>
+    <geneClass>RJW_Genes.Gene_MaleOnly</geneClass>
+    <displayOrderInCategory>2</displayOrderInCategory>
+    <exclusionTags>
+      <li>AG_Gender</li>
+      <li>Gender</li>
+    </exclusionTags>
+    <modExtensions>
+      <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
+        Class="VanillaGenesExpanded.GeneExtension">
+        <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+        <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+      </li>
+    </modExtensions>
+  </GeneDef>
 
-        <modExtensions>
+  <GeneDef>
-          <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+    <defName>rjw_genes_gender_fluid</defName>
-            <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+    <displayCategory>rjw_genes_gender</displayCategory>
-            <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+    <label>genderfluid</label>
-          </li>
+    <description>Everyday carriers of this gene might change their biological sex.</description>
-        </modExtensions>
+    <biostatCpx>0</biostatCpx>
-    </GeneDef>
+    <iconPath>Genes/Icons/Futa</iconPath>
-
+    <geneClass>RJW_Genes.Gene_GenderFluid</geneClass>
-    <GeneDef>
+    <displayOrderInCategory>2</displayOrderInCategory>
-        <defName>rjw_genes_male_only</defName>
+    <!-- Design Decision: GenderFluids like GenderFluids (slightly) more. -->
-        <displayCategory>rjw_genes_gender</displayCategory>
+    <missingGeneRomanceChanceFactor>0.9</missingGeneRomanceChanceFactor>
-        <label>Male</label>
+    <exclusionTags>
-        <description>This Xenotype only has males.</description>
+      <li>AG_Gender</li>
-        <biostatCpx>0</biostatCpx>
+      <li>Gender</li>
-        <iconPath>Genes/Icons/Male_Only</iconPath>
+    </exclusionTags>
-        <geneClass>RJW_Genes.Gene_MaleOnly</geneClass>
+    <modExtensions>
-        <displayOrderInCategory>2</displayOrderInCategory>
+      <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
-        
+        Class="VanillaGenesExpanded.GeneExtension">
-        <exclusionTags>
+        <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-          <li>AG_Gender</li>
+        <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-          <li>Gender</li>          
+      </li>
-        </exclusionTags>
+      <li Class="RJW_Genes.GenderFluidExtension">
-
+        <!-- 120k = 2 days -->
-        <modExtensions>
+        <changeInterval>120000</changeInterval>
-          <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+        <changeChance>0.25</changeChance>
-            <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+      </li>
-            <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+    </modExtensions>
-          </li>
+  </GeneDef>
-        </modExtensions>
-    </GeneDef>
-    
-
-    <GeneDef>
-        <defName>rjw_genes_gender_fluid</defName>
-        <displayCategory>rjw_genes_gender</displayCategory>
-        <label>Gender Fluid</label>
-        <description>Everyday carriers of this gene might change their biological sex.</description>
-        <biostatCpx>0</biostatCpx>
-        <iconPath>Genes/Icons/Futa</iconPath>
-        <geneClass>RJW_Genes.Gene_GenderFluid</geneClass>
-        <displayOrderInCategory>2</displayOrderInCategory>
-        
-        <!-- Design Decision: GenderFluids like GenderFluids (slightly) more. -->
-        <missingGeneRomanceChanceFactor>0.9</missingGeneRomanceChanceFactor>
-
-        <exclusionTags>
-          <li>AG_Gender</li>
-          <li>Gender</li>          
-        </exclusionTags>
-
-        <modExtensions>
-          <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-            <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-            <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-          </li>
-          <li Class="RJW_Genes.GenderFluidExtension">
-                <!-- 120k = 2 days -->
-                <changeInterval>120000</changeInterval>
-                <changeChance>0.25</changeChance>
-          </li>
-        </modExtensions>
-    </GeneDef>
 
 </Defs>

Common/Defs/GeneDefs/Xenotype_Hive.xml

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-  <!-- Alpha Genes ID: sarg.alphagenes -->
-
-  <XenotypeDef>
-    <defName>rjw_genes_halamyr_queen_xenotype</defName>
-    <label>Halamyr Queen</label>
-    <iconPath>Genes/Icons/Xenotypes/Xenotype-Queen</iconPath>
-    <inheritable>false</inheritable>
-    <canGenerateAsCombatant>false</canGenerateAsCombatant>
-
-    <description>The Halamyr are a race of insect-xenotypes living in a caste-system. On top of the caste, the queens are the centerpiece of any hive. They are the only Halamyr that can produce drones, or mass-produce workers. A hive can virtually not live without a queen - without their royalty the drones and workers are irritated and receive sever penalties. Queens are very fragile and need to be kept safe and in best conditions.</description>
-    <descriptionShort>The fragile queens of the Halamyr are the center of the hives reproduction. Multiple queens, or and absence of a queen, can cause to fall the best hive into disarray real quick.</descriptionShort>
-    
-    <genes>			
-        <li MayRequire="sarg.alphagenes" >AG_LargerBodySize</li>
-        <li MayRequire="sarg.alphagenes" >AG_InsectBlood</li>
-        <li MayRequire="sarg.alphagenes" >AG_InsectJellyProduction</li>
-        <li MayRequire="sarg.alphagenes" >AG_SurvivalInstinct_Low</li>
-        <li>WoundHealing_Slow</li>
-        <li>PsychicAbility_Extreme</li>
-        <li>MoveSpeed_Slow</li>
-        <li>FireTerror</li>
-        <li>MeleeDamage_Weak</li>
-        <li>Sleepy</li>
-        <li>Delicate</li>
-        <li>rjw_genes_hypersexual</li>
-        <li>rjw_genes_bisexual</li>
-        <li>Libido_High</li>
-        <li>Beauty_Beautiful</li>
-        <li MayRequire="sarg.alphagenes" >AG_OutwardsAntennas</li>
-        <li>Skin_DeepRed</li>
-        <li>Learning_Fast</li>
-        <li>rjw_genes_fervent_ovipositor</li>
-        <li>AptitudeTerrible_Shooting</li>
-        <li>AptitudeTerrible_Melee</li>
-        <li>AptitudeRemarkable_Social</li>
-        <li MayRequire="rjw.sexperience">AptitudeRemarkable_Sex</li>
-        <li>rjw_genes_female_only</li>
-        <li>rjw_genes_ovipositor_genitalia</li>
-        <li>rjw_genes_aphrodisiac_pheromones</li>
-        <li>rjw_genes_queen</li>
-        <li>rjw_genes_cocoonweaver</li>
-        <li>rjw_genes_spawn_spelopede</li>
-    </genes>
-  </XenotypeDef>
-  
-  <XenotypeDef>
-    <defName>rjw_genes_halamyr_hiveguard_xenotype</defName>
-    <label>Halamyr Hiveguard</label>
-    <iconPath>Genes/Icons/Xenotypes/Xenotype-Guard</iconPath>
-
-    <combatPowerFactor>1.5</combatPowerFactor>
-    <inheritable>false</inheritable>
-
-    <description>The Halamyr hiveguards are the bastion to protect the hive. Next to the walls, these meele specialists form the ultimate guard for the queen, for which they'd give their lifes. Their tuned bodies come with a price, crippling them for social interactions and increased hunger.</description>
-    <descriptionShort>Frontline of the Halamyr, guards of the hive, specialised in meele combat. Heavily handicapped without a queen.</descriptionShort>
-    
-    <genes>			
-        <li MayRequire="sarg.alphagenes" >AG_InsectBlood</li>
-        <li MayRequire="sarg.alphagenes" >AG_EfficientMandibles</li>
-        <li>Immunity_Strong</li>
-        <li>WoundHealing_Fast</li>
-        <li>MoveSpeed_Quick</li>
-        <li>FireTerror</li>
-        <li>MeleeDamage_Strong</li>
-        <li>KillThirst</li>
-        <li>LowSleep</li>
-        <li MayRequire="sarg.alphagenes" >AG_WaspWings</li>
-        <li>Hair_ShortOnly</li>
-        <li MayRequire="sarg.alphagenes" >AG_DownwardsAntennas</li>
-        <li>Hair_DarkBlack</li>
-        <li>Skin_DeepRed</li>
-        <li MayRequire="sarg.alphagenes" >AG_FeraliskEyes</li>
-        <li>AptitudeTerrible_Shooting</li>
-        <li>AptitudeRemarkable_Melee</li>
-        <li>AptitudePoor_Construction</li>
-        <li>AptitudePoor_Cooking</li>
-        <li>AptitudePoor_Plants</li>
-        <li>AptitudePoor_Crafting</li>
-        <li>AptitudeTerrible_Artistic</li>
-        <li>AptitudeTerrible_Medicine</li>
-        <li>AptitudePoor_Social</li>
-        <li>rjw_genes_male_only</li>
-        <li>rjw_genes_ovipositor_genitalia</li>
-        <li>rjw_genes_drone</li>
-        <li>rjw_genes_zealous_loyalty</li>
-    </genes>
-  </XenotypeDef>
-  
-  <XenotypeDef>
-    <defName>rjw_genes_halamyr_breeder_xenotype</defName>
-    <label>Halamyr Breeder</label>
-    <iconPath>Genes/Icons/Xenotypes/Xenotype-Breeder</iconPath>
-    <inheritable>false</inheritable>
-    <canGenerateAsCombatant>false</canGenerateAsCombatant>
-    <combatPowerFactor>0.8</combatPowerFactor>
-
-    <description>The Halamyr breeders are the backbone of the hive. Their special genes allow them to carry more eggs and hatch them faster, enabling a steady output of hivelings. To support their position in the hive, breeders spend most of their life in the queens cocoon, a task which they gladly accept.</description>
-    <descriptionShort>Made for incubating Halamyr eggs, breeders spend most of their life in the queens cocoon.</descriptionShort>
-
-    <genes>			
-      <li MayRequire="sarg.alphagenes" >AG_Spinnerets</li>
-			<li MayRequire="sarg.alphagenes" >AG_InsectBlood</li>
-			<li MayRequire="sarg.alphagenes" >AG_InsectJellyProduction</li>
-			<li MayRequire="sarg.alphagenes" >AG_FormicAntennas</li>
-      <li>Fertile</li>
-			<li MayRequire="sarg.alphagenes" >AG_FastGestation</li>
-			<li>FireTerror</li>
-			<li>VerySleepy</li>
-			<li>rjw_genes_bisexual</li>
-			<li>Skin_DeepRed</li>
-			<li>AptitudeStrong_Social</li>
-			<li>rjw_genes_drone</li>
-      <li>rjw_genes_female_only</li>
-			<li>rjw_genes_zealous_loyalty</li>
-			<li>rjw_genes_insectincubator</li>	
-			<li>rjw_genes_zoophile</li>	
-      <li>rjw_genes_no_vagina</li>
-    </genes>
-  </XenotypeDef>
-  
-</Defs>

Common/Defs/GeneDefs/Xenotype_Lifeforce.xml

@@ -1,11 +1,13 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Defs>
 
   <XenotypeDef>
     <defName>rjw_genes_succubus</defName>
-    <label>Succubus</label>
+    <label>succubus</label>
-    <description>Succubi are strongly enhanced xenohumans. These overnaturally beautiful creatures strive parasitically on the Fertilin found in semen.</description>
+    <description>Succubi are strongly enhanced xenohumans. These overnaturally beautiful creatures
-    <descriptionShort>Succubi are beautiful and extremely hungry Xenohumans. They strive on having sex and extracting their victims life-force through this. </descriptionShort>
+      strive parasitically on the Fertilin found in semen.</description>
+    <descriptionShort>Succubi are beautiful and extremely hungry Xenohumans. They strive on having
+      sex and extracting their victims life-force through this. </descriptionShort>
     <iconPath>Genes/Icons/Xenotypes/Xenotype-Succubus</iconPath>
     <soundDefOnImplant>PawnBecameSanguophage</soundDefOnImplant>
     <generateWithXenogermReplicatingHediffChance>0.5</generateWithXenogermReplicatingHediffChance>
@@ -13,7 +15,7 @@
     <combatPowerFactor>1</combatPowerFactor>
     <displayPriority>-1000</displayPriority>
     <factionlessGenerationWeight>0.005</factionlessGenerationWeight>
-	  <inheritable>false</inheritable>
+    <inheritable>false</inheritable>
     <doubleXenotypeChances>
       <Pigskin>0.02</Pigskin>
       <Impid>0.02</Impid>
@@ -23,39 +25,38 @@
       <Dirtmole>0.02</Dirtmole>
     </doubleXenotypeChances>
     <genes>
-        <li>rjw_genes_bisexual</li>
+      <li>rjw_genes_bisexual</li>
-        <li>rjw_genes_hypersexual</li>
+      <li>rjw_genes_hypersexual</li>
-        <li>rjw_genes_female_only</li>
+      <li>rjw_genes_female_only</li>
-        <li>rjw_genes_lifeforce</li>
+      <li>rjw_genes_lifeforce</li>
-        <li>rjw_genes_lifeforce_drain</li>
+      <li>rjw_genes_lifeforce_drain</li>
-		    <li>rjw_genes_demonic_genitalia</li>
+      <li>rjw_genes_demonic_genitalia</li>
-		
+      <li>rjw_genes_cum_eater</li>
-		    <li>rjw_genes_cum_eater</li>
+      <li>rjw_genes_fertilin_absorber</li>
-        <li>rjw_genes_fertilin_absorber</li>
+      <li>rjw_genes_paralysingkiss</li>
-
+      <li>rjw_genes_seduce</li>
-        <li>rjw_genes_paralysingkiss</li>
+      <li MayRequire="rjw.sexperience">AptitudeRemarkable_Sex</li>
-        <li>rjw_genes_seduce</li>
+      <li MayRequire="Sl4vP0weR.DominantGene">DominantGene</li>
-        <li MayRequire="rjw.sexperience">AptitudeRemarkable_Sex</li>
+      <li MayRequire="LustLicentia.RJWLabs">rjw_genes_elasticity</li>
-		
+      <li>rjw_genes_succubus_wings</li>
-        <li MayRequire="Sl4vP0weR.DominantGene">DominantGene</li>
+      <li>rjw_genes_succubus_tail</li>
-        <li MayRequire="LustLicentia.RJWLabs">rjw_genes_elasticity</li>
+      <li>rjw_genes_aphrodisiac_pheromones</li>
-		    <li>rjw_genes_succubus_wings</li>
+      <li>Beauty_Pretty</li>
-        <li>rjw_genes_succubus_tail</li>
+      <li>MoveSpeed_Quick</li>
-        <li>rjw_genes_aphrodisiac_pheromones</li>
+      <li>AptitudeStrong_Social</li>
-        <li>Beauty_Pretty</li>
+      <li>Ears_Pointed</li>
-        <li>MoveSpeed_Quick</li>
+      <li>Headbone_MiniHorns</li>
-        <li>AptitudeStrong_Social</li>
+      <li>Skin_Purple</li>
-        <li>Ears_Pointed</li>
-        <li>Headbone_MiniHorns</li>
-        <li>Skin_Purple</li>
     </genes>
   </XenotypeDef>
 
   <XenotypeDef>
     <defName>rjw_genes_incubus</defName>
-    <label>Incubus</label>
+    <label>incubus</label>
-    <description>Incubi are strongly enhanced xenohumans. These overnaturally beautiful creatures strive parasitically on the Fertilin found in semen.</description>
+    <description>Incubi are strongly enhanced xenohumans. These overnaturally beautiful creatures
-    <descriptionShort>Incubi are beautiful and extremely hungry Xenohumans. They strive on having sex and extracting their victims life-force through this. </descriptionShort>
+      strive parasitically on the Fertilin found in semen.</description>
+    <descriptionShort>Incubi are beautiful and extremely hungry Xenohumans. They strive on having
+      sex and extracting their victims life-force through this. </descriptionShort>
     <iconPath>Genes/Icons/Xenotypes/Xenotype-Incubus</iconPath>
     <soundDefOnImplant>PawnBecameSanguophage</soundDefOnImplant>
     <generateWithXenogermReplicatingHediffChance>0.5</generateWithXenogermReplicatingHediffChance>
@@ -63,7 +64,7 @@
     <combatPowerFactor>1</combatPowerFactor>
     <displayPriority>-1000</displayPriority>
     <factionlessGenerationWeight>0.005</factionlessGenerationWeight>
-	  <inheritable>false</inheritable>
+    <inheritable>false</inheritable>
     <doubleXenotypeChances>
       <Pigskin>0.02</Pigskin>
       <Impid>0.02</Impid>
@@ -73,72 +74,74 @@
       <Dirtmole>0.02</Dirtmole>
     </doubleXenotypeChances>
     <genes>
-        <li>rjw_genes_hypersexual</li>
+      <li>rjw_genes_hypersexual</li>
-        <li>rjw_genes_male_only</li>
+      <li>rjw_genes_male_only</li>
-        <li>rjw_genes_lifeforce</li>
+      <li>rjw_genes_lifeforce</li>
-        <li>rjw_genes_lifeforce_drain</li>
+      <li>rjw_genes_lifeforce_drain</li>
-		    <li>rjw_genes_drainer</li>
+      <li>rjw_genes_drainer</li>
-		    <li>rjw_genes_demonic_genitalia</li>
+      <li>rjw_genes_demonic_genitalia</li>
-	
+      <li MayRequire="rjw.sexperience">AptitudeRemarkable_Sex</li>
-        <li MayRequire="rjw.sexperience">AptitudeRemarkable_Sex</li>
+      <li MayRequire="Sl4vP0weR.DominantGene">DominantGene</li>
-        
+      <li>rjw_genes_seduce</li>
-	
+      <li>rjw_genes_succubus_wings</li>
-        <li MayRequire="Sl4vP0weR.DominantGene">DominantGene</li>
+      <li>rjw_genes_succubus_tail</li>
-        <li>rjw_genes_seduce</li>
+      <li>rjw_genes_aphrodisiac_pheromones</li>
-		    <li>rjw_genes_succubus_wings</li>
+      <li>Beauty_Pretty</li>
-        <li>rjw_genes_succubus_tail</li>
+      <li>MoveSpeed_Quick</li>
-        <li>rjw_genes_aphrodisiac_pheromones</li>
+      <li>Robust</li>
-
+      <li>UVSensitivity_Intense</li>
-        <li>Beauty_Pretty</li>
+      <li>AptitudeStrong_Intellectual</li>
-        <li>MoveSpeed_Quick</li>
+      <li>Ears_Pointed</li>
-        <li>Robust</li>
+      <li>Headbone_CenterHorn</li>
-        <li>UVSensitivity_Intense</li>
+      <li>Skin_InkBlack</li>
-        <li>AptitudeStrong_Intellectual</li>
-        <li>Ears_Pointed</li>
-        <li>Headbone_CenterHorn</li>
-        <li>Skin_InkBlack</li>
     </genes>
   </XenotypeDef>
 
   <XenotypeDef>
     <defName>rjw_genes_cumazone</defName>
     <label>Cumazone</label>
-    <description>Cumazone are a female only xenotype that excel at meele combat. Originally created as bodyguards for glitterworld amazon communities, they spred to other systems by mere strength and providing for some fetishes. They can use Fertilin to enhance their skin to overpower any combatant in meele. Their only source for Fertilin is biting of male genitalia - so be sure to have a steady supply of victim males or prepare to raid unsuspecting men of the rim.</description>
+    <description>Cumazone are a female only xenotype that excel at meele combat. Originally created
-    <descriptionShort>Female only, strong meele fighters, that use Fertilin from bitten-off cocks for powerful buffs.</descriptionShort>
+      as bodyguards for glitterworld amazon communities, they spred to other systems by mere
+      strength and providing for some fetishes. They can use Fertilin to enhance their skin to
+      overpower any combatant in meele. Their only source for Fertilin is biting of male genitalia -
+      so be sure to have a steady supply of victim males or prepare to raid unsuspecting men of the
+      rim.</description>
+    <descriptionShort>Female only, strong meele fighters, that use Fertilin from bitten-off cocks
+      for powerful buffs.</descriptionShort>
     <iconPath>Genes/Icons/Xenotypes/Xenotype-Cumazon</iconPath>
     <generateWithXenogermReplicatingHediffChance>0.5</generateWithXenogermReplicatingHediffChance>
     <xenogermReplicatingDurationLeftDaysRange>0.1~140</xenogermReplicatingDurationLeftDaysRange>
     <combatPowerFactor>2.5</combatPowerFactor>
     <displayPriority>-1000</displayPriority>
     <factionlessGenerationWeight>0.01</factionlessGenerationWeight>
-	  <inheritable>false</inheritable>
+    <inheritable>false</inheritable>
     <genes>
-			<li>WoundHealing_Fast</li>
+      <li>WoundHealing_Fast</li>
-			<li>NakedSpeed</li>
+      <li>NakedSpeed</li>
-			<li>Aggression_Aggressive</li>
+      <li>Aggression_Aggressive</li>
-			<li>MeleeDamage_Strong</li>
+      <li>MeleeDamage_Strong</li>
-			<li>KillThirst</li>
+      <li>KillThirst</li>
       <li>Robust</li>
-			<li>Pain_Reduced</li>
+      <li>Pain_Reduced</li>
-			<li>Beauty_Ugly</li>
+      <li>Beauty_Ugly</li>
-			<li>Hair_BaldOnly</li>
+      <li>Hair_BaldOnly</li>
-			<li>Hair_ShortOnly</li>
+      <li>Hair_ShortOnly</li>
-			<li>Brow_Heavy</li>
+      <li>Brow_Heavy</li>
-			<li>Body_Hulk</li>
+      <li>Body_Hulk</li>
-			<li>AptitudeStrong_Shooting</li>
+      <li>AptitudeStrong_Shooting</li>
-			<li>AptitudeRemarkable_Melee</li>
+      <li>AptitudeRemarkable_Melee</li>
-			<li>AptitudePoor_Crafting</li>
+      <li>AptitudePoor_Crafting</li>
-			<li>AptitudePoor_Artistic</li>
+      <li>AptitudePoor_Artistic</li>
       <li>Unstoppable</li>
-			<li>rjw_genes_rapist</li>
+      <li>rjw_genes_rapist</li>
-			<li>rjw_genes_female_only</li>
+      <li>rjw_genes_female_only</li>
-			<li>rjw_genes_lifeforce</li>
+      <li>rjw_genes_lifeforce</li>
-			<li>rjw_genes_lifeforce_drain</li>
+      <li>rjw_genes_lifeforce_drain</li>
-			<li>rjw_genes_pussyhealing</li>
+      <li>rjw_genes_pussyhealing</li>
-			<li>rjw_genes_cockeater</li>
+      <li>rjw_genes_cockeater</li>
-			<li>rjw_genes_naked_prowess</li>
+      <li>rjw_genes_naked_prowess</li>
-			<li>rjw_genes_orgasm_rush</li>
+      <li>rjw_genes_orgasm_rush</li>
-		</genes>
+    </genes>
   </XenotypeDef>
 
 </Defs>

Common/Defs/HediffDefs/Bioscaffold.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>
+  <HediffDef>
+    <defName>Bioscaffold</defName>
+    <hediffClass>HediffWithComps</hediffClass>
+    <label>bioscaffold</label>
+    <description>This woman has an bioscaffold mesh within her womb, providing an enriching environment for an unborn baby to grow more quickly.</description>
+    <descriptionHyperlinks>
+      <ThingDef>Bioscaffold</ThingDef>
+    </descriptionHyperlinks>
+    <initialSeverity>0.001</initialSeverity>
+    <everCurableByItem>false</everCurableByItem>
+    <!-- <comps>
+      <li Class="HediffCompProperties_Disappears">
+        <showRemainingTime>true</showRemainingTime>
+        <disappearsAfterTicks>540000</disappearsAfterTicks> <!10 Days>
+      </li>
+    </comps> -->
+  </HediffDef>
+
+  <ThingDef ParentName="BodyPartNaturalBase">
+    <defName>Bioscaffold</defName>
+    <label>bioscaffold</label>
+    <description>A single-use nanite-constructed lattice of organic mesh material meant to be installed inside a woman's womb prior to pregnancy. It provides an enriching environment for an unborn baby to grow more quickly.</description>
+    <descriptionHyperlinks>
+      <RecipeDef>InstallBioscaffold</RecipeDef>
+    </descriptionHyperlinks>
+    <techLevel>Spacer</techLevel>
+    <tickerType>Rare</tickerType>
+    <drawGUIOverlay>true</drawGUIOverlay>
+    <stackLimit>25</stackLimit>
+    <healthAffectsPrice>false</healthAffectsPrice>
+    <statBases>
+      <MaxHitPoints>30</MaxHitPoints>
+      <MarketValue>350</MarketValue>
+      <Mass>0.15</Mass>
+      <Flammability>1.3</Flammability>
+      <DeteriorationRate>6</DeteriorationRate>
+      <WorkToMake>800</WorkToMake>
+    </statBases>
+    <comps>
+      <li Class="CompProperties_Rottable">
+        <daysToRotStart>5</daysToRotStart>
+        <rotDestroys>true</rotDestroys>
+      </li>
+    </comps>
+    <costList>
+      <Plasteel>5</Plasteel>
+      <BabyFood>10</BabyFood>
+      <MedicineUltratech>1</MedicineUltratech>
+      <ComponentSpacer>1</ComponentSpacer>
+    </costList>
+    <recipeMaker>
+      <workSpeedStat>DrugSynthesisSpeed</workSpeedStat>
+      <workSkill>Intellectual</workSkill>
+      <recipeUsers>
+        <li>DrugLab</li>
+      </recipeUsers>
+      <skillRequirements>
+        <Crafting>6</Crafting>
+        <Intellectual>4</Intellectual>
+      </skillRequirements> 
+      <researchPrerequisite>FertilityProcedures</researchPrerequisite>
+      <bulkRecipeCount>4</bulkRecipeCount>
+    </recipeMaker>
+    <tradeTags>
+      <li>ExoticMisc</li>
+    </tradeTags>
+  </ThingDef>
+</Defs>

Common/Defs/HediffDefs/Hediffs_CounterCumflation.xml

@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+    <HediffDef>
+        <defName>rjw_genes_cumflation_counter</defName>
+        <hediffClass>HediffWithComps</hediffClass>
+        <label>cumflation negator</label>
+        <labelNoun>cumflation negator</labelNoun>
+        <description>Negates the negative effects usually produced by being cumflated.</description>
+        <defaultLabelColor>(240,200,110)</defaultLabelColor>
+        <scenarioCanAdd>false</scenarioCanAdd>
+        <maxSeverity>1.0</maxSeverity>
+        <isBad>false</isBad>
+        <tendable>false</tendable>
+        <comps>
+          <li Class="HediffCompProperties_SeverityPerDay">
+            <severityPerDay>-0.75</severityPerDay>
+          </li>
+        </comps>
+        <stages>
+          <li>
+            <label>a little</label>
+            <becomeVisible>false</becomeVisible>
+          </li>
+          <li>
+            <label>slight</label>
+            <minSeverity>0.2</minSeverity>
+            <becomeVisible>false</becomeVisible>
+            <statOffsets>
+              <Vulnerability>-0.1</Vulnerability>
+            </statOffsets>
+            <capMods>
+              <li>
+                <capacity>Moving</capacity>
+                <offset>0.1</offset>
+              </li>
+            </capMods>
+          </li>
+          <li>
+            <label>moderate</label>
+            <minSeverity>0.4</minSeverity>
+            <becomeVisible>false</becomeVisible>
+            <statOffsets>
+              <Vulnerability>-0.3</Vulnerability>
+            </statOffsets>
+            <capMods>
+              <li>
+                <capacity>Moving</capacity>
+                <offset>0.3</offset>
+              </li>
+            </capMods>
+            <painOffset>-0.1</painOffset>
+          </li>
+          <li>
+            <label>intense</label>
+            <minSeverity>0.65</minSeverity>
+            <becomeVisible>false</becomeVisible>
+            <statOffsets>
+              <Vulnerability>+0.5</Vulnerability>
+            </statOffsets>
+            <capMods>
+              <li>
+                <capacity>Moving</capacity>
+                <offset>0.6</offset>
+              </li>
+            </capMods>
+            <painOffset>-0.3</painOffset>
+          </li>
+          <li>
+            <label>extreme</label>
+            <minSeverity>0.9</minSeverity>
+            <becomeVisible>false</becomeVisible>
+            <statOffsets>
+              <Vulnerability>-0.7</Vulnerability>
+            </statOffsets>
+            <capMods>
+              <li>
+                <capacity>Moving</capacity>
+                <offset>1.0</offset>
+              </li>
+            </capMods>
+            <painOffset>-0.5</painOffset>
+          </li>
+        </stages>
+      </HediffDef>
+    
+  <HediffDef>
+    <defName>rjw_genes_cumstuffed_counter</defName>
+    <hediffClass>HediffWithComps</hediffClass>
+    <label>cumstuffed negator</label>
+    <labelNoun>cumstuffed negated</labelNoun>
+    <description>Negates the negative effects that one would suffer from being cumstuffed.</description>
+    <defaultLabelColor>(240,200,110)</defaultLabelColor>
+    <scenarioCanAdd>false</scenarioCanAdd>
+    <maxSeverity>1.0</maxSeverity>
+    <isBad>false</isBad>
+    <tendable>false</tendable>
+    <comps>
+      <li Class="HediffCompProperties_SeverityPerDay">
+        <severityPerDay>-0.75</severityPerDay>
+      </li>
+      <li Class="LicentiaLabs.Hediffs.HediffCompProperties_VomitCumMtb">
+        <mtbDaysPerStage>
+          <li>0</li>
+          <li>0</li>
+          <li>0.75</li>
+          <li>0.5</li>
+          <li>0.2</li>
+        </mtbDaysPerStage>
+      </li>
+    </comps>
+    <stages>
+      <li>
+        <label>slightly bloated</label>
+        <becomeVisible>false</becomeVisible>
+      </li>
+      <li>
+        <label>bloated</label>
+        <minSeverity>0.2</minSeverity>
+        <hungerRateFactor>0.95</hungerRateFactor>
+        <becomeVisible>false</becomeVisible>
+        <statOffsets>
+          <Vulnerability>-0.05</Vulnerability>
+        </statOffsets>
+        <capMods>
+          <li>
+            <capacity>Moving</capacity>
+            <offset>0.03</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <label>full</label>
+        <minSeverity>0.4</minSeverity>
+        <hungerRateFactor>0.9</hungerRateFactor>
+        <statOffsets>
+          <Vulnerability>-0.1</Vulnerability>
+        </statOffsets>
+        <becomeVisible>false</becomeVisible>
+        <capMods>
+          <li>
+            <capacity>Moving</capacity>
+            <offset>0.1</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <label>stuffed</label>
+        <minSeverity>0.6</minSeverity>
+        <hungerRateFactor>0.75</hungerRateFactor>
+        <becomeVisible>false</becomeVisible>
+        <statOffsets>
+          <Vulnerability>-0.15</Vulnerability>
+        </statOffsets>
+        <capMods>
+          <li>
+            <capacity>Moving</capacity>
+            <offset>0.2</offset>
+          </li>
+        </capMods>
+        <painOffset>-0.15</painOffset>
+      </li>
+      <li>
+        <label>overstuffed</label>
+        <minSeverity>0.8</minSeverity>
+        <hungerRateFactor>0.5</hungerRateFactor>
+        <becomeVisible>false</becomeVisible>
+        <statOffsets>
+          <Vulnerability>-0.2</Vulnerability>
+        </statOffsets>
+        <capMods>
+          <li>
+            <capacity>Moving</capacity>
+            <offset>0.3</offset>
+          </li>
+        </capMods>
+        <painOffset>-0.3</painOffset>
+      </li>
+    </stages>
+  </HediffDef>
+
+</Defs>

Common/Defs/HediffDefs/Hediffs_OrgasmRush.xml

@@ -4,7 +4,7 @@
   <HediffDef>
     <defName>rjw_genes_orgasm_rush_hediff</defName>
     <hediffClass>HediffWithComps</hediffClass>
-    <label>Orgasm Rush</label>
+    <label>orgasm rush</label>
     <description>Xenotypes with this Gene are pushed beyond normal limits when they have an orgasm.</description>
     <defaultLabelColor>(240,200,110)</defaultLabelColor>
     <scenarioCanAdd>false</scenarioCanAdd>
@@ -75,4 +75,3 @@
   </HediffDef>
 
 </Defs>
-

Common/Defs/HediffDefs/LimbicStimulator.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <HediffDef>
+    <defName>LimbicStimulator</defName>
+    <hediffClass>HediffWithComps</hediffClass>
+    <label>limbic stimulator</label>
+    <labelNoun>limbic stimulator</labelNoun>
+    <description>An installed limbic stimulator.</description>
+
+    <defaultLabelColor>(1.0, 0.6, 0.7)</defaultLabelColor>
+    <stages>
+      <li>
+        <minSeverity>0</minSeverity>
+        <statOffsets>
+          <Vulnerability>-1.0</Vulnerability>
+          <SexFrequency>6.0</SexFrequency>
+        </statOffsets>
+      </li>
+    </stages>
+  </HediffDef>
+  
+    <ThingDef ParentName="BodyPartBionicBase">
+    <defName>LimbicStimulator</defName>
+    <label>limbic stimulator</label>
+    <description>A perpetual slow-release chemical stimulation implant that is embedded deep within the reward center of the brain, greatly increasing the need for lovin'. The need is said to become so strong that it can drive people to force themselves onto others, even if they wouldn't otherwise. Post-lovin' clarity will leave the implanted in a state of bliss, but they may also feel a sense of regret if they steal lovin' if they normally wouldn't - at least until they become used to doing it.</description>
+    <descriptionHyperlinks>
+      <RecipeDef>InstallLimbicStimulator</RecipeDef>
+    </descriptionHyperlinks>
+    <costList>
+      <Steel>30</Steel>
+      <ComponentIndustrial>4</ComponentIndustrial>
+      <ComponentSpacer>1</ComponentSpacer>
+    </costList>
+    <recipeMaker>
+      <researchPrerequisite>FertilityProcedures</researchPrerequisite>
+    </recipeMaker>
+  </ThingDef>
+</Defs>

Common/Defs/HediffDefs/OvaryAgitator.xml

@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>
+  <HediffDef>
+    <defName>OvaryAgitator</defName>
+    <label>ovary agitator</label>
+    <description>An installed ovary agitator.</description>
+    <descriptionHyperlinks>
+      <ThingDef>OvaryAgitator</ThingDef>
+    </descriptionHyperlinks>
+    <hediffClass>HediffWithComps</hediffClass>
+    <initialSeverity>0.0001</initialSeverity>
+    <stages>
+      <li>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>0.50</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>0.1</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>0.22</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>0.2</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>0</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>0.3</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>-0.17</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>0.4</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>-0.32</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>0.5</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>-0.48</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>0.6</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>-0.54</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>0.7</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>-0.63</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>0.8</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>-0.69</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>0.9</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>-0.75</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>1</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>-100</offset>
+          </li>
+        </capMods>
+      </li>
+    </stages>
+    <comps>
+      <li Class="HediffCompProperties_SeverityPerDay">
+        <severityPerDay>0.0045</severityPerDay>
+      </li>
+    </comps>
+  </HediffDef>
+  
+  <ThingDef ParentName="BodyPartBionicBase">
+    <defName>OvaryAgitator</defName>
+    <label>ovary agitator</label>
+    <description>A crude slaver implant used to increase the number of eggs released during ovulation, increasing the likelihood of having multiple children per pregnancy. Their use is largely limited to rimworlds lacking in cloning infrastructure as most civilized and unified worlds have outlawed them.\n\nWhile it provides an initial boost in fertility, the implant will slowly deplete the victims's ovaries over several years until they're infertile. Allies of implanted victims will be angered.</description>
+    <descriptionHyperlinks>
+      <RecipeDef>InstallOvaryAgitator</RecipeDef>
+    </descriptionHyperlinks>
+    <costList>
+      <Plasteel>10</Plasteel>
+      <MedicineIndustrial>1</MedicineIndustrial>
+      <ComponentIndustrial>6</ComponentIndustrial>
+    </costList>
+    <recipeMaker>
+      <researchPrerequisite>FertilityProcedures</researchPrerequisite>
+    </recipeMaker>
+  </ThingDef>
+</Defs>

Common/Defs/HediffDefs/Scrambler.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <HediffDef>
+    <defName>Scrambler</defName>
+    <label>scrambler</label>
+    <labelNoun>scrambler</labelNoun>
+    <description>An installed scrambler.</description>
+    <descriptionHyperlinks>
+      <ThingDef>Scrambler</ThingDef>
+    </descriptionHyperlinks>
+    <defaultLabelColor>(0.9, 0.5, 1.0)</defaultLabelColor>
+    <stages>
+      <li>
+        <minSeverity>0</minSeverity>
+        <statOffsets>
+          <SlaveSuppressionOffset>0.40</SlaveSuppressionOffset>
+          <Vulnerability>3.0</Vulnerability>
+        </statOffsets>
+        <capMods>
+          <li>
+            <capacity>Consciousness</capacity>
+            <setMax>0.6</setMax>
+          </li>
+          <li>
+            <capacity>Talking</capacity>
+            <setMax>0.2</setMax>
+          </li>
+        </capMods>
+      </li>
+    </stages>
+  </HediffDef>
+  
+   <ThingDef ParentName="BodyPartBionicBase">
+    <defName>Scrambler</defName>
+    <label>scrambler</label>
+    <description>A slaver implant, similar to the mindscrew, that can inject disorienting mind imagery directly into the visual cortex of the brain through a complex network of nanoelectrodes. Victims of scrambler implantation tend to socially withdraw to minimize additional stimulation. As a consequence of their confusion, they also become physically meek, making them easy to impose upon. Allies of implanted victims will be angered.</description>
+
+    <statBases>
+      <WorkToMake>50</WorkToMake>
+    </statBases>
+    <costList>
+      <ComponentIndustrial>8</ComponentIndustrial>
+      <ComponentSpacer>1</ComponentSpacer>
+    </costList>
+    <recipeMaker>
+      <researchPrerequisite>FertilityProcedures</researchPrerequisite>
+    </recipeMaker>
+  </ThingDef>
+</Defs>

Common/Defs/HiveOffspringChanceDef/HiveOffspringChanceDefs.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Defs>
-
-    <!-- 
-        For writing your own: 
-        1. specify your queenXenotype with an exactly matching name 
-        2. defName is not important
-        3. queen + drone + worker == 1
-
-        Otherwise, it should default to the ones specified for rjw_genes_default_hive_offspring_chances
-    -->
-
-	<RJW_Genes.HiveOffspringChanceDef>
-        <!-- Important: this default defName cannot be renamed! It is a protected keyword.-->
-        <!-- Changing the queenXenotype-Name will also throw an error.-->
-        <!-- But you can change the workerGenes list.-->
-		<defName>rjw_genes_default_hive_offspring_chances</defName>
-        <queenXenotype>default</queenXenotype>
-
-        <queenChance>0.02</queenChance>
-        <droneChance>0.48</droneChance>
-        <workerChance>0.5</workerChance>
-
-	</RJW_Genes.HiveOffspringChanceDef>
-
-	<RJW_Genes.HiveOffspringChanceDef>
-        <defName>rjw_genes_test_queen_offspring_chances</defName>
-        <queenXenotype>rjw_genes_test_queen_xenotype</queenXenotype>
-
-        <queenChance>0.02</queenChance>
-        <droneChance>0.28</droneChance>
-        <workerChance>0.7</workerChance>
-
-	</RJW_Genes.HiveOffspringChanceDef>
-	
-</Defs>

Common/Defs/JobDefs/Jobs_LifeForce.xml

@@ -4,21 +4,21 @@
 	<JobDef>
 		<defName>rjw_genes_lifeforce_randomrape</defName>
 		<driverClass>rjw.JobDriver_RandomRape</driverClass>
-		<reportString>Raping</reportString>
+		<reportString>raping</reportString>
 		<casualInterruptible>false</casualInterruptible>
 	</JobDef>
 	
 	<JobDef>
 		<defName>rjw_genes_lifeforce_healpussy</defName>
 		<driverClass>RJW_Genes.JobDriver_CastAbilityAfterSex</driverClass>
-		<reportString>Tending someones wounds with sex.</reportString>
+		<reportString>tending wounds with sex.</reportString>
 		<casualInterruptible>false</casualInterruptible>
 	</JobDef>
 	
 	<JobDef>
 		<defName>rjw_genes_lifeforce_seduced</defName>
 		<driverClass>RJW_Genes.JobDriver_Seduced</driverClass>
-		<reportString>Seduced.</reportString>
+		<reportString>seduced.</reportString>
 		<casualInterruptible>false</casualInterruptible>
 		<playerInterruptible>false</playerInterruptible>
 	</JobDef>
@@ -26,7 +26,7 @@
 	<JobDef>
 		<defName>rjw_genes_flirt</defName>
 		<driverClass>RJW_Genes.JobDriver_Flirt</driverClass>
-		<reportString>Seduced.</reportString>
+		<reportString>seduced.</reportString>
 		<casualInterruptible>false</casualInterruptible>
 	</JobDef>
 </Defs>

Common/Defs/JobDefs/Jobs_SexOnSpot.xml

@@ -4,7 +4,7 @@
 	<JobDef>
 		<defName>sex_on_spot</defName>
 		<driverClass>RJW_Genes.JobDriver_SexOnSpot</driverClass>
-		<reportString>Making love on the spot.</reportString>
+		<reportString>making love on the spot.</reportString>
 		<casualInterruptible>false</casualInterruptible>
 	</JobDef>
 	

Common/Defs/LetterDefs/AnotherBaby.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <LetterDef Name="AnotherBaby">
+    <defName>AnotherBaby</defName>
+    <color>(120, 176, 216)</color>
+    <flashColor>(106, 179, 231)</flashColor>
+    <flashInterval>40</flashInterval>
+    <arriveSound>LetterArrive_Good</arriveSound>
+    <pauseMode>MajorThreat</pauseMode>
+  </LetterDef>
+</Defs>

Common/Defs/PawnKindDefs/PawnKind_LifeForce.xml

@@ -45,7 +45,7 @@
 	
 	<PawnKindDef>
 		<defName>rjw_genes_incubus</defName>
-		<label>succubus</label>
+		<label>incubus</label>
 		<combatPower>50</combatPower>
 		<race>Human</race>
 		<xenotypeSet>

Common/Defs/QueenWorkerMappingDefs/QueenWorkerMappingDefs_base.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Defs>
-
-	<RJW_Genes.QueenWorkerMappingDef>
-        <!-- Important: this default defName cannot be renamed! It is a protected keyword.-->
-        <!-- Changing the queenXenotype-Name will also throw an error.-->
-        <!-- But you can change the workerGenes list.-->
-		<defName>rjw_genes_default_worker_genes</defName>
-        <queenXenotype>default</queenXenotype>
-		<workerGenes>
-			<li>StrongStomach</li>
-			<li MayRequire="sarg.alphagenes" >AG_FasterAging</li>
-			<li>PsychicAbility_Dull</li>
-			<li>FireTerror</li>
-			<li>Sterile</li>
-			<li>AptitudeTerrible_Intellectual</li>
-			<li>rjw_genes_featureless_chest</li>
-			<li>rjw_genes_worker</li>
-			<li>rjw_genes_zealous_loyalty</li>	
-		</workerGenes>
-	</RJW_Genes.QueenWorkerMappingDef>
-
-	<RJW_Genes.QueenWorkerMappingDef>
-        <defName>rjw_genes_halamyr_queen_worker_mapping</defName>
-        <queenXenotype>rjw_genes_halamyr_queen_xenotype</queenXenotype>
-		<workerGenes>
-			<li MayRequire="sarg.alphagenes" >AG_SmallerBodySize</li>
-			<li>StrongStomach</li>
-			<li MayRequire="sarg.alphagenes" >AG_EfficientMandibles</li>
-			<li MayRequire="sarg.alphagenes" >AG_FasterAging</li>
-			<li>PsychicAbility_Dull</li>
-			<li>FireTerror</li>
-			<li>Sterile</li>
-			<li MayRequire="sarg.alphagenes" >AG_FormicAntennas</li>
-			<li>Skin_DeepRed</li>
-			<li>AptitudeTerrible_Intellectual</li>
-			<li>rjw_genes_featureless_chest</li>
-			<li>rjw_genes_worker</li>
-			<li>rjw_genes_zealous_loyalty</li>
-		</workerGenes>
-	</RJW_Genes.QueenWorkerMappingDef>
-	
-</Defs>

Common/Defs/RecipeDefs/Bioscaffold.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>
+  <RecipeDef ParentName="SurgeryInstallImplantBase">
+    <defName>InstallBioscaffold</defName>
+    <label>install bioscaffold</label>
+    <description>Install a bioscaffold.</description>
+    <descriptionHyperlinks>
+      <ThingDef>Bioscaffold</ThingDef>
+      <HediffDef>Bioscaffold</HediffDef>
+    </descriptionHyperlinks>
+    <jobString>Installing bioscaffold.</jobString>
+    <ingredients>
+      <li>
+        <filter>
+          <thingDefs>
+            <li>Bioscaffold</li>
+          </thingDefs>
+        </filter>
+        <count>1</count>
+      </li>
+    </ingredients>
+    <fixedIngredientFilter>
+      <thingDefs>
+        <li>Bioscaffold</li>
+      </thingDefs>
+    </fixedIngredientFilter>
+    <appliedOnFixedBodyParts>
+      <li>Torso</li>
+    </appliedOnFixedBodyParts>
+    <addsHediff>Bioscaffold</addsHediff>
+  </RecipeDef>
+</Defs>

Common/Defs/RecipeDefs/LimbicStimulator.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>
+  <RecipeDef ParentName="SurgeryInstallImplantBase">
+    <defName>InstallLimbicStimulator</defName>
+    <label>install limbic stimulator</label>
+    <description>Install a limbic stimulator.</description>
+    <descriptionHyperlinks>
+      <ThingDef>LimbicStimulator</ThingDef>
+      <HediffDef>LimbicStimulator</HediffDef>
+    </descriptionHyperlinks>
+    <jobString>Installing limbic stimulator.</jobString>
+    <ingredients>
+      <li>
+        <filter>
+          <thingDefs>
+            <li>LimbicStimulator</li>
+          </thingDefs>
+        </filter>
+        <count>1</count>
+      </li>
+    </ingredients>
+    <fixedIngredientFilter>
+      <thingDefs>
+        <li>LimbicStimulator</li>
+      </thingDefs>
+    </fixedIngredientFilter>
+    <appliedOnFixedBodyParts>
+      <li>Brain</li>
+    </appliedOnFixedBodyParts>
+    <addsHediff>LimbicStimulator</addsHediff>
+  </RecipeDef>
+</Defs>

Common/Defs/RecipeDefs/OvaryAgitator.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>
+  <RecipeDef ParentName="SurgeryInstallImplantBase">
+    <defName>InstallOvaryAgitator</defName>
+    <label>install ovary agitator</label>
+    <description>Install an ovary agitator.</description>
+    <descriptionHyperlinks>
+      <ThingDef>OvaryAgitator</ThingDef>
+      <HediffDef>OvaryAgitator</HediffDef>
+    </descriptionHyperlinks>
+    <workerClass>Recipe_InstallImplant</workerClass>
+    <jobString>Installing ovary agitator.</jobString>
+    <isViolation>true</isViolation>
+    <ingredients>
+      <li>
+        <filter>
+          <thingDefs>
+            <li>OvaryAgitator</li>
+          </thingDefs>
+        </filter>
+        <count>1</count>
+      </li>
+    </ingredients>
+    <fixedIngredientFilter>
+      <thingDefs>
+        <li>OvaryAgitator</li>
+      </thingDefs>
+    </fixedIngredientFilter>
+    <appliedOnFixedBodyParts>
+      <li>Torso</li>
+    </appliedOnFixedBodyParts>
+    <addsHediff>OvaryAgitator</addsHediff>
+  </RecipeDef>
+</Defs>

Common/Defs/RecipeDefs/Scrambler.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>
+  <RecipeDef ParentName="SurgeryInstallImplantBase">
+    <defName>InstallScrambler</defName>
+    <label>install scrambler</label>
+    <description>Install a scrambler.</description>
+    <descriptionHyperlinks>
+      <ThingDef>Scrambler</ThingDef>
+      <HediffDef>Scrambler</HediffDef>
+    </descriptionHyperlinks>
+    <workerClass>Recipe_InstallImplant</workerClass>
+    <jobString>Installing scrambler.</jobString>
+    <isViolation>true</isViolation>
+    <ingredients>
+      <li>
+        <filter>
+          <thingDefs>
+            <li>Scrambler</li>
+          </thingDefs>
+        </filter>
+        <count>1</count>
+      </li>
+    </ingredients>
+    <fixedIngredientFilter>
+      <thingDefs>
+        <li>Scrambler</li>
+      </thingDefs>
+    </fixedIngredientFilter>
+    <appliedOnFixedBodyParts>
+      <li>Brain</li>
+    </appliedOnFixedBodyParts>
+    <addsHediff>Scrambler</addsHediff>
+  </RecipeDef>
+</Defs>

Common/Defs/Scenarios/Halamyr_Hive.xml

@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-  <ScenarioDef>
-    <defName>rjw_genes_scenario_halamyr_hive</defName>
-    <label>Halamyr Hive</label>
-    <description>A young queen set out to build a new hive. After a long path, a suitable place is found to generate new offspring. DEVNOTE: Try to choose a high-food biome to keep up with the Hive!</description>
-    <scenario>
-      <summary>A Halamyr queen set out to build a new hive.</summary>
-      <playerFaction>
-        <def>PlayerFaction</def>
-        <factionDef>PlayerTribe</factionDef>
-      </playerFaction>
-      <parts>
-
-
-        <!-- Config pages -->
-        <li Class="ScenPart_ConfigPage_ConfigureStartingPawns_Xenotypes">
-          <def>ConfigurePawnsXenotypes</def>
-          <pawnChoiceCount>4</pawnChoiceCount>
-          <customSummary>Start with a set of Halamyr Xenotypes and one other colonist of any age.</customSummary>
-
-          <xenotypeCounts>
-            <li>
-              <xenotype>rjw_genes_halamyr_queen_xenotype</xenotype>
-              <count>1</count>
-              <description>non-baby halamyr queen</description>
-              <requiredAtStart>true</requiredAtStart>
-              <allowedDevelopmentalStages>Adult</allowedDevelopmentalStages>
-            </li>
-
-            <li>
-              <xenotype>rjw_genes_halamyr_hiveguard_xenotype</xenotype>
-              <count>1</count>
-              <description>non-baby halamyr hiveguard</description>
-              <requiredAtStart>true</requiredAtStart>
-              <allowedDevelopmentalStages>Adult</allowedDevelopmentalStages>
-            </li>
-
-            <li>
-              <xenotype>rjw_genes_halamyr_breeder_xenotype</xenotype>
-              <count>1</count>
-              <description>adulthalamyr breeder</description>
-              <requiredAtStart>true</requiredAtStart>
-              <allowedDevelopmentalStages>Adult</allowedDevelopmentalStages>
-            </li>
-
-            <li>
-              <xenotype>Baseliner</xenotype>
-              <count>2</count>
-            </li>
-          </xenotypeCounts>
-        </li>
-
-        <!-- Player starting stuff spawn method-->
-        <li Class="ScenPart_PlayerPawnsArriveMethod">
-          <def>PlayerPawnsArriveMethod</def>
-          <method>Standing</method>
-        </li>
-
-        <!-- Player pawns modifiers -->
-        <li Class="ScenPart_ForcedHediff">
-          <def>ForcedHediff</def>
-          <visible>false</visible>
-          <context>PlayerStarter</context>
-          <chance>0.5</chance>
-          <hediff>Malnutrition</hediff>
-          <severityRange>0.1~0.2</severityRange>
-        </li>
-        <li Class="ScenPart_SetNeedLevel">
-          <def>SetNeedLevel</def>
-          <visible>false</visible>
-          <context>PlayerStarter</context>
-          <chance>1.0</chance>
-          <need>Food</need>
-          <levelRange>0.3~0.8</levelRange>
-        </li>
-
-        <!-- Player starting things -->
-        <li Class="ScenPart_StartingThing_Defined">
-          <def>StartingThing_Defined</def>
-          <thingDef>Silver</thingDef>
-          <count>300</count>
-        </li>
-        <li Class="ScenPart_StartingThing_Defined">
-          <def>StartingThing_Defined</def>
-          <thingDef>Pemmican</thingDef>
-          <count>350</count>
-        </li>
-        <li Class="ScenPart_StartingThing_Defined">
-          <def>StartingThing_Defined</def>
-          <thingDef>InsectJelly</thingDef>
-          <count>300</count>
-        </li>
-        <li Class="ScenPart_StartingThing_Defined">
-          <def>StartingThing_Defined</def>
-          <thingDef>MedicineHerbal</thingDef>
-          <count>30</count>
-        </li>
-        <li Class="ScenPart_StartingThing_Defined">
-          <def>StartingThing_Defined</def>
-          <thingDef>MeleeWeapon_Club</thingDef>
-          <stuff>WoodLog</stuff>
-        </li>
-
-        <li Class="ScenPart_StartingAnimal">
-          <def>StartingAnimal</def>
-          <animalKind>Spelopede</animalKind>
-          <count>2</count>
-        </li>
-        <li Class="ScenPart_StartingAnimal">
-          <def>StartingAnimal</def>
-          <animalKind>Megascarab</animalKind>
-          <count>3</count>
-          <bondToRandomPlayerPawnChance>1.0</bondToRandomPlayerPawnChance>
-        </li>
-
-        <li Class="ScenPart_StartingAnimal">
-          <def>StartingAnimal</def>
-          <animalKind>Megaspider</animalKind>
-          <count>1</count>
-        </li>
-
-        <!-- Scatter some things near player start -->
-        <li Class="ScenPart_ScatterThingsNearPlayerStart">
-          <def>ScatterThingsNearPlayerStart</def>
-          <thingDef>WoodLog</thingDef>
-          <count>500</count>
-        </li>
-        <li Class="ScenPart_ScatterThingsNearPlayerStart">
-          <def>ScatterThingsNearPlayerStart</def>
-          <thingDef>Jade</thingDef>
-          <count>100</count>
-        </li>
-        
-        <li Class="ScenPart_ScatterThingsNearPlayerStart">
-          <def>ScatterThingsNearPlayerStart</def>
-          <thingDef>Pemmican</thingDef>
-          <count>150</count>
-        </li>
-        <li Class="ScenPart_ScatterThingsNearPlayerStart">
-          <def>ScatterThingsNearPlayerStart</def>
-          <thingDef>Steel</thingDef>
-          <count>200</count>
-        </li>
-
-        <!-- Game start dialog -->
-        <li Class="ScenPart_GameStartDialog">
-          <def>GameStartDialog</def>
-          <text>After a long journey, this is it: \n\nThis is the right place to start the new hive. Spin in your breeders, build your defenses and start mating.\n\nMake this a place worthy for a queen.</text>
-          <closeSound>GameStartSting</closeSound>
-        </li>
-
-      </parts>
-    </scenario>
-  </ScenarioDef>
-
-</Defs>

Common/Defs/ThoughtDefs/Thoughts_Hive.xml

@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<Defs>
-
-	<ThoughtDef>
-		<!-- For Challenged Queens -->
-		<defName>rjw_genes_rival_queen_mood</defName>
-		<workerClass>RJW_Genes.Thoughtworker_RivalQueen_Mood</workerClass>
-		<validWhileDespawned>false</validWhileDespawned>
-		<stages>
-			<li>
-				<label>Rivaled</label>
-				<description>There is another queen nearby!</description>
-				<baseMoodEffect>-70</baseMoodEffect>
-			</li>
-		</stages>
-	</ThoughtDef>
-
-	<ThoughtDef>
-		<!-- For Challenged Queens -->
-		<defName>rjw_genes_rival_queen_social</defName>
-		<thoughtClass>Thought_SituationalSocial</thoughtClass>
-		<workerClass>RJW_Genes.Thoughtworker_RivalQueen_Social</workerClass>
-		<stages>
-			<li>
-				<label>rivals me</label>
-				<description>{0} threatens my dominion. {0} must be perished.</description>
-				<baseOpinionOffset>-130</baseOpinionOffset>
-			</li>
-		</stages>
-	</ThoughtDef>
-
-	<ThoughtDef>
-		<defName>rjw_genes_queen_despises_workers_social</defName>
-		<thoughtClass>Thought_SituationalSocial</thoughtClass>
-		<workerClass>RJW_Genes.ThoughtWorker_WorkerDespised_Social</workerClass>
-		<stages>
-			<li>
-				<label>underling</label>
-				<description>those workers are not even worth a glance.</description>
-				<baseOpinionOffset>-20</baseOpinionOffset>
-			</li>
-		</stages>
-	</ThoughtDef>
-
-	<ThoughtDef>
-		<!-- For Loyal Pawns -->
-		<defName>rjw_genes_multiple_queens_mood</defName>
-		<workerClass>RJW_Genes.Thoughtworker_MultipleQueens_Mood</workerClass>
-		<validWhileDespawned>false</validWhileDespawned>
-		<stages>
-			<li>
-				<label>Confused Servitude</label>
-				<description>I have too many queens around me!</description>
-				<baseMoodEffect>-30</baseMoodEffect>
-			</li>
-		</stages>
-	</ThoughtDef>
-
-	<ThoughtDef>
-		<!-- For Loyal Pawns -->
-		<defName>rjw_genes_queen_loyalty_social</defName>
-		<thoughtClass>Thought_SituationalSocial</thoughtClass>
-		<workerClass>RJW_Genes.Thoughtworker_QueenPresent_Social</workerClass>
-		<stages>
-			<li>
-				<label>Worship</label>
-				<description>{0} is my queen. My one and only reason to live.</description>
-				<baseOpinionOffset>+80</baseOpinionOffset>
-			</li>
-		</stages>
-	</ThoughtDef>
-
-	<ThoughtDef>
-		<!-- For Loyal Pawns -->
-		<defName>rjw_genes_no_queen_mood</defName>
-		<workerClass>RJW_Genes.Thoughtworker_QueenAbsent_Mood</workerClass>
-		<validWhileDespawned>false</validWhileDespawned>
-		<stages>
-			<li>
-				<label>Missing Queen</label>
-				<description>We do not have a queen! How are we suppossed to face the cruelties of the world without a shepherd?</description>
-				<baseMoodEffect>-20</baseMoodEffect>
-			</li>
-		</stages>
-	</ThoughtDef>
-
-	<ThoughtDef>
-		<!-- For Loyal Pawns -->
-		<defName>rjw_genes_queen_present_mood</defName>
-		<workerClass>RJW_Genes.Thoughtworker_QueenPresent_Mood</workerClass>
-		<validWhileDespawned>false</validWhileDespawned>
-		<stages>
-			<li>
-				<label>Queen Present</label>
-				<description>Our queen is so wonderful.</description>
-				<baseMoodEffect>+10</baseMoodEffect>
-			</li>
-		</stages>
-	</ThoughtDef>
-
-</Defs>

Common/Defs/ThoughtDefs/Thoughts_Memories.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>
+  <ThoughtDef>
+		<defName>RegretsStealingLovin</defName>
+		<thoughtClass>Thought_Memory</thoughtClass>
+		<durationDays>1.5</durationDays>
+		<stackLimit>3</stackLimit>
+		<stackedEffectMultiplier>0.4</stackedEffectMultiplier>
+		<stages>
+			<li>
+				<label>regrets stealing some lovin'</label>
+				<description>I don't remember how or why, but I violated someone. It felt good in the moment, but it felt so wrong afterward. My cravings from my implant are just too strong!</description>
+				<baseMoodEffect>-5</baseMoodEffect>
+			</li>
+		</stages>
+	</ThoughtDef>
+</Defs>

Common/Defs/ThoughtDefs/Thoughts_Special.xml

@@ -8,7 +8,7 @@
 		<workerClass>RJW_Genes.ThoughtWorker_Aphrodisiac_Pheromones_Social</workerClass>
 		<stages>
 			<li>
-				<label>Pheromones</label>
+				<label>pheromones</label>
 				<description>{0} has a special vibe, we should hang out more often.</description>
 				<baseOpinionOffset>+3</baseOpinionOffset>
 			</li>

Common/Languages/English/Keyed/Bestiality.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+	<rjw_genes_bestiality_hybrid_name>animal-hybrid</rjw_genes_bestiality_hybrid_name>
+</LanguageData>

Common/Languages/English/Keyed/Dialog_StatsReport.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<LanguageData>
-
-  <StatsReport_QueenCloseBy>queen in proximity</StatsReport_QueenCloseBy>
-  <StatsReport_QueenAbsent>queen absent</StatsReport_QueenAbsent>
-  <StatsReport_MultipleQueens>multiple queens present</StatsReport_MultipleQueens>
-
-</LanguageData>

Common/Languages/English/Keyed/Hive.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LanguageData>
-
-    <rjw_genes_queenbirth_letter_label>New Queen</rjw_genes_queenbirth_letter_label>
-    <rjw_genes_queenbirth_letter_description>A new Queen was born! Make sure to adress inheritance before the new queen reaches adolesence.</rjw_genes_queenbirth_letter_description>
-
-</LanguageData>

Common/Languages/English/Keyed/Mod_Settings.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+	<rjw_genes_settings_genitalia_resizing_age>Genitalia resizing age:</rjw_genes_settings_genitalia_resizing_age>
+    <rjw_genes_settings_genitalia_resizing_postfix>years</rjw_genes_settings_genitalia_resizing_postfix>
+    <rjw_genes_settings_genitalia_resizing_age_explanation>At this age (in biological years) any resizing gene will be applied. This is done to prevent changes and issues related to genitalia changing in the pawns growth, but also for 'ethics'.</rjw_genes_settings_genitalia_resizing_age_explanation>
+
+    <rjw_genes_settings_fertilin_gain_from_animals>Fertilin-Gain from Animals:</rjw_genes_settings_fertilin_gain_from_animals>
+    <rjw_genes_settings_fertilin_gain_from_animals_explanation>% of fertilin gained (compared to human-baseline).</rjw_genes_settings_fertilin_gain_from_animals_explanation>
+
+    <rjw_genes_settings_sexdemon_spawn_key>Sexdemon Visits</rjw_genes_settings_sexdemon_spawn_key>
+    <rjw_genes_settings_sexdemon_spawn_explanation>If enabled, incubi and succubi can spawn in through an event.</rjw_genes_settings_sexdemon_spawn_explanation>
+    <rjw_genes_settings_sexdemon_size_matters_key>Size matters</rjw_genes_settings_sexdemon_size_matters_key>
+    <rjw_genes_settings_sexdemon_size_matters_explanation>Incubi and succubi will consider size/tightness of partners genital for deciding if they want to join</rjw_genes_settings_sexdemon_size_matters_explanation>
+    <rjw_genes_settings_sexdemon_group_spawn_key>Sexdemon groups</rjw_genes_settings_sexdemon_group_spawn_key>
+    <rjw_genes_settings_sexdemon_group_spawn_explanation>Multiple sexdemons can spawn during a event</rjw_genes_settings_sexdemon_group_spawn_explanation>
+    <rjw_genes_settings_sexdemon_succubi_spawn_key>Succubi</rjw_genes_settings_sexdemon_succubi_spawn_key>
+    <rjw_genes_settings_sexdemon_succubi_spawn_explanation>Allow Succubi to spawn through this event</rjw_genes_settings_sexdemon_succubi_spawn_explanation>
+    <rjw_genes_settings_sexdemon_incubi_spawn_key>Incubi</rjw_genes_settings_sexdemon_incubi_spawn_key>
+    <rjw_genes_settings_sexdemon_incubi_spawn_explanation>Allow Incubi to spawn through this event</rjw_genes_settings_sexdemon_incubi_spawn_explanation>
+
+    <rjw_genes_settings_regret_stealing_love_key>Regret Stealing Love</rjw_genes_settings_regret_stealing_love_key>
+    <rjw_genes_settings_regret_stealing_love_explanation>If off, pawns will not get bad thoughts for seduction.</rjw_genes_settings_regret_stealing_love_explanation>
+
+
+    <rjw_genes_settings_animal_mating_needs_penis_key>Animal-Mating GenitalCheck</rjw_genes_settings_animal_mating_needs_penis_key>
+    <rjw_genes_settings_animal_mating_needs_penis_explanation>If on, only animals that 'can rape' will be engaging in bestiality after being hit by a animal mating pulse. This usually means that only male animals will start breeding.</rjw_genes_settings_animal_mating_needs_penis_explanation>
+
+    <rjw_genes_settings_generous_donor_cheatmode_key>generous-donor cheatmode</rjw_genes_settings_generous_donor_cheatmode_key>
+    <rjw_genes_settings_generous_donor_cheatmode_explanation>When enabled, pawns with the 'generous donor' are not drained and not fertilin exhausted. Hence they can fuel succubi and incubi non-stop. This makes them drastically easier to keep, and you should not do it.</rjw_genes_settings_generous_donor_cheatmode_explanation>
+
+    <rjw_genes_settings_detailed_debug_key>detailed-debug</rjw_genes_settings_detailed_debug_key>
+    <rjw_genes_settings_detailed_debug_explanation>Adds detailed information to the log about interactions and genes.</rjw_genes_settings_detailed_debug_explanation>
+</LanguageData>

Common/Languages/English/Keyed/Mod_Settings_AnimalGeneInheritance.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+	
+    <rjw_genes_animal_inheritance_settings_enabled_key>enabled</rjw_genes_animal_inheritance_settings_enabled_key>
+    <rjw_genes_animal_inheritance_settings_enabled_explanation>If toggled, Animal Pregnancies will try inherit genes.</rjw_genes_animal_inheritance_settings_enabled_explanation>
+
+    <rjw_genes_animal_inheritance_settings_chance_key></rjw_genes_animal_inheritance_settings_chance_key>
+    <rjw_genes_animal_inheritance_settings_chance_explanation></rjw_genes_animal_inheritance_settings_chance_explanation>
+
+    <rjw_genes_animal_inheritance_settings_added_as_xenogene_key>genes as xenogenes</rjw_genes_animal_inheritance_settings_added_as_xenogene_key>
+    <rjw_genes_animal_inheritance_settings_added_as_xenogene_explanation>If toggled on, animal genes will be added as xenogenes.</rjw_genes_animal_inheritance_settings_added_as_xenogene_explanation>
+
+    <rjw_genes_animal_inheritance_settings_ve_genetics_hybridization_key>enable VE genetics hybridation</rjw_genes_animal_inheritance_settings_ve_genetics_hybridization_key>
+    <rjw_genes_animal_inheritance_settings_ve_genetics_hybridization_explanation>If enabled and if you have VE genetics it will enable the hybridation system.</rjw_genes_animal_inheritance_settings_ve_genetics_hybridization_explanation>
+
+    <rjw_genes_animal_inheritance_settings_detailed_debug_key></rjw_genes_animal_inheritance_settings_detailed_debug_key>
+    <rjw_genes_animal_inheritance_settings_detailed_debug_explanation></rjw_genes_animal_inheritance_settings_detailed_debug_explanation>
+</LanguageData>

Common/Patches/Genes/Patch_Highmates.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Highmate</li>
+		</mods>
+		<match Class="PatchOperationReplace">
+			<xpath>/Defs/AbilityDef[defName="VRE_InitiateLovin"]/comps</xpath>
+			<value>
+				<comps>
+					<li Class = "RJW_Genes.CompProperties_Seduce">
+						<compClass>RJW_Genes.CompAbilityEffect_Seduce</compClass>
+						<destination>Caster</destination>
+					</li>
+				</comps>
+			</value>
+		</match>
+	</Operation>
+</Patch>
+

Common/Patches/Genes/Patch_Insector_ChestEggs.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+    <Operation Class="PatchOperationFindMod">
+        <mods>
+            <li>Vanilla Races Expanded - Insector</li>
+        </mods>
+        <match Class="PatchOperationAdd">
+            <xpath>Defs/GeneDef[defName = "VRE_ChestburstPregnancy"]/exclusionTags</xpath>
+            <value>
+                <li>rjw_genes_littered_birth_vs_chestburst</li>
+            </value>
+        </match>
+    </Operation>
+
+</Patch>

Common/Patches/Genes/Vanilla_Quirk_Patch.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Patch>
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/GeneDef[defName="Furskin"]</xpath>
+		<value>
+			<modExtensions>
+				<li Class="RJW_Genes.QirkExtension">
+				<Satisfiedquirk>FurLoverQuirk</Satisfiedquirk>
+				</li>
+			</modExtensions>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/GeneDef[defName="Head_Gaunt"]</xpath>
+		<value>
+			<modExtensions>
+				<li Class="RJW_Genes.QirkExtension">
+				<Satisfiedquirk>TeratophileQuirk</Satisfiedquirk>
+				</li>
+			</modExtensions>
+		</value>
+	</Operation>
+</Patch>
+

Common/Patches/ThingDefs/Sexperience_Cum.xml

@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
 
 	<!-- 
 		DevNote:
-		There used to be an issue with a Gene-Mod Called "Cum-Addiction Gene". That mod just overwrote the complete UsedCondom.xml and Sexperience Cum.xml
+		There used to be an issue with a Gene-Mod Called "Cum-Addiction Gene". That mod just overwrote the
+	complete UsedCondom.xml and Sexperience Cum.xml
 		This would lead to two types of failures: 
 		A) If this mod was before the other mod, changes were just overwritten
 		B) If this mod was after, there was an issue in targetting the XML throwing a patch error
@@ -11,26 +12,30 @@
 
 		This patch was kindly mirrored after Infis Patch of UsedCondoms. 
 	-->
-
+	<Operation Class="PatchOperationFindMod">
-	<Operation Class="PatchOperationConditional">
+		<mods>
-		<xpath>Defs/ThingDef[defName="GatheredCum"]/ingestible/outcomeDoers</xpath>
+			<li>RJW Sexperience</li>
-		<nomatch Class="PatchOperationAdd">
+		</mods>
-			<xpath>/Defs/ThingDef[defName="GatheredCum"]/ingestible</xpath>
+		<match Class="PatchOperationConditional">
-			<value>
+			<xpath>Defs/ThingDef[defName="GatheredCum"]/ingestible/outcomeDoers</xpath>
-				<outcomeDoers>
+			<nomatch Class="PatchOperationAdd">
+				<xpath>/Defs/ThingDef[defName="GatheredCum"]/ingestible</xpath>
+				<value>
+					<outcomeDoers>
+						<li Class="RJW_Genes.IngestionOutcomeDoer_LifeForceOffset">
+							<FertilinPerUnit>1</FertilinPerUnit>
+						</li>
+					</outcomeDoers>
+				</value>
+			</nomatch>
+			<match Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="GatheredCum"]/ingestible/outcomeDoers</xpath>
+				<value>
 					<li Class="RJW_Genes.IngestionOutcomeDoer_LifeForceOffset">
 						<FertilinPerUnit>1</FertilinPerUnit>
 					</li>
-				</outcomeDoers>
+				</value>
-			</value>
+			</match>
-		</nomatch>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs/ThingDef[defName="GatheredCum"]/ingestible/outcomeDoers</xpath>
-			<value>
-				<li Class="RJW_Genes.IngestionOutcomeDoer_LifeForceOffset">
-						<FertilinPerUnit>1</FertilinPerUnit>
-					</li>
-			</value>
 		</match>
 	</Operation>
 

Common/Patches/Xenotypes/GenitaliaUpdate.xml

@@ -14,13 +14,8 @@
 		<value>
 			<li>rjw_genes_much_cum</li>
 			<li>rjw_genes_zoophile</li>
-		</value>
+			<li>rjw_genes_Pig_genitalia</li>
-	</Operation>
+			<li>rjw_genes_human_genitalia</li>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/XenotypeDef[defName="Waster"]/genes</xpath>
-		<value>
-			<li>rjw_genes_insectbreeder</li>
 		</value>
 	</Operation>
 

Common/Patches/Xenotypes/PatchAlphaGenes.xml

@@ -1,125 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
-    <Operation Class="PatchOperationSequence">
+  <Operation Class="PatchOperationFindMod">
-        <operations>
+    <mods>
-            <li Class="PatchOperationFindMod">
+      <li>Alpha Genes</li>
-                <mods>
+    </mods>
-                    <li>Alpha Genes</li>
+    <match Class="PatchOperationSequence">
-                </mods>
+      <operations>
-                <match Class="PatchOperationAdd">
+        <li Class="PatchOperationAdd">
-                    <xpath>Defs/XenotypeDef[defName="AG_Fleetkind"]/genes</xpath>
+          <xpath>Defs/XenotypeDef[defName="AG_Fleetkind"]/genes</xpath>
-                    <value>
+          <value>
-                        <li>rjw_genes_slime_genitalia</li>
+            <li>rjw_genes_slime_genitalia</li>
-                        <li MayRequire="LustLicentia.RJWLabs">rjw_genes_elasticity</li>
+            <li MayRequire="LustLicentia.RJWLabs">rjw_genes_elasticity</li>
-                    </value>
+          </value>
-                </match>
+        </li>
-            </li>
         
-            <li Class="PatchOperationFindMod">
+        <li Class="PatchOperationAdd">
-                <mods>
+          <xpath>Defs/XenotypeDef[defName="AG_Helixien"]/genes</xpath>
-                    <li>Alpha Genes</li>
+          <value>
-                </mods>
+            <li>rjw_genes_slime_genitalia</li>
-                <match Class="PatchOperationAdd">
+            <li MayRequire="LustLicentia.RJWLabs">rjw_genes_elasticity</li>
-                    <xpath>Defs/XenotypeDef[defName="AG_Helixien"]/genes</xpath>
+          </value>
-                    <value>
+        </li>
-                        <li>rjw_genes_slime_genitalia</li>
-                        <li MayRequire="LustLicentia.RJWLabs">rjw_genes_elasticity</li>
-                    </value>
-                </match>
-            </li>
         
-            <li Class="PatchOperationFindMod">
+        <li Class="PatchOperationAdd">
-                <mods>
+          <xpath>Defs/XenotypeDef[defName="AG_Taukai"]/genes</xpath>
-                    <li>Alpha Genes</li>
+          <value>
-                </mods>
+            <li>rjw_genes_sexual_mytosis</li>
-                <match Class="PatchOperationAdd">
+          </value>
-                    <xpath>Defs/XenotypeDef[defName="AG_Taukai"]/genes</xpath>
+        </li>
-                    <value>
-                        <li>rjw_genes_sexual_mytosis</li>
-                    </value>
-                </match>
-            </li>
         
-            <li Class="PatchOperationFindMod">
+        <li Class="PatchOperationAdd">
-                <mods>
+          <xpath>Defs/XenotypeDef[defName="AG_MindDevourer"]/genes</xpath>
-                    <li>Alpha Genes</li>
+          <value>
-                </mods>
+            <li>rjw_genes_demonic_genitalia</li>
-                <match Class="PatchOperationAdd">
+            <li>rjw_genes_sex_age_drain</li>
-                    <xpath>Defs/XenotypeDef[defName="AG_MindDevourer"]/genes</xpath>
+          </value>
-                    <value>
+        </li>
-                        <li>rjw_genes_demonic_genitalia</li>
-                        <li>rjw_genes_sex_age_drain</li>
-                    </value>
-                </match>
-            </li>
         
-            <li Class="PatchOperationFindMod">
+        <li Class="PatchOperationAdd">
-                <mods>
+          <xpath>Defs/XenotypeDef[defName="AG_Lapis"]/genes</xpath>
-                    <li>Alpha Genes</li>
+          <value>
-                </mods>
+            <li>rjw_genes_big_breasts</li>
-                <match Class="PatchOperationAdd">
+            <li>rjw_genes_no_cum</li>
-                    <xpath>Defs/XenotypeDef[defName="AG_Lapis"]/genes</xpath>
+            <li>rjw_genes_big_male_genitalia</li>
-                    <value>
+          </value>
-                        <li>rjw_genes_big_breasts</li>
+        </li>
-                        <li>rjw_genes_no_cum</li>
-                        <li>rjw_genes_big_male_genitalia</li>
-                    </value>
-                </match>
-            </li>
         
-            <li Class="PatchOperationFindMod">
+        <li Class="PatchOperationAdd">
-                <mods>
+          <xpath>Defs/XenotypeDef[defName="AG_Efreet"]/genes</xpath>
-                    <li>Alpha Genes</li>
+          <value>
-                </mods>
+            <li>rjw_genes_demonic_genitalia</li>
-                <match Class="PatchOperationAdd">
+            <li>rjw_genes_small_breasts</li>
-                    <xpath>Defs/XenotypeDef[defName="AG_Efreet"]/genes</xpath>
+            <li>rjw_genes_tight_female_genitalia</li>
-                    <value>
+            <li>rjw_genes_tight_anus</li>
-                        <li>rjw_genes_demonic_genitalia</li>
+          </value>
-                        <li>rjw_genes_small_breasts</li>
+        </li>
-                        <li>rjw_genes_tight_female_genitalia</li>
-                        <li>rjw_genes_tight_anus</li>
-                    </value>
-                </match>
-            </li>
         
-            <li Class="PatchOperationFindMod">
+        <li Class="PatchOperationAdd">
-                <mods>
+          <xpath>Defs/XenotypeDef[defName="AG_Drakonori"]/genes</xpath>
-                    <li>Alpha Genes</li>
+          <value>
-                </mods>
+            <li>rjw_genes_dragon_genitalia</li>
-                <match Class="PatchOperationAdd">
+            <li>rjw_genes_big_male_genitalia</li>
-                    <xpath>Defs/XenotypeDef[defName="AG_Animusen"]/genes</xpath>
+            <li>rjw_genes_aphrodisiac_pheromones</li>
-                    <value>
+            <li>rjw_genes_big_breasts</li>
-                        <li>rjw_genes_canine_genitalia</li>
+          </value>
-                    </value>
+        </li>
-                </match>
-            </li>
         
-            <li Class="PatchOperationFindMod">
+        <li Class="PatchOperationAdd">
-                <mods>
+          <xpath>Defs/XenotypeDef[defName="AG_Animusen"]/genes</xpath>
-                    <li>Alpha Genes</li>
+          <value>
-                </mods>
+            <li>rjw_genes_canine_genitalia</li>
-                <match Class="PatchOperationAdd">
+          </value>
-                    <xpath>Defs/XenotypeDef[defName="AG_Drakonori"]/genes</xpath>
+        </li>
-                    <value>
-                        <li>rjw_genes_dragon_genitalia</li>
-                        <li>rjw_genes_big_male_genitalia</li>
-                        <li>rjw_genes_aphrodisiac_pheromones</li>
-                        <li>rjw_genes_big_breasts</li>
-                    </value>
-                </match>
-            </li>
         
-            <li Class="PatchOperationFindMod">
+        <li Class="PatchOperationFindMod">
-                <mods>
+          <mods>
-                    <li>Alpha Genes</li>
+            <li>Vanilla Races Expanded - Sanguophage</li>
-                </mods>
+          </mods>
-                <match Class="PatchOperationAdd">
+          <match Class="PatchOperationAdd">
-                    <xpath>Defs/XenotypeDef[defName="AG_Malachai"]/genes</xpath>
+            <xpath>Defs/XenotypeDef[defName="AG_Malachai"]/genes</xpath>
-                    <value>
+            <value>
-                        <li>rjw_genes_demonic_genitalia</li>
+              <li>rjw_genes_demonic_genitalia</li>
-                    </value>
+            </value>
-                </match>
+          </match>
-            </li>
+        </li>
-        </operations>
+        
-    </Operation>
+      </operations>
+    </match>
+  </Operation>
 </Patch>

Common/Patches/Xenotypes/PatchBSHeavHell.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Patch>
+  <Operation Class="PatchOperationFindMod">
+    <mods>
+      <li>Big and Small - Heaven and Hell</li>
+    </mods>
+    <match Class="PatchOperationSequence">
+      <operations>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="BS_Authority"]/genes</xpath>
+          <value>
+            <li>rjw_genes_big_male_genitalia</li>
+            <li>rjw_genes_big_breasts</li>
+            <li>rjw_genes_no_sex_need</li>
+            <li MayRequire="LustLicentia.RJWLabs">rjw_genes_generous_donor</li>
+            <li MayRequire="rjw.sexperience">AptitudePoor_Sex</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="BS_Malakim"]/genes</xpath>
+          <value>
+            <li>rjw_genes_small_breasts</li>
+            <li MayRequire="LustLicentia.RJWLabs">rjw_genes_generous_donor</li>
+            <li MayRequire="rjw.sexperience">AptitudeTerrible_Sex</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="BS_Satan"]/genes</xpath>
+          <value>
+            <li>rjw_genes_big_male_genitalia</li>
+            <li>rjw_genes_big_breasts</li>
+            <li>rjw_genes_human_genitalia</li>
+            <li>rjw_genes_equine_genitalia</li>
+            <li>rjw_genes_reptilian_genitalia</li>
+            <li>rjw_genes_crocodilian_genitalia</li>
+            <li MayRequire="rjw.sexperience">AptitudeStrong_Sex</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="BS_Grigori"]/genes</xpath>
+          <value>
+            <li MayRequire="LustLicentia.RJWLabs">rjw_genes_generous_donor</li>
+            <li MayRequire="rjw.sexperience">AptitudeStrong_Sex</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="BS_Nephilim"]/genes</xpath>
+          <value>
+            <li>rjw_genes_big_male_genitalia</li>
+            <li>rjw_genes_big_breasts</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="BS_Lilim"]/genes</xpath>
+          <value>
+            <li>rjw_genes_hypersexual</li>
+            <li MayRequire="rjw.sexperience">AptitudeStrong_Sex</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="BS_Glutton"]/genes</xpath>
+          <value>
+            <li>rjw_genes_demonic_genitalia</li>
+            <li>rjw_genes_big_male_genitalia</li>
+            <li>rjw_genes_loose_female_genitalia</li>
+            <li>rjw_genes_loose_anus</li>
+            <li>rjw_genes_extra_vagina</li>
+            <li>rjw_genes_extra_anus</li>
+            <li MayRequire="LustLicentia.RJWLabs">rjw_genes_cumflation_immunity</li>
+            <li MayRequire="rjw.sexperience">AptitudeStrong_Sex</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="BS_LilGlutton"]/genes</xpath>
+          <value>
+            <li>rjw_genes_demonic_genitalia</li>
+            <li>rjw_genes_small_male_genitalia</li>
+            <li>rjw_genes_tight_female_genitalia</li>
+            <li>rjw_genes_tight_anus</li>
+            <li>rjw_genes_extra_vagina</li>
+            <li>rjw_genes_extra_anus</li>
+            <li MayRequire="LustLicentia.RJWLabs">rjw_genes_likes_cumflation</li>
+            <li MayRequire="LustLicentia.RJWLabs">rjw_genes_elastic</li>
+            <li MayRequire="rjw.sexperience">AptitudeStrong_Sex</li>
+          </value>
+        </li>
+
+        <!-- Remaining demon patches are in PatchBSShared.xml. -->
+      </operations>
+    </match>
+  </Operation>
+</Patch>

Common/Patches/Xenotypes/PatchBSMore.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Patch>
+  <Operation Class="PatchOperationFindMod">
+    <mods>
+      <li>Big and Small - More Xenotypes</li>
+    </mods>
+    <match Class="PatchOperationSequence">
+      <operations>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="BS_Weaver" or defName="BS_Devilspider"]/genes</xpath>
+          <value>
+            <li>rjw_genes_ovipositor_genitalia</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="BS_Abomination"]/genes</xpath>
+          <value>
+            <li>rjw_genes_Tentacle_genitalia</li>
+            <li>rjw_genes_reptilian_genitalia</li>
+            <li>rjw_genes_human_genitalia</li>
+          </value>
+        </li>
+      </operations>
+    </match>
+  </Operation>
+</Patch>

Common/Patches/Xenotypes/PatchBSRaces.xml

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Patch>
+  <Operation Class="PatchOperationFindMod">
+    <mods>
+      <li>Big and Small - Races</li>
+    </mods>
+    <match Class="PatchOperationSequence">
+      <operations>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="BS_Ogre"]/genes</xpath>
+          <value>
+            <li>rjw_genes_Orc_genitalia</li>
+            <li>rjw_genes_much_cum</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="BS_GreatOgre"]/genes</xpath>
+          <value>
+            <li>rjw_genes_Orc_genitalia</li>
+            <li>rjw_genes_very_much_cum</li>
+            <li>rjw_genes_big_male_genitalia</li>
+            <li>rjw_genes_big_breasts</li>
+            <li>rjw_genes_loose_female_genitalia</li>
+            <li>rjw_genes_loose_anus</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="BS_Troll"]/genes</xpath>
+          <value>
+            <li>rjw_genes_Orc_genitalia</li>
+            <li>rjw_genes_evergrowth</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="BS_Jotun"
+            or defName="BS_FrostJotun"
+            or defName="BS_FireJotun"
+            or defName="BS_Surtr"
+            or defName="BS_Ymir"
+            or defName="BS_Half_Jotun"
+            ]/genes</xpath>
+          <value>
+            <li>rjw_genes_big_male_genitalia</li>
+            <li>rjw_genes_big_breasts</li>
+            <li>rjw_genes_orgasm_rush</li>
+          </value>
+        </li>
+        <li Class="PatchOperationFindMod">
+          <mods>
+            <li>Alpha Genes</li>
+          </mods>
+          <match Class="PatchOperationAdd">
+            <xpath>Defs/XenotypeDef[defName="BS_Corrupterd_Titan"]/genes</xpath> <!-- sic -->
+            <value>
+              <li>rjw_genes_rapist</li>
+              <li>rjw_genes_Tentacle_genitalia</li>
+            </value>
+          </match>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="BS_Gnome"]/genes</xpath>
+          <value>
+            <li>rjw_genes_tight_female_genitalia</li>
+            <li>rjw_genes_tight_anus</li>
+            <li>rjw_genes_very_much_cum</li>
+            <li MayRequire="LustLicentia.RJWLabs">rjw_genes_likes_cumflation</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="BS_Dwarf" or defName="BS_Svartalf"]/genes</xpath>
+          <value>
+            <li>rjw_genes_big_male_genitalia</li>
+          </value>
+        </li>   
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="BS_Redcap"]/genes</xpath>
+          <value>
+            <li>LitteredBirths</li>
+            <li>rjw_genes_tight_female_genitalia</li>
+            <li>rjw_genes_tight_anus</li>
+            <li>rjw_genes_much_cum</li>
+            <li>rjw_genes_rapist</li>
+          </value>
+        </li>   
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName = "BS_Hearthguard" or defName = "BS_Hearthdoll" or defName = "BS_PilotableFleshGolem" or defName="BS_FleshGolemServant"]/genes</xpath>
+          <value>
+            <li>rjw_genes_no_sex_need</li>
+          </value>
+        </li>   
+      </operations>
+    </match>
+  </Operation>
+</Patch>

Common/Patches/Xenotypes/PatchBSShared.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Patch>
+  <Operation Class="PatchOperationFindMod">
+    <mods>
+      <li>Big and Small - Genes &amp; More</li>
+    </mods>
+    <match Class="PatchOperationSequence">
+      <operations>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[@Name="BS_Succubus_A"]/genes</xpath>
+          <value>
+            <li>rjw_genes_demonic_genitalia</li>
+            <li>rjw_genes_aphrodisiac_pheromones</li>
+            <li>rjw_genes_hypersexual</li>
+            <li>rjw_genes_bisexual</li>
+            <li MayRequire="rjw.sexperience">AptitudeRemarkable_Sex</li>
+            <li MayRequire="LustLicentia.RJWLabs">rjw_genes_elasticity</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[@Name="BS_Hellguard_A"]/genes</xpath>
+          <value>
+            <li>rjw_genes_demonic_genitalia</li>
+            <li>rjw_genes_equine_genitalia</li>
+            <li MayRequire="rjw.sexperience">AptitudePoor_Sex</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[@Name="BS_GateKeeper_A"]/genes</xpath>
+          <value>
+            <li>rjw_genes_demonic_genitalia</li>
+            <li>rjw_genes_equine_genitalia</li>
+            <li>rjw_genes_big_male_genitalia</li>
+            <li>rjw_genes_much_cum</li>
+            <li MayRequire="rjw.sexperience">AptitudeTerrible_Sex</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[@Name="BS_Imp_A"]/genes</xpath>
+          <value>
+            <li>rjw_genes_demonic_genitalia</li>
+            <li>rjw_genes_much_cum</li>
+            <li>rjw_genes_small_male_genitalia</li>
+            <li>rjw_genes_tight_female_genitalia</li>
+            <li>rjw_genes_small_breasts</li>
+            <li>rjw_genes_tight_anus</li>
+          </value>
+        </li>
+      </operations>
+    </match>
+  </Operation>
+</Patch>

Common/Patches/Xenotypes/PatchBSSlimes.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Patch>
+  <Operation Class="PatchOperationFindMod">
+    <mods>
+      <li>Big and Small - Slimes</li>
+    </mods>
+    <match Class="PatchOperationSequence">
+      <operations>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="BS_GreenSlime"
+                                    or defName="BS_PinkSlime"
+                                    or defName="BS_FrostSlime"
+                                    or defName="BS_LavaSlime"
+                                    or defName="BS_EmperorSlime"
+                                    or defName="BS_ElixirSlime"
+                                    or defName="BS_ToxicSludge"
+                                    or defName="BS_BananaSplitSlime"
+                                  ]/genes</xpath>
+          <value>
+            <li>rjw_genes_slime_genitalia</li>
+            <li>rjw_genes_much_cum</li>
+            <li MayRequire="LustLicentia.RJWLabs">rjw_genes_elasticity</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="BS_BananaSplitSlime"]/genes</xpath>
+          <value>
+            <li>rjw_genes_hypersexual</li> <!-- :3c -->
+            <li>rjw_genes_bisexual</li>
+          </value>
+        </li>
+      </operations>
+    </match>
+  </Operation>
+</Patch>

Common/Patches/Xenotypes/PatchBSSneks.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Patch>
+  <!-- Placeholder pending refactor of genital type genes-->
+  <Operation Class="PatchOperationFindMod">
+    <mods>
+      <li>Big and Small - Lamias and other Snake-People [HOLDHORSES]</li>
+    </mods>
+    <match Class="PatchOperationSequence">
+      <operations>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName = "LoS_Lamia" 
+                                  or defName = "LoS_TrueLamia" 
+                                  or defName = "LoS_Siren" 
+                                  or defName = "LoS_Gorgon"
+                                  or defName = "Naga"
+                                  or defName = "Los_Adderman"
+                                  or defName = "Los_Anacondaman"
+                                  or defName = "Los_Snakeman"]/genes</xpath>
+          <value>
+            <li>rjw_genes_reptilian_genitalia</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName = "Nagaraj" or defName = "Los_Silver"]/genes</xpath>
+          <value>
+            <li>rjw_genes_reptilian_genitalia</li>
+            <li>rjw_genes_unbreakable</li>
+          </value>
+        </li>
+      </operations>
+    </match>
+  </Operation>
+</Patch>

Common/Patches/Xenotypes/PatchBSUndead.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Patch>
+  <Operation Class="PatchOperationFindMod">
+    <mods>
+      <li>Big and Small - Vampires and the Undead</li>
+    </mods>
+    <match Class="PatchOperationSequence">
+      <operations>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="VU_Returned" or defName="VU_Ghoul" or defName="VU_Frankenstein"]/genes</xpath>
+          <value>
+            <li>rjw_genes_Necro_genitalia</li>
+            <li>rjw_genes_no_sex_need</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="VU_Revenant"]/genes</xpath>
+          <value>
+            <li>rjw_genes_Necro_genitalia</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="VU_Lycantrope"]/genes</xpath> <!-- sic -->
+          <value>
+            <li>rjw_genes_canine_genitalia</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="VU_Nosferatu" or defName="VU_Dracul_Feral"]/genes</xpath>
+          <value>
+            <li>rjw_genes_demonic_genitalia</li>
+            <li>rjw_genes_no_sex_need</li>
+          </value>
+        </li>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="VU_Dracul_Spawn" 
+                                  or defName="VU_Dracul" 
+                                  or defName="VU_Dracul_Mature" 
+                                  or defName="VU_Dracul_Progenitor"
+                                ]/genes</xpath>
+          <value>
+            <li>rjw_genes_demonic_genitalia</li>
+          </value>
+        </li>        
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName="VU_WhiteRose"]/genes</xpath>
+          <value>
+            <li>rjw_genes_demonic_genitalia</li>
+            <li>rjw_genes_aphrodisiac_pheromones</li>
+            <li>rjw_genes_bisexual</li>
+            <li MayRequire="rjw.sexperience">AptitudeRemarkable_Sex</li>
+            <li MayRequire="LustLicentia.RJWLabs">rjw_genes_elasticity</li>
+          </value>
+        </li>
+
+        <!-- See PatchBSShared.xml for demon patches. -->
+      </operations>
+    </match>
+  </Operation>
+</Patch>

Common/Patches/Xenotypes/PatchBSYokai.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Patch>
+  <Operation Class="PatchOperationFindMod">
+    <mods>
+      <li>Big and Small - Yokai</li>
+    </mods>
+    <match Class="PatchOperationSequence">
+      <operations>
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName = "BS_Kitsune"]/genes</xpath>
+          <value>
+            <li>rjw_genes_canine_genitalia</li>
+            <li>LitteredBirths</li>
+          </value>
+        </li>
+
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName = "BS_Nekomata"]/genes</xpath>
+          <value>
+            <li>rjw_genes_feline_genitalia</li>
+            <li>rjw_genes_extra_vagina</li>
+            <li>rjw_genes_extra_penis</li>
+            <li>rjw_genes_small_breasts</li>
+            <li>LitteredBirths</li>
+          </value>
+        </li>
+
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName = "BS_RedOni" or defName = "BS_BlueOni" or defName = "BS_LesserOni"]/genes</xpath>
+          <value>
+            <li>rjw_genes_demonic_genitalia</li>
+            <li>rjw_genes_much_cum</li>
+          </value>
+        </li>
+
+        <li Class="PatchOperationAdd">
+          <xpath>Defs/XenotypeDef[defName = "BS_GreatBlueOni" or defName = "BS_GreatRedOni"]/genes</xpath>
+          <value>
+            <li>rjw_genes_demonic_genitalia</li>
+            <li>rjw_genes_big_male_genitalia</li>
+            <li>rjw_genes_loose_female_genitalia</li>
+            <li>rjw_genes_very_much_cum</li>
+          </value>
+        </li>
+      </operations>
+    </match>
+  </Operation>
+</Patch>

Common/Patches/Xenotypes/PatchBiotechNyaron.xml

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-<Operation Class="PatchOperationFindMod">
+	<Operation Class="PatchOperationFindMod">
-    <mods>
+		<mods>
-        <li>Biotech Nyaron</li>
+			<li>Biotech Nyaron</li>
-    </mods>
+		</mods>
-    <match Class="PatchOperationAdd">
+		<match Class="PatchOperationAdd">
-		<xpath>Defs/XenotypeDef[defName="Nyaron"]/genes</xpath>
+			<xpath>Defs/XenotypeDef[defName="Nyaron"]/genes</xpath>
-		<value>
+			<value>
-			<li>rjw_genes_feline_genitalia</li>
+				<li>rjw_genes_feline_genitalia</li>
-		</value>
+			</value>
-	</match>
+		</match>
-</Operation>
+	</Operation>
 </Patch>

Common/Patches/Xenotypes/PatchErinsAuronya.xml

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-<Operation Class="PatchOperationFindMod">
+	<Operation Class="PatchOperationFindMod">
-    <mods>
+		<mods>
-        <li>Erin's Auronya</li>
+			<li>Erin's Auronya</li>
-    </mods>
+		</mods>
-    <match Class="PatchOperationAdd">
+		<match Class="PatchOperationAdd">
-		<xpath>Defs/XenotypeDef[defName="ERN_Auronya"]/genes</xpath>
+			<xpath>Defs/XenotypeDef[defName="ERN_Auronya"]/genes</xpath>
-		<value>
+			<value>
-			<li>rjw_genes_feline_genitalia</li>
+				<li>rjw_genes_feline_genitalia</li>
-		</value>
+			</value>
-	</match>
+		</match>
-</Operation>
+	</Operation>
 </Patch>

Common/Patches/Xenotypes/PatchErinsShisune.xml

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-<Operation Class="PatchOperationFindMod">
+	<Operation Class="PatchOperationFindMod">
-    <mods>
+		<mods>
-        <li>Erin's Shisune</li>
+			<li>Erin's Shisune</li>
-    </mods>
+		</mods>
-    <match Class="PatchOperationAdd">
+		<match Class="PatchOperationAdd">
-		<xpath>Defs/XenotypeDef[defName="ERN_Shisune"]/genes</xpath>
+			<xpath>Defs/XenotypeDef[defName="ERN_Shisune"]/genes</xpath>
-		<value>
+			<value>
-			<li>rjw_genes_canine_genitalia</li>
+				<li>rjw_genes_canine_genitalia</li>
-		</value>
+			</value>
-	</match>
+		</match>
-</Operation>
+	</Operation>
 </Patch>

Common/Patches/Xenotypes/PatchKijinRace3.xml

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-<Operation Class="PatchOperationFindMod">
+	<Operation Class="PatchOperationFindMod">
-    <mods>
+		<mods>
-        <li>Kijin Race 3.0</li>
+			<li>Kijin Race 3.0</li>
-    </mods>
+		</mods>
-    <match Class="PatchOperationAdd">
+		<match Class="PatchOperationAdd">
-		<xpath>Defs/XenotypeDef[defName="KijinXenotype"]/genes</xpath>
+			<xpath>Defs/XenotypeDef[defName="KijinXenotype"]/genes</xpath>
-		<value>
+			<value>
-			<li>rjw_genes_demonic_genitalia</li>
+				<li>rjw_genes_demonic_genitalia</li>
-		</value>
+			</value>
-	</match>
+		</match>
-</Operation>
+	</Operation>
 </Patch>

Common/Patches/Xenotypes/PatchMammalia.xml

@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech Expansion - Mammalia</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/XenotypeDef[defName="Barkkin"]/genes</xpath>
+			<value>
+				<li>rjw_genes_canine_genitalia</li>
+				<li>rjw_genes_zoophile</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech Expansion - Mammalia</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/XenotypeDef[defName="Bonecrown"]/genes</xpath>
+			<value>
+				<li>rjw_genes_equine_genitalia</li>
+				<li>rjw_genes_zoophile</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech Expansion - Mammalia</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/XenotypeDef[defName="Wiretail"]/genes</xpath>
+			<value>
+				<li>rjw_genes_small_breasts</li>
+				<li>rjw_genes_small_male_genitalia</li>
+				<li>rjw_genes_tight_female_genitalia</li>
+				<li>rjw_genes_tight_anus</li>
+				<li>rjw_genes_Needle_genitalia</li>
+				<li>rjw_genes_zoophile</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech Expansion - Mammalia</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/XenotypeDef[defName="Hidewing"]/genes</xpath>
+			<value>
+				<li>rjw_genes_small_breasts</li>
+				<li>rjw_genes_small_male_genitalia</li>
+				<li>rjw_genes_tight_female_genitalia</li>
+				<li>rjw_genes_tight_anus</li>
+				<li>rjw_genes_Needle_genitalia</li>
+				<li>rjw_genes_zoophile</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech Expansion - Mammalia</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/XenotypeDef[defName="Seertusk"]/genes</xpath>
+			<value>
+				<li>rjw_genes_big_breasts</li>
+				<li>rjw_genes_big_male_genitalia</li>
+				<li>rjw_genes_loose_female_genitalia</li>
+				<li>rjw_genes_loose_anus</li>
+				<li>rjw_genes_equine_genitalia</li>
+				<li>rjw_genes_zoophile</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech Expansion - Mammalia</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/XenotypeDef[defName="Hindhopper"]/genes</xpath>
+			<value>
+				<li>rjw_genes_tight_female_genitalia</li>
+				<li>rjw_genes_tight_anus</li>
+				<li>rjw_genes_Needle_genitalia</li>
+				<li>LitteredBirths</li>
+				<li>rjw_genes_zoophile</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech Expansion - Mammalia</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/XenotypeDef[defName="Haytankard"]/genes</xpath>
+			<value>
+				<li>rjw_genes_big_breasts</li>
+				<li>rjw_genes_big_male_genitalia</li>
+				<li>rjw_genes_loose_female_genitalia</li>
+				<li>rjw_genes_loose_anus</li>
+				<li>rjw_genes_udder</li>
+				<li>rjw_genes_equine_genitalia</li>
+				<li>rjw_genes_zoophile</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech Expansion - Mammalia</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/XenotypeDef[defName="Cloudpuff"]/genes</xpath>
+			<value>
+				<li>rjw_genes_tight_female_genitalia</li>	
+				<li>rjw_genes_Needle_genitalia</li>
+				<li>rjw_genes_zoophile</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech Expansion - Mammalia</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/XenotypeDef[defName="Devilpuff"]/genes</xpath>
+			<value>
+				<li>rjw_genes_tight_female_genitalia</li>
+				<li>rjw_genes_Needle_genitalia</li>
+				<li>rjw_genes_zoophile</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech Expansion - Mammalia</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/XenotypeDef[defName="Blastheart"]/genes</xpath>
+			<value>
+				<li>rjw_genes_equine_genitalia</li>
+				<li>rjw_genes_zoophile</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>

Common/Patches/Xenotypes/PatchMammaliaMythic.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech Expansion - Mythic</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/XenotypeDef[defName="Glintscale"]/genes</xpath>
+			<value>
+				<li>rjw_genes_much_cum</li>
+				<li>rjw_genes_dragon_genitalia</li>
+				<li>rjw_genes_big_male_genitalia</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech Expansion - Mythic</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/XenotypeDef[defName="Ashfeather"]/genes</xpath>
+			<value>
+				<li>rjw_genes_much_cum</li>
+				<li>rjw_genes_Needle_genitalia</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Biotech Expansion - Mythic</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/XenotypeDef[defName="Tailbinder"]/genes</xpath>
+			<value>
+				<li>rjw_genes_much_cum</li>
+				<li>rjw_genes_canine_genitalia</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>

Common/Patches/Xenotypes/PatchNarai.xml

@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-<Operation Class="PatchOperationFindMod">
+	<Operation Class="PatchOperationFindMod">
-    <mods>
+		<mods>
-        <li>NaraiXenotype</li>
+			<li>NaraiXenotype</li>
-    </mods>
+		</mods>
-    <match Class="PatchOperationAdd">
+		<match Class="PatchOperationAdd">
-		<xpath>Defs/XenotypeDef[defName="Narai"]/genes</xpath>
+			<xpath>Defs/XenotypeDef[defName="Narai"]/genes</xpath>
-		<value>
+			<value>
-			<li>rjw_genes_canine_genitalia</li>
+				<li>rjw_genes_canine_genitalia</li>
-			<li>rjw_genes_zoophile</li>
+				<li>rjw_genes_zoophile</li>
-		</value>
+			</value>
-	</match>
+		</match>
-</Operation>
+	</Operation>
 </Patch>

Common/Patches/Xenotypes/PatchNyaron.xml

@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-<Operation Class="PatchOperationFindMod">
+    <Operation Class="PatchOperationFindMod">
-    <mods>
+        <mods>
-        <li>Biotech Nyaron</li>
+            <li>Biotech Nyaron</li>
-    </mods>
+        </mods>
-    <match Class="PatchOperationAdd">
+        <match Class="PatchOperationAdd">
-		<xpath>Defs/XenotypeDef[defName="Nyaron"]/genes</xpath>
+            <xpath>Defs/XenotypeDef[defName="Nyaron"]/genes</xpath>
-		<value>
+            <value>
-			<li>rjw_genes_tight_female_genitalia</li>
+                <li>rjw_genes_tight_female_genitalia</li>
-            <li>rjw_genes_feline_genitalia</li>
+                <li>rjw_genes_feline_genitalia</li>
-		</value>
+            </value>
-	</match>
+        </match>
-</Operation>
+    </Operation>
 </Patch>

Common/Patches/Xenotypes/PatchPapou.xml

@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-<Operation Class="PatchOperationFindMod">
+	<Operation Class="PatchOperationFindMod">
-    <mods>
+		<mods>
-        <li>Papou Race : emotional birds</li>
+			<li>Papou Race : emotional birds</li>
-    </mods>
+		</mods>
-    <match Class="PatchOperationAdd">
+		<match Class="PatchOperationAdd">
-		<xpath>Defs/XenotypeDef[defName="papago"]/genes</xpath>
+			<xpath>Defs/XenotypeDef[defName="papago"]/genes</xpath>
-		<value>
+			<value>
-			<li>rjw_genes_orgasm_rush</li>
+				<li>rjw_genes_orgasm_rush</li>
-			<li>rjw_genes_tight_female_genitalia</li>
+				<li>rjw_genes_tight_female_genitalia</li>
-			<li>rjw_genes_tight_anus</li>
+				<li>rjw_genes_tight_anus</li>
-		</value>
+			</value>
-	</match>
+		</match>
-</Operation>
+	</Operation>
 </Patch>

Common/Patches/Xenotypes/PatchPigskins.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Pigskin</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/XenotypeDef[defName="VRE_Boarskin"]/genes</xpath>
+			<value>
+				<li>rjw_genes_Pig_genitalia</li>
+				<li>rjw_genes_human_genitalia</li>
+				<li>rjw_genes_much_cum</li>
+				<li>rjw_genes_zoophile</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>

Common/Patches/Xenotypes/PatchRoosFaun.xml

@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-<Operation Class="PatchOperationFindMod">
+	<Operation Class="PatchOperationFindMod">
-    <mods>
+		<mods>
-        <li>Roo's Faun Xenotype</li>
+			<li>Roo's Faun Xenotype</li>
-    </mods>
+		</mods>
-    <match Class="PatchOperationAdd">
+		<match Class="PatchOperationAdd">
-		<xpath>Defs/XenotypeDef[defName="RBSF_Faun"]/genes</xpath>
+			<xpath>Defs/XenotypeDef[defName="RBSF_Faun"]/genes</xpath>
-		<value>
+			<value>
-			<li>rjw_genes_tight_female_genitalia</li>
+				<li>rjw_genes_tight_female_genitalia</li>
-			<li>rjw_genes_small_male_genitalia</li>
+				<li>rjw_genes_small_male_genitalia</li>
-			<li>rjw_genes_small_breasts</li>
+				<li>rjw_genes_small_breasts</li>
-			<li>rjw_genes_tight_anus</li>
+				<li>rjw_genes_tight_anus</li>
-		</value>
+			</value>
-	</match>
+		</match>
-</Operation>
+	</Operation>
 </Patch>

Common/Patches/Xenotypes/PatchRoosMinotaur.xml

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-<Operation Class="PatchOperationFindMod">
+	<Operation Class="PatchOperationFindMod">
-    <mods>
+		<mods>
-        <li>Roo's Minotaur Xenotype</li>
+			<li>Roo's Minotaur Xenotype</li>
-    </mods>
+		</mods>
-    <match Class="PatchOperationAdd">
+		<match Class="PatchOperationAdd">
-		<xpath>Defs/XenotypeDef[defName="RBM_Minotaur"]/genes</xpath>
+			<xpath>Defs/XenotypeDef[defName="RBM_Minotaur"]/genes</xpath>
-		<value>
+			<value>
-			<li>rjw_genes_much_cum</li>
+				<li>rjw_genes_much_cum</li>
-			<li>rjw_genes_cumflation_immunity</li>
+				<li>rjw_genes_cumflation_immunity</li>
-			<li>rjw_genes_loose_female_genitalia</li>
+				<li>rjw_genes_loose_female_genitalia</li>
-			<li>rjw_genes_big_male_genitalia</li>
+				<li>rjw_genes_big_male_genitalia</li>
-            <li>rjw_genes_equine_genitalia</li>
+				<li>rjw_genes_equine_genitalia</li>
-		</value>
+			</value>
-	</match>
+		</match>
-</Operation>
+	</Operation>
 </Patch>

Common/Patches/Xenotypes/PatchSaurid.xml

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-<Operation Class="PatchOperationFindMod">
+	<Operation Class="PatchOperationFindMod">
-    <mods>
+		<mods>
-        <li>Vanilla Races Expanded - Saurid</li>
+			<li>Vanilla Races Expanded - Saurid</li>
-    </mods>
+		</mods>
-    <match Class="PatchOperationAdd">
+		<match Class="PatchOperationAdd">
-		<xpath>Defs/XenotypeDef[defName="VRESaurids_Saurid"]/genes</xpath>
+			<xpath>Defs/XenotypeDef[defName="VRESaurids_Saurid"]/genes</xpath>
-		<value>
+			<value>
-			<li>rjw_genes_dragon_genitalia</li>
+				<li>rjw_genes_dragon_genitalia</li>
-		</value>
+			</value>
-	</match>
+		</match>
-</Operation>
+	</Operation>
 </Patch>

Common/Patches/Xenotypes/PatchVRELycanthrope.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Lycanthrope</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/XenotypeDef[defName="VRE_Wolfman"]/genes</xpath>
+			<value>
+				<li>rjw_genes_human_genitalia</li>
+				<li>rjw_genes_zoophile</li>
+			</value>
+		</match>
+	</Operation>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Lycanthrope</li>
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/XenotypeDef[defName="VRE_Lycan"]/genes</xpath>
+			<value>
+				<li>rjw_genes_canine_genitalia</li>
+				<li>rjw_genes_zoophile</li>
+				<li>rjw_genes_rapist</li>
+			</value>
+		</match>
+	</Operation>
+</Patch>

Common/Patches/Xenotypes/PatchVREPhytokin.xml

@@ -1,50 +1,17 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-<Operation Class="PatchOperationSequence">
+  <Operation Class="PatchOperationFindMod">
-    <operations>
+    <mods>
-        <li Class="PatchOperationFindMod">
+      <li>Vanilla Races Expanded - Phytokin</li>
-            <mods>
+    </mods>
-                <li>Vanilla Races Expanded - Phytokin</li>
+    <match Class="PatchOperationAdd">
-            </mods>
+      <xpath>Defs/XenotypeDef[defName="VRE_Poluxkin" or defName="VRE_Gauranlenkin" or defName="VRE_Animakin"]/genes</xpath>
-            <match Class="PatchOperationAdd">
+      <value>
-                <xpath>Defs/XenotypeDef[defName="VRE_Poluxkin"]/genes</xpath>
+        <li>rjw_genes_tight_female_genitalia</li>
-                <value>
+        <li>rjw_genes_tight_anus</li>
-                    <li>rjw_genes_tight_female_genitalia</li>
+        <li MayRequire="LustLicentia.RJWLabs">rjw_genes_elasticity</li>
-                    <li>rjw_genes_tight_anus</li>
+        <li>rjw_genes_bisexual</li>
-                    <li MayRequire="LustLicentia.RJWLabs">rjw_genes_elasticity</li>
+      </value>
-                    <li>rjw_genes_bisexual</li>
+    </match>
-                </value>
+  </Operation>
-            </match>
-        </li>
-        <li Class="PatchOperationFindMod">
-            <mods>
-                <li>Vanilla Races Expanded - Phytokin</li>
-            </mods>
-            <match Class="PatchOperationAdd">
-                <xpath>Defs/XenotypeDef[defName="VRE_Gauranlenkin"]/genes</xpath>
-                <value>
-                    <li>rjw_genes_tight_female_genitalia</li>
-                    <li>rjw_genes_tight_anus</li>
-                    <li MayRequire="LustLicentia.RJWLabs">rjw_genes_elasticity</li>
-                    <li>rjw_genes_bisexual</li>
-                </value>
-            </match>
-        </li>
-
-        <li Class="PatchOperationFindMod">
-            <mods>
-                <li>Vanilla Races Expanded - Phytokin</li>
-            </mods>
-            <match Class="PatchOperationAdd">
-                <xpath>Defs/XenotypeDef[defName="VRE_Animakin"]/genes</xpath>
-                <value>
-                    <li>rjw_genes_tight_female_genitalia</li>
-                    <li>rjw_genes_tight_anus</li>
-                    <li MayRequire="LustLicentia.RJWLabs">rjw_genes_elasticity</li>
-                    <li>rjw_genes_bisexual</li>
-                </value>
-            </match>
-        </li>
-    </operations>
-</Operation>
 </Patch>

Common/Patches/Xenotypes/PatchVRESanguophage.xml

@@ -1,41 +1,15 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-<Operation Class="PatchOperationSequence">
+  <Operation Class="PatchOperationFindMod">
-    <operations>
+    <mods>
-        <li Class="PatchOperationFindMod">
+      <li>Vanilla Races Expanded - Sanguophage</li>
-            <mods>
+    </mods>
-                <li>Vanilla Races Expanded - Sanguophage</li>
+    <match Class="PatchOperationAdd">
-            </mods>
+      <xpath>Defs/XenotypeDef[defName="VRE_Bruxa" or defName="VRE_Ekkimian" or defName="VRE_Strigoi"]/genes</xpath>
-            <match Class="PatchOperationAdd">
+      <value>
-                <xpath>Defs/XenotypeDef[defName="VRE_Bruxa"]/genes</xpath>
+        <li>rjw_genes_demonic_genitalia</li>
-                <value>
+      </value>
-                    <li>rjw_genes_demonic_genitalia</li>
+    </match>
-                </value>
-            </match>
-        </li>
-        <li Class="PatchOperationFindMod">
-            <mods>
-                <li>Vanilla Races Expanded - Sanguophage</li>
-            </mods>
-            <match Class="PatchOperationAdd">
-                <xpath>Defs/XenotypeDef[defName="VRE_Ekkimian"]/genes</xpath>
-                <value>
-                    <li>rjw_genes_demonic_genitalia</li>
-                </value>
-            </match>
-        </li>
     
-        <li Class="PatchOperationFindMod">
+  </Operation>
-            <mods>
-                <li>Vanilla Races Expanded - Sanguophage</li>
-            </mods>
-            <match Class="PatchOperationAdd">
-                <xpath>Defs/XenotypeDef[defName="VRE_Strigoi"]/genes</xpath>
-                <value>
-                    <li>rjw_genes_demonic_genitalia</li>
-                </value>
-            </match>
-        </li>
-    </operations>
-</Operation>
 </Patch>

Common/Patches/Xenotypes/PatchXenotech.xml

@@ -1,69 +1,55 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-<Operation Class="PatchOperationSequence">
+  <Operation Class="PatchOperationFindMod">
-    <operations>
+    <mods>
-        <li Class="PatchOperationFindMod">
+      <li>[LTS]Xenotech</li>
-            <mods>
+    </mods>
-                <li>[LTS]Xenotech</li>
+    <match Class="PatchOperationSequence">
-            </mods>
+      <operations>
-            <match Class="PatchOperationAdd">
+        <li Class="PatchOperationAdd">
-                <xpath>Defs/XenotypeDef[defName="LTS_Nyankind"]/genes</xpath>
+          <xpath>Defs/XenotypeDef[defName="LTS_Nyankind"]/genes</xpath>
-                <value>
+          <value>
-                    <li>rjw_genes_feline_genitalia</li>
+            <li>rjw_genes_feline_genitalia</li>
-                </value>
+          </value>
-            </match>
         </li>
-        <li Class="PatchOperationFindMod">
+        <li Class="PatchOperationAdd">
-            <mods>
+          <xpath>Defs/XenotypeDef[defName="LTS_Growler"]/genes</xpath>
-                <li>[LTS]Xenotech</li>
+          <value>
-            </mods>
+            <li>rjw_genes_canine_genitalia</li>
-            <match Class="PatchOperationAdd">
+          </value>
-                <xpath>Defs/XenotypeDef[defName="LTS_Growler"]/genes</xpath>
-                <value>
-                    <li>rjw_genes_canine_genitalia</li>
-                </value>
-            </match>
         </li>        
-        
+        <li Class="PatchOperationAdd">
-        <li Class="PatchOperationFindMod">
+          <xpath>Defs/XenotypeDef[defName="LTS_Elfin"]/genes</xpath>
-            <mods>
+          <value>
-                <li>[LTS]Xenotech</li>
+            <li>rjw_genes_small_male_genitalia</li>
-            </mods>
+            <li>rjw_genes_tight_female_genitalia</li>
-            <match Class="PatchOperationAdd">
+          </value>
-                <xpath>Defs/XenotypeDef[defName="LTS_Elfin"]/genes</xpath>
-                <value>
-                    <li>rjw_genes_small_male_genitalia</li>
-                    <li>rjw_genes_tight_female_genitalia</li>
-                </value>
-            </match>
         </li>        
-
+        <li Class="PatchOperationAdd">
-        <li Class="PatchOperationFindMod">
+          <xpath>Defs/XenotypeDef[defName="LTS_Ork"]/genes</xpath>
-            <mods>
+          <value>
-                <li>[LTS]Xenotech</li>
+            <li>rjw_genes_Orc_genitalia</li>
-            </mods>
+            <li>rjw_genes_big_male_genitalia</li>
-            <match Class="PatchOperationAdd">
+            <li>rjw_genes_loose_female_genitalia</li>
-                <xpath>Defs/XenotypeDef[defName="LTS_Ork"]/genes</xpath>
+          </value>
-                <value>
-                    <li>rjw_genes_big_male_genitalia</li>
-                    <li>rjw_genes_loose_female_genitalia</li>
-                </value>
-            </match>
         </li>
-        
+        <li Class="PatchOperationAdd">
-        <li Class="PatchOperationFindMod">
+          <xpath>Defs/XenotypeDef[defName="LTS_Lilime"]/genes</xpath>
-            <mods>
+          <value>
-                <li>[LTS]Xenotech</li>
+            <li>rjw_genes_demonic_genitalia</li>
-            </mods>
+            <li MayRequire="LustLicentia.RJWLabs">rjw_genes_elasticity</li>
-            <match Class="PatchOperationAdd">
+            <li MayRequire="rjw.sexperience">AptitudeRemarkable_Sex</li>
-                <xpath>Defs/XenotypeDef[defName="LTS_Lilime"]/genes</xpath>
+          </value>
-                <value>
-                    <li>rjw_genes_demonic_genitalia</li>
-                    <li MayRequire="LustLicentia.RJWLabs">rjw_genes_elasticity</li>
-                    <li MayRequire="rjw.sexperience">AptitudeRemarkable_Sex</li>
-                </value>
-            </match>
         </li>
-    </operations>
+        <li Class="PatchOperationAdd">
-</Operation>
+          <xpath>Defs/XenotypeDef[defName="LTS_Anthrae"]/genes</xpath>
+          <value>
+            <li>rjw_genes_ovipositor_genitalia</li>
+            <li>rjw_genes_bisexual</li>
+            <li>rjw_genes_insectincubator</li>
+          </value>
+        </li>
+      </operations>
+    </match>
+  </Operation>
 </Patch>