Nested 2 Mod-Search for AG_Malachai, Fixes #68

Fixed closing tag doesn't match opening tag error

About/About.xml

@@ -8,6 +8,10 @@
 	<description>Adds Genes for RJW Content</description>
 	<url>https://steamcommunity.com/id/Vegapnk/myworkshopfiles/?appid=294100</url>
 	<modDependencies>
+		<li>
+			<packageId>Ludeon.RimWorld.Biotech</packageId>
+			<displayName>Biotech</displayName>
+		</li>
 		<li>
 			<packageId>rim.job.world</packageId>
 			<displayName>RimJobWorld</displayName>
@@ -27,11 +31,17 @@
 		</li>
 	</modDependencies>
 	<loadAfter>
+		<li>Ludeon.RimWorld</li>
+		<li>Ludeon.RimWorld.Royalty</li>
+		<li>Ludeon.RimWorld.Ideology</li>
+		<li>Ludeon.RimWorld.Biotech</li>
 		<li>rim.job.world</li>
 		<li>brrainz.harmony</li>
-		<!--
-		<li>UnlimitedHugs.HugsLib</li>
-		-->
+		<li>OskarPotocki.VanillaFactionsExpanded.Core</li>
+		<li>sarg.alphaanimals</li>
+
+		<li>Sl4vP0weR.DominantGene</li>
+		<li>rjw.sexperience.cumgenes</li>
 	</loadAfter>
 
 </ModMetaData>

About/Manifest.xml

@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
 	<identifier>RJW-Genes</identifier>
-	<version>1.1.0</version>
+	<version>1.3.1</version>
 	<dependencies>
         <li>RimJobWorld</li>
 		<li>HugsLib</li>
 	</dependencies>
-	<incompatibleWith />
+	<incompatibleWith> 
+		<li>Male- and Female- Only Genes</li>
+	</incompatibleWith>
 	<loadAfter>
         <li>RimJobWorld</li>
 		<li>HugsLib</li>
+		<li>RJWSexperience_CumGenes</li>
 	</loadAfter>
 	<suggests>
         <li>RJW-LicentiaLabs</li>

CHANGELOG.md

@@ -1,9 +1,141 @@
+# 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**
+
+- Added patches for Alpha-Genes Animusen, Drakonori and Malachai (Closes #65, thanks @Stars22223)
+- Little Social Boost for Pawns affected by pheromones (Closes #50)
+
+**Fixes:**
+
+- XML Missmatch for Succubus Letter (Fixed in #64, thanks @mwcrow)
+- Made constructor for Empathetic Lifeforce explicitly `public` to not hang up in character creation (Fixes #66)
+
+# 1.3.0 (19-09-2023)
+
+**Changes:**
+
+- New Gene for Evergrowing Cocks. Be careful. 
+- New Gene for Genderfluid Pawns - daily chance to change sex. Futas just change "display" and keep genitalia, other pawns switch genitalia. XML configurable times & chances. 
+- New Drawings for the Succubi Wings & Tail, thanks to @Monti (donated via Discord)
+- Simple Gene that removes Sex need (called asexual, `rjw_genes_no_sex_need`)
+- New Gene that grows Penisses on Oral sex. Configurable in XML. 
+- New Gene Lifeforce Empath: Gain Lifeforce for sexually satisfied pawns, loose for frustrated pawns.
+- More genes are configurable with XML, e.g. tick speed, distances or multipliers. I am getting the hang of it. 
+- Halfed Succubus Fertilin-Need, increased cost of abilities.
+- Translation Keys for some letters
+
+**Fixes:**
+
+- New attempt at fixing condom consumption for Fertilin, adressing #41 & #48 provided by Infi
+- Copy of Infis patch for eating cum from sexperience, #41 and #48
+- Updated some Icons to have better backgrounds (thanks @WasmachenDennSachenSo #53)
+- Custom Queen- and Drone-Xenotypes should work now. 
+- Some more checks if Queen is on Map or not (fixing #60)
+
+*Notes*: 
+The pawns that are gender fluid can get pregnant. 
+However, with RJW 5.3.7 these pregnancies disappear. 
+This is a change needed upstream, but I will have a look. 
+
+# 1.2.1 
+
+**Fixes**: 
+
+- Issue with RJW Changes for Orgasms, #52. Methods were renamed. 
+- Notes on the Gene Inheritance #51
+
+# 1.2 (11-06-2023)
+
+**Changes:**
+
+- Cocoon Weaver Gene
+- Spawn Spelopede Gene (Can be changed to spawn megascarabs or other insects via xml)
+- Queens & Caste logic (see below)
+- Addition to InsectIncubator: Now fertilizes eggs once placed inside a host, and breeds out eggs roughly twice as fast.
+- Many new icons 
+- Custom background icons when Vanilla-Expanded-Framework is loaded
+- Sexual Age Drainer & Youth Fountain now change age as configured in XML
+- Draft for a Hive-Start Scenario
+- Added Orgasmic Mytosis Gene: On Multiple Orgasms, spawn an identical copy of a pawn. Items and Implants are not copied.
+- Patches for Alpha Genes Xenotypes and LTS Xenotech
+- New Simple Genitalia Patches for other popular Xenotypes (Thanks @Pali42K)
+
+**Internal:**
+
+- Renamed abilities to have _ability_ in their name, to not exactly match the gene-defnames.
+- Moved Insect-Incubator & Insect-Breeder to hive category and folders (from breeding)
+- Some exclusion-tags for Alpha Genes
+- Removed Patches for conditional Genes, and moved them to `mayRequire` in the XenotypeDefs
+
+**Fixes:**
+
+- Cockeater Ability has now Icon of Cockeater Gene
+- Cockeater now leaves a bite wound!
+- Pythokin-Patch checks for Licentialabs (#30)
+- Removed Sex-Change thoughts for pawns born or spawned with a gender-altering gene (Issue #32, PR #33 by @callavico)
+- More consistent behavior for genitalia resizing over multiple game-starts (Issue #34)
+
+**Queen & Caste Logic**
+
+There are 3 genes revolting around a new, hopefully flexible insect-caste system. Queens, Drones and Workers. These reproduce either through normal sex, or can utilize the insect birth once [this PR](https://gitgud.io/Ed86/rjw/-/merge_requests/266) has been merged in. 
+Update: It has been merged into [RJW 5.3.5](https://gitgud.io/Ed86/rjw/-/tags/5.3.5), make sure you update!
+
+In general, the logic is the following: 
+
+- A queen can have sex with anyone. If the partner was a drone, there is chance for the baby to become a queen, drone or worker. 
+- If the partner of the queen was not a drone, the baby will be a worker.
+- If the drone didn't mate with a queen but someone else, normal inheritance happens
+- The assignment is done by xenotypes for queen and drones. The baby will get all xenogenes of their parents chosen xenotypes. 
+- For workers, every queen can have a set of genes for their workers defined in [a special def](./Common/Defs/QueenWorkerMappingDefs/QueenWorkerMappingDefs_base.xml). These will be added as endogenes, so that pawns can still become xenotypes.
+- There is a default gene-set for workers, making dumb, sterile and servile pawns. 
+- Chances for Offsprings (Drone, Queen, Worker) is defined in an [XML-Def](./Common/Defs/HiveOffspringChanceDef/HiveOffspringChanceDefs.xml). They are set per Queen. 
+- Birthlogic should apply for normal pregnancies, and for RJW-Insect Eggs. Other Pregnancies (from mods) are not supported.
+
+I am not sure if I want to have a specific mapping defining that queen can only mate with certain drones, let me know how you feel about it. 
+*Queens can be male*. I just used the female-term, but implementation is gender-neutral. 
+
+**On Alpha Genes** 
+
+Alpha genes might have colliding features, but I need some reports to find out about it. 
+I disabled the specific gender and the oviparious reproduction (when you have rjw-ovipos). 
+I recommend using alpha genes for the Hive-Playthroughs, as otherwise the Halamyr look a bit ... boring? 
+But i don't want to add a bunch of cosmetic genes on top of things. 
+
+*And what the fuck is a halamyr?* Well I had to name my little ants somehow. But I didn't want to call them `myr` as I maybe want to make some [TiTs](https://www.fenoxo.com/play-games/) xenotypes separately.
+And I am aware that the TiTs-Myr work different than the things I made now. 
+
+
+**Changes Since beta-1**:
+
+- Fix of icon-names (#36)
+- Changes to the scenario (more building items, throne for start). Wealth is now at 12k, which is the same as crashlanded and lost tribe.
+- Added the Orgasmic Mytosis Draft
+- Many touches on the Halamyr Hive Logic and Fertilizitation (#37,#38)
+
+**Changes Since beta-2**: 
+
+- Mostly Patches and Changes to the Halamyr Defs
+- Some re-arranging and mayRequires for other mods
+
 # 1.1.4
 
 Fixes: 
 
 - Youth Fountain and Age Drainer **really** "stop" at 18 (#26, #28) and never age pawns
-- Drained Pawns **really** vomit less (#29). I understood the XML wrong. 
+- Drastically reduced vomiting time due to an missunderstanding (#29). `0.4` instead of `0.01`
 
 Sometimes life is like that, and you have to fix the fixes. 
 It was never really broken, life is just very long. 
@@ -14,7 +146,7 @@ Changes:
 
 - Youth Fountain and Age Drainer "stop" at 18 (#26)
 - Youth Fountain and Age Drainer activate only for pawns at 18 (#26)
-- Drained Pawns vomit less (from mtb 0.05 to 0.01)
+- Drained Pawns vomit less (from mtb 0.05 to 0.01)(#29)
 
 Fixes: 
 

Common/Defs/AbilityDefs/Ability_CockEater.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
   <AbilityDef ParentName="AbilityTouchBase">
-    <defName>rjw_genes_cockeater</defName>
+    <defName>rjw_genes_ability_cockeater</defName>
     <label>Eat Cock</label>
     <description>Eat the cock of another pawn, restoring fertilin based on the size of the cock.</description>
-    <iconPath>Things/Mote/Heart</iconPath>
+    <iconPath>Genes/Icons/cockeater</iconPath>
     <stunTargetWhileCasting>true</stunTargetWhileCasting>
     <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
     <disableGizmoWhileUndrafted>false</disableGizmoWhileUndrafted>
@@ -27,8 +27,7 @@
       </targetParams>
     </verbProperties>
     <comps>
-      <li Class="RJW_Genes.CompProperties_AbilityCockEater"> <!-- namespace needs to be changed when copied to another mod-->
-      </li>
+      <li Class="RJW_Genes.CompProperties_AbilityCockEater"/> <!-- namespace needs to be changed when copied to another mod-->
     </comps>
   </AbilityDef>
 </Defs>

Common/Defs/AbilityDefs/Ability_CocoonWeaver.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <AbilityDef ParentName="AbilityTouchBase">
+    <defName>rjw_genes_ability_cocoonweaver</defName>
+    <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>
+    <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
+    <disableGizmoWhileUndrafted>false</disableGizmoWhileUndrafted>
+    <warmupMote>Mote_CocoonStencil</warmupMote>
+    <warmupEffecter>CocoonWeave</warmupEffecter>
+    <jobDef>CastAbilityOnThingMelee</jobDef>
+    <displayOrder>404</displayOrder>
+    <!-- 30k Ticks = 12h -->
+    <cooldownTicksRange>30000</cooldownTicksRange>
+    <verbProperties>
+      <verbClass>Verb_CastAbilityTouch</verbClass>
+      <drawAimPie>false</drawAimPie>
+      <range>-1</range>
+      <warmupTime>15</warmupTime>
+      <targetParams>
+        <canTargetAnimals>true</canTargetAnimals>
+        <canTargetSelf>false</canTargetSelf>
+        <canTargetBuildings>false</canTargetBuildings>
+        <canTargetMechs>false</canTargetMechs>
+        <canTargetBloodfeeders>true</canTargetBloodfeeders>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="RJW_Genes.CompProperties_AbilityCocoonWeaver"/>
+    </comps>
+  </AbilityDef>
+</Defs>

Common/Defs/AbilityDefs/Ability_Flight.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
   <AbilityDef>
-    <defName>rjw_genes_flight</defName>
+    <defName>rjw_genes_ability_flight</defName>
     <label>fly</label>
     <description>Fly to a short location using your wings.</description>
     <iconPath>Genes/Icons/Succubus_Wings</iconPath>

Common/Defs/AbilityDefs/Ability_NakedProwess.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
   <AbilityDef>
-    <defName>rjw_genes_naked_prowess</defName>
+    <defName>rjw_genes_ability_naked_prowess</defName>
     <label>naked prowess</label>
     <description>Enhance the strength and resilience of your naked body with fertilin.</description>
     <iconPath>Genes/Icons/rjw_naked_prowess</iconPath>
     <warmupMoteSocialSymbol>Things/Mote/Heart</warmupMoteSocialSymbol>
-	<jobDef>CastAbilityOnThing</jobDef>
+	  <jobDef>CastAbilityOnThing</jobDef>
     <targetRequired>False</targetRequired>
     <canUseAoeToGetTargets>False</canUseAoeToGetTargets>
     <stunTargetWhileCasting>True</stunTargetWhileCasting>
@@ -38,7 +38,7 @@
       </li>
 	  <li Class="RJW_Genes.CompProperties_CasterIsNaked"/>
 	  <li Class="RJW_Genes.CompProperties_AbilityLifeForceCost">
-        <fertilinCost>0.1</fertilinCost>
+        <fertilinCost>0.15</fertilinCost>
       </li>
     </comps>
 	

Common/Defs/AbilityDefs/Ability_ParalysingKiss.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
   <AbilityDef ParentName="AbilityTouchBase">
-    <defName>rjw_genes_paralysingkiss</defName>
+    <defName>rjw_genes_ability_paralysingkiss</defName>
     <label>paralysing kiss</label>
     <description>Paralyse someone briefly with a kiss.</description>
     <iconPath>Genes/Icons/rjw_genes_lips</iconPath>
     <stunTargetWhileCasting>true</stunTargetWhileCasting>
     <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
     <disableGizmoWhileUndrafted>false</disableGizmoWhileUndrafted>
-	<statBases>
+	  <statBases>
       <Ability_Duration>5</Ability_Duration>
     </statBases>
     <warmupMote>Mote_CoagulateStencil</warmupMote>
@@ -37,7 +37,7 @@
         <fleckDef>rjw_genes_lips</fleckDef> <!--Will change to kiss when I have a good icon/fleck for it-->
       </li>
 	  <li Class="RJW_Genes.CompProperties_AbilityLifeForceCost">
-        <fertilinCost>0.05</fertilinCost>
+        <fertilinCost>0.1</fertilinCost>
       </li>
     </comps> 
   </AbilityDef>

Common/Defs/AbilityDefs/Ability_PussyHeal.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
   <AbilityDef ParentName="AbilityTouchBase">
-    <defName>rjw_genes_pussyheal</defName>
+    <defName>rjw_genes_ability_pussyheal</defName>
     <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>
@@ -28,7 +28,7 @@
     </verbProperties>
     <comps>
 	  <li Class="RJW_Genes.CompProperties_AbilityLifeForceCost">
-        <fertilinCost>0.2</fertilinCost>
+        <fertilinCost>0.3</fertilinCost>
       </li>
       <li Class="RJW_Genes.CompProperties_AbilityPussyHeal"> 
         <tendQualityRange>0.4~0.8</tendQualityRange> 

Common/Defs/AbilityDefs/Ability_Seduce.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
   <AbilityDef>
-    <defName>rjw_genes_seduce</defName>
+    <defName>rjw_genes_ability_seduce</defName>
     <label>seduce</label>
     <description>Seduce the target to approach the caster.</description>
     <iconPath>Genes/Icons/seduce</iconPath>
@@ -9,7 +9,7 @@
     <stunTargetWhileCasting>true</stunTargetWhileCasting>
     <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
     <disableGizmoWhileUndrafted>false</disableGizmoWhileUndrafted>
-	<statBases>
+	  <statBases>
       <Ability_Duration>10</Ability_Duration>
     </statBases>
     <warmupMote>Mote_CoagulateStencil</warmupMote>
@@ -36,7 +36,7 @@
         <fleckDef>Heart</fleckDef>
       </li>
 	  <li Class="RJW_Genes.CompProperties_AbilityLifeForceCost">
-        <fertilinCost>0.1</fertilinCost>
+        <fertilinCost>0.20</fertilinCost>
       </li>
     </comps>
   </AbilityDef>

Common/Defs/AbilityDefs/Ability_SpawnSpelopede.xml

@@ -0,0 +1,36 @@
+<?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/Effects/cocoonweave.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  
+  <EffecterDef>
+    <defName>CocoonWeave</defName>
+    <children>
+      <li>
+        <subEffecterClass>SubEffecter_SprayerChance</subEffecterClass>
+        <fleckDef>BloodSplash</fleckDef>
+        <chancePerTick>0.15</chancePerTick>
+        <burstCount>2~3</burstCount>
+        <scale>0.75~1.5</scale>
+        <color>(244, 244, 244)</color>
+        <spawnLocType>RandomDrawPosOnTarget</spawnLocType>
+        <attachToSpawnThing>true</attachToSpawnThing>
+      </li>
+    </children>
+  </EffecterDef>
+
+  <ThingDef ParentName="MoteBase">
+    <defName>Mote_CocoonStencil</defName>
+    <thingClass>MoteAttached</thingClass>
+    <altitudeLayer>Terrain</altitudeLayer>
+    <mote>
+      <fadeInTime>0.1</fadeInTime>
+      <fadeOutTime>0.4</fadeOutTime>
+      <solidTime>999999</solidTime>
+      <needsMaintenance>True</needsMaintenance>
+    </mote>
+    <graphicData>
+      <graphicClass>Graphic_PawnBodySilhouette</graphicClass>
+      <shaderType>PawnSilhouetteStencil</shaderType>
+      <texPath>Things/Mote/Transparent</texPath>
+    </graphicData>
+  </ThingDef>
+
+</Defs>

Common/Defs/GeneDefs/GeneCategories.xml

@@ -67,6 +67,11 @@
     <displayPriorityInXenotype>8</displayPriorityInXenotype>
   </GeneCategoryDef>
   
+  <GeneCategoryDef>
+    <defName>rjw_genes_hive</defName>
+    <label>Hive</label>
+    <displayPriorityInXenotype>7</displayPriorityInXenotype>
+  </GeneCategoryDef>
   
   
 </Defs>

Common/Defs/GeneDefs/GeneDefs_Breeding.xml

@@ -11,42 +11,34 @@
 	  <displayCategory>rjw_genes_breeding</displayCategory>
     <biostatCpx>1</biostatCpx>
     <biostatMet>-1</biostatMet>
-  </GeneDef>
-  
-  <GeneDef>
-    <defName>rjw_genes_insectincubator</defName>
-    <label>InsectIncubator</label>	
-    <description>Pawns with this gene are able to hold more insect eggs.</description>
-    <iconPath>Genes/Icons/More_Egg_Space</iconPath>
-    <displayOrderInCategory>52</displayOrderInCategory>
-    <displayCategory>rjw_genes_breeding</displayCategory>
-    <biostatCpx>1</biostatCpx>
-    <biostatMet>-1</biostatMet>
-  </GeneDef>
 
-  <GeneDef>
-    <defName>rjw_genes_insectbreeder</defName>
-    <label>InsectBreeder</label>	
-    <description>Pawns with this gene are able to fertilize eggs with any fertile penis.</description>
-    <iconPath>World/WorldObjects/Expanding/Insects</iconPath>
-    <displayOrderInCategory>53</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>
-        <defName>rjw_genes_zoophile</defName>
-        <label>Zoophile</label>
-        <displayCategory>rjw_genes_breeding</displayCategory>
-        <description>Xenotypes with this Gene are Zoophile.</description>
-        <iconPath>Genes/Icons/Zoophile</iconPath>
-        <displayOrderInCategory>54</displayOrderInCategory>    
-        <forcedTraits>
-            <li>
-                <def>Zoophile</def>
-            </li>
-        </forcedTraits>
-    </GeneDef>
+  <GeneDef>
+      <defName>rjw_genes_zoophile</defName>
+      <label>Zoophile</label>
+      <displayCategory>rjw_genes_breeding</displayCategory>
+      <description>Xenotypes with this Gene are Zoophile.</description>
+      <iconPath>Genes/Icons/Zoophile</iconPath>
+      <displayOrderInCategory>54</displayOrderInCategory>    
+      <forcedTraits>
+          <li>
+              <def>Zoophile</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>
 
 </Defs>

Common/Defs/GeneDefs/GeneDefs_Cosmetic.xml

@@ -19,21 +19,28 @@
     <iconColor>(0.75, 0.75, 0.75)</iconColor>
     <displayOrderInCategory>1000</displayOrderInCategory>
 	<abilities>
-		 <li>rjw_genes_flight</li>
+		 <li>rjw_genes_ability_flight</li>
 	</abilities>
 	<descriptionHyperlinks>
-		<AbilityDef>rjw_genes_flight</AbilityDef>
+		<AbilityDef>rjw_genes_ability_flight</AbilityDef>
 	</descriptionHyperlinks>
     <biostatCpx>1</biostatCpx>
 	<biostatMet>-1</biostatMet>
     <graphicData>
-      <graphicPath>Things/Pawn/Humanlike/BodyAttachments/rjw_genes_Succubus_Wings/Succubus_Wings</graphicPath>
+      <graphicPath>Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings/RJW_Genes_Succubus_Wings</graphicPath>
       <colorType>Skin</colorType>
-	  <drawScale>2</drawScale>
+	    <drawScale>2</drawScale>
       <drawOffsetNorth>(0.0, 0.01, -0.1)</drawOffsetNorth>
       <drawOffsetSouth>(0.0, 0.0, -0.1)</drawOffsetSouth>
       <drawOffsetEast>(0.1, 0.0, 0.0)</drawOffsetEast>
     </graphicData>
+    
+    <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="GeneTailBase">
@@ -52,18 +59,20 @@
     <biostatCpx>1</biostatCpx>
     <biostatMet>-1</biostatMet>
     <graphicData>
-      <graphicPaths>
-		<li>Things/Pawn/Humanlike/BodyAttachments/rjw_genes_Succubus_Tail/Succubus_Tail_L1</li>
-		<li>Things/Pawn/Humanlike/BodyAttachments/rjw_genes_Succubus_Tail/Succubus_Tail_R1</li>
-		<li>Things/Pawn/Humanlike/BodyAttachments/rjw_genes_Succubus_Tail/Succubus_Tail_L2</li>
-		<li>Things/Pawn/Humanlike/BodyAttachments/rjw_genes_Succubus_Tail/Succubus_Tail_R2</li>
-	  </graphicPaths>
+      <graphicPath>Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail/RJW_Genes_Succubus_Tail</graphicPath>
       <colorType>Skin</colorType>
-	  <drawScale>2</drawScale>
+	    <drawScale>2</drawScale>
       <drawOffsetNorth>(0, 0.2, -0.1)</drawOffsetNorth>
       <drawOffsetSouth>(0, -0.1, 0.1)</drawOffsetSouth>
       <drawOffsetEast>(0.2, 0.2, 0.1)</drawOffsetEast>
     </graphicData>
-	<randomChosen>true</randomChosen>
+	  <randomChosen>true</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>
 </Defs>

Common/Defs/GeneDefs/GeneDefs_Cum.xml

@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
     <GeneDef Name="GeneCumAmount" Abstract="True">
-        <displayCategory>rjw_genes_cum</displayCategory>
-        <exclusionTags>
-            <li>CumAmount</li>
-        </exclusionTags>  
+      <displayCategory>rjw_genes_cum</displayCategory>
+      <exclusionTags>
+          <li>CumAmount</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>
 
   <!-- Penis -->
@@ -23,7 +30,7 @@
     <defName>rjw_genes_much_cum</defName>
     <label>Much Cum</label>
     <description>Males of this species produce a lot of fluid.</description>
-    <iconPath>Genes/Icons/Bonus_Cum</iconPath>
+    <iconPath>Genes/Icons/Much_Cum</iconPath>
     <geneClass>RJW_Genes.Gene_MuchCum</geneClass>
     <displayOrderInCategory>534</displayOrderInCategory>
     <biostatCpx>1</biostatCpx>
@@ -34,7 +41,7 @@
     <defName>rjw_genes_very_much_cum</defName>
     <label>Very Much Cum</label>
     <description>Males of this species produce a whole lot of fluid. They are like fountains basically.</description>
-    <iconPath>Genes/Icons/Much_Bonus_Cum</iconPath>
+    <iconPath>Genes/Icons/Very_Much_Cum</iconPath>
     <geneClass>RJW_Genes.Gene_VeryMuchCum</geneClass>
     <displayOrderInCategory>535</displayOrderInCategory>
     <biostatCpx>1</biostatCpx>
@@ -55,7 +62,14 @@
     </forcedTraits>
     <exclusionTags>
         <li>NotCumflatable</li>
-    </exclusionTags>  
+    </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">
@@ -67,7 +81,14 @@
     <displayOrderInCategory>537</displayOrderInCategory>
     <exclusionTags>
         <li>NotCumflatable</li>
-    </exclusionTags>  
+    </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>
 
 
@@ -78,6 +99,13 @@
     <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

@@ -11,6 +11,13 @@
     <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 >
@@ -27,6 +34,13 @@
     <hediffGiversCannotGive>
       <li>FeelingBroken</li>
     </hediffGiversCannotGive>
+    
+    <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_ExtraGenitalia.xml

@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-<GeneDef Name="GeneExtraGenitaliaBase" Abstract="True">
+  <GeneDef Name="GeneExtraGenitaliaBase" Abstract="True">
     <displayCategory>rjw_genes_genitalia_extras</displayCategory>
-  </GeneDef>
 
+    <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="GeneExtraGenitaliaBase">
     <defName>rjw_genes_extra_penis</defName>
@@ -34,7 +40,7 @@
     <defName>rjw_genes_extra_vagina</defName>
     <label>extra vagina</label>
     <description>Females of this species grow an additional vagina .</description>
-    <iconPath>Genes/Icons/extra_female</iconPath>
+    <iconPath>Genes/Icons/Extra_Vagina</iconPath>
     <geneClass>RJW_Genes.Gene_ExtraVagina</geneClass>
     <displayOrderInCategory>703</displayOrderInCategory>
     <exclusionTags>
@@ -46,7 +52,7 @@
     <defName>rjw_genes_no_vagina</defName>
     <label>no vagina</label>
     <description>Females of this do not have a vagina.</description>
-    <iconPath>Genes/Icons/No_Female_Genitalia</iconPath>
+    <iconPath>Genes/Icons/No_Vagina</iconPath>
     <geneClass>RJW_Genes.Gene_NoVagina</geneClass>
     <displayOrderInCategory>704</displayOrderInCategory>
     <exclusionTags>
@@ -127,5 +133,19 @@
       <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>
+    <iconPath>Things/Mote/Heart</iconPath>
+    <geneClass>RJW_Genes.Gene_UdderBreasts</geneClass>
+    <displayOrderInCategory>711</displayOrderInCategory>
+    <exclusionTags>
+      <li>BreastAmount</li>
+    </exclusionTags>
+  </GeneDef>
+  -->
 </Defs>

Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml

@@ -2,7 +2,14 @@
 <Defs>
 <GeneDef Name="GeneGenitaliaSizeBase" Abstract="True">
     <displayCategory>rjw_genes_genitalia_size</displayCategory>
-    <!--These Genes need to be loaded quite last, otherwise e.g. genitalia types will re-roll and overrule genitalia size-->
+    <!--These Genes need to be loaded quite late, otherwise e.g. genitalia types will re-roll and overrule genitalia size-->
+    
+    <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>
 
   <!-- Penis -->
@@ -35,7 +42,7 @@
     <defName>rjw_genes_loose_female_genitalia</defName>
     <label>Loose Female Genitalia</label>
     <description>Vaginas of this Xenotype are quite spacy. (Resizing takes place at 20th Birthday)</description>
-    <iconPath>Genes/Icons/Loose_Female_Genitalia</iconPath>
+    <iconPath>Genes/Icons/Loose_Vagina</iconPath>
     <geneClass>RJW_Genes.Gene_LooseFemaleGenitalia</geneClass>
     <displayOrderInCategory>754</displayOrderInCategory>
     <exclusionTags>
@@ -47,7 +54,7 @@
     <defName>rjw_genes_tight_female_genitalia</defName>
     <label>Tight Female Genitalia</label>
     <description>Vaginas of this Xenotype are pretty tight.(Resizing takes place at 20th Birthday)</description>
-    <iconPath>Genes/Icons/Tight_Female_Genitalia</iconPath>
+    <iconPath>Genes/Icons/Tight_Vagina</iconPath>
     <geneClass>RJW_Genes.Gene_TightFemaleGenitalia</geneClass>
     <displayOrderInCategory>756</displayOrderInCategory>
     <exclusionTags>
@@ -104,4 +111,26 @@
       <li>AnusSize</li>
     </exclusionTags>
   </GeneDef>
+
+  <!-- Extra -->
+  
+  <GeneDef ParentName="GeneGenitaliaSizeBase">
+    <defName>rjw_genes_evergrowth</defName>
+    <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>
+    <displayOrderInCategory>767</displayOrderInCategory>
+    <exclusionTags>
+      <li>PenisSize</li>
+      <li>VaginaSize</li>
+    </exclusionTags>
+    <modExtensions>
+        	<li Class="RJW_Genes.TickIntervalExtension">
+				<!-- One day has 60k ticks-->
+				<tickInterval>60000</tickInterval>
+			</li>
+		</modExtensions>
+  </GeneDef> 
+  
 </Defs>

Common/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml

@@ -7,6 +7,13 @@
       <li>GenitalType</li>
     </exclusionTags>
     <biostatCpx>0</biostatCpx>
+    
+    <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="GeneGenitalTypeBase">
@@ -58,7 +65,7 @@
     <defName>rjw_genes_slime_genitalia</defName>
     <label>slime genitalia</label>
     <description>Carriers of this gene have slime genitalia.</description>
-    <iconPath>Genes/Icons/Genitalia_Slime</iconPath>
+    <iconPath>Genes/Icons/Slime_Genitalia</iconPath>
     <geneClass>RJW_Genes.Gene_SlimeGenitalia</geneClass>
     <displayOrderInCategory>807</displayOrderInCategory>
   </GeneDef>
@@ -67,9 +74,16 @@
     <defName>rjw_genes_ovipositor_genitalia</defName>
     <label>insect genitalia</label>
     <description>Carriers of this gene have ovipositors similar to insects.</description>
-    <iconPath>Genes/Icons/Genitalia_Insect</iconPath>
+    <iconPath>Genes/Icons/Ovipositor_Genitalia</iconPath>
     <geneClass>RJW_Genes.Gene_OvipositorGenitalia</geneClass>
     <displayOrderInCategory>808</displayOrderInCategory>
+
+    <exclusionTags>
+			<li>Egglaying</li>
+			<li>AG_Egglaying</li>
+		</exclusionTags>
+    
   </GeneDef>
 
+
 </Defs>

Common/Defs/GeneDefs/GeneDefs_Hive.xml

@@ -0,0 +1,214 @@
+<?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,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-	<GeneDef>
+	
+	<GeneDef Name="LifeForceBase" Abstract="True">
+		<displayCategory>rjw_genes_fertilin</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="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>
@@ -17,7 +29,6 @@
 		<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>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<displayOrderInCategory>-2</displayOrderInCategory>
     	<minAgeActive>18</minAgeActive>
 		<customEffectDescriptions>
@@ -28,29 +39,28 @@
 			<li><symbol>fert</symbol></li>
 		  </prefixSymbols>
 		</symbolPack>
-		<resourceLossPerDay>0.05</resourceLossPerDay>
+		<resourceLossPerDay>0.025</resourceLossPerDay>
 		<biostatCpx>1</biostatCpx>
 		<biostatMet>1</biostatMet>
 	</GeneDef>
 	
-	<GeneDef>
+	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_lifeforce_drain</defName>
 		<label>fertilin drain</label>
 		<labelShortAdj>draining</labelShortAdj>
-		<description>Carriers lose an additional 15 fertilin per day from biological entropy.</description>
+		<description>Carriers lose an additional 7.5 fertilin per day from biological entropy.</description>
 		<resourceLabel>fertilin</resourceLabel>
 		<geneClass>RJW_Genes.Gene_LifeForceDrain</geneClass>
 		<iconPath>Genes/Icons/FertilinDrainAlt</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
-		<resourceLossPerDay>0.15</resourceLossPerDay>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
+		<resourceLossPerDay>0.075</resourceLossPerDay>
     	<minAgeActive>18</minAgeActive>
 		<displayOrderInCategory>-1</displayOrderInCategory>
 		<biostatCpx>1</biostatCpx>
 		<biostatMet>6</biostatMet>
 	</GeneDef>
 	
-	<GeneDef>
+	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_pussyhealing</defName>
 		<label>Pussy Healer</label>
 		<labelShortAdj>pussyhealer</labelShortAdj>
@@ -58,12 +68,11 @@
 		<iconPath>Genes/Icons/Healpussy</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>9</displayOrderInCategory>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<abilities>
-			<li>rjw_genes_pussyheal</li>
+			<li>rjw_genes_ability_pussyheal</li>
 		</abilities>
 		<descriptionHyperlinks>
-			<AbilityDef>rjw_genes_pussyheal</AbilityDef>
+			<AbilityDef>rjw_genes_ability_pussyheal</AbilityDef>
 		</descriptionHyperlinks>
 		<biostatCpx>1</biostatCpx>
 		<biostatMet>-1</biostatMet>
@@ -76,7 +85,7 @@
 		</symbolPack>
 	</GeneDef>
 	
-	<GeneDef>
+	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_cockeater</defName>
 		<label>Cockeater</label>
 		<labelShortAdj>cockeater</labelShortAdj>
@@ -84,12 +93,11 @@
 		<iconPath>Genes/Icons/cockeater</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>11</displayOrderInCategory>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<abilities>
-			<li>rjw_genes_cockeater</li>
+			<li>rjw_genes_ability_cockeater</li>
 		</abilities>
 		<descriptionHyperlinks>
-			<AbilityDef>rjw_genes_cockeater</AbilityDef>
+			<AbilityDef>rjw_genes_ability_cockeater</AbilityDef>
 		</descriptionHyperlinks>
 		<biostatCpx>1</biostatCpx>
 		<biostatMet>-1</biostatMet>
@@ -102,20 +110,19 @@
 		</symbolPack>
 	</GeneDef>
 	
-	<GeneDef>
+	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_paralysingkiss</defName>
 		<label>paralysing kiss</label>
 		<labelShortAdj>paralysing kiss</labelShortAdj>
 		<description>Carriers of this gene are able to briefly stun an enemy with a kiss.</description>
-		<iconPath>Genes/Icons/rjw_genes_lips</iconPath>
+		<iconPath>Genes/Icons/Paralysing_Kiss</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>12</displayOrderInCategory>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<abilities>
-			<li>rjw_genes_paralysingkiss</li>
+			<li>rjw_genes_ability_paralysingkiss</li>
 		</abilities>
 		<descriptionHyperlinks>
-			<AbilityDef>rjw_genes_paralysingkiss</AbilityDef>
+			<AbilityDef>rjw_genes_ability_paralysingkiss</AbilityDef>
 		</descriptionHyperlinks>
 		<biostatCpx>1</biostatCpx>
 		<biostatMet>-1</biostatMet>
@@ -127,7 +134,7 @@
 		</symbolPack>
 	</GeneDef>
 	
-	<GeneDef>
+	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_seduce</defName>
 		<label>seduction</label>
 		<labelShortAdj>seduction</labelShortAdj>
@@ -135,12 +142,11 @@
 		<iconPath>Genes/Icons/seduce</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>13</displayOrderInCategory>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<abilities>
-			<li>rjw_genes_seduce</li>
+			<li>rjw_genes_ability_seduce</li>
 		</abilities>
 		<descriptionHyperlinks>
-			<AbilityDef>rjw_genes_seduce</AbilityDef>
+			<AbilityDef>rjw_genes_ability_seduce</AbilityDef>
 		</descriptionHyperlinks>
 		<biostatCpx>1</biostatCpx>
 		<biostatMet>-1</biostatMet>
@@ -153,54 +159,78 @@
 		</symbolPack>
 	</GeneDef>
 	
-	<GeneDef>
+	<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>
 		<iconPath>Genes/Icons/rjw_naked_prowess</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
-		<displayOrderInCategory>13</displayOrderInCategory>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
+		<displayOrderInCategory>14</displayOrderInCategory>
 		<abilities>
-			<li>rjw_genes_naked_prowess</li>
+			<li>rjw_genes_ability_naked_prowess</li>
 		</abilities>
 		<descriptionHyperlinks>
-			<AbilityDef>rjw_genes_naked_prowess</AbilityDef>
+			<AbilityDef>rjw_genes_ability_naked_prowess</AbilityDef>
 		</descriptionHyperlinks>
 		<biostatCpx>1</biostatCpx>
 		<biostatMet>-1</biostatMet>
 	</GeneDef>
 	
-	<GeneDef>
+	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_cum_eater</defName>
 		<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>
 		<iconPath>Genes/Icons/cumeater</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>1</displayOrderInCategory>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<biostatCpx>1</biostatCpx>
 	</GeneDef>
 	
-	<GeneDef>
+	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_fertilin_absorber</defName>
 		<label>Fertilin Absorber</label>
 		<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>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<biostatCpx>1</biostatCpx>
 	</GeneDef>
 	
-	<GeneDef>
+	<GeneDef ParentName="LifeForceBase">
+		<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>
+		<iconPath>Genes/Icons/Hypersexual</iconPath>
+		<prerequisite>rjw_genes_lifeforce</prerequisite>
+		<displayOrderInCategory>3</displayOrderInCategory>
+		<biostatCpx>3</biostatCpx>
+		<biostatMet>-2</biostatMet>
+
+		<modExtensions>
+			<li Class="RJW_Genes.LifeForceEmpathExtension">
+				<aheagoIncrement>0.02</aheagoIncrement>
+				<satisfactionIncrement>0.01</satisfactionIncrement>
+				<frustratedDecrement>-0.01</frustratedDecrement>
+			</li>
+			<li Class="RJW_Genes.TickIntervalExtension">
+				<!-- One day has 60k ticks, so we check every hour with 60000/24 = 2500-->
+				<tickInterval>2500</tickInterval>
+			</li>
+			<li Class="RJW_Genes.DistanceExtension">
+				<!-- distance 25 means 25 tiles in every direction from the empath.-->
+				<distance>25</distance>
+			</li>
+		</modExtensions>
+	</GeneDef>
+
+	<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>
-		<iconPath>Things/Mote/Heart</iconPath>
+		<iconPath>Genes/Icons/Vitality_Drainer</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>4</displayOrderInCategory>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<biostatCpx>1</biostatCpx>
 		<biostatMet>-1</biostatMet>
 	</GeneDef>

Common/Defs/GeneDefs/GeneDefs_Reproduction.xml

@@ -13,6 +13,13 @@
                 <def>Nymphomaniac</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>
@@ -28,6 +35,13 @@
                 <def>Rapist</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>
@@ -46,6 +60,13 @@
         <exclusionTags>
             <li>rjw_genes_sexual_orientation</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>
@@ -64,6 +85,38 @@
         <exclusionTags>
             <li>rjw_genes_sexual_orientation</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>
+    <defName>rjw_genes_no_sex_need</defName>
+    <label>Asexual</label>
+    <description>Carriers of this gene do not have a sex-need. They can still participate in sex, </description>
+    <iconPath>Genes/Icons/Empty</iconPath>
+    <displayOrderInCategory>5</displayOrderInCategory>
+    <disablesNeeds>
+      <li>Sex</li>
+    </disablesNeeds>
+    <biostatMet>-1</biostatMet>
+    <biostatCpx>2</biostatCpx>
+    
+    <exclusionTags>
+        <li>rjw_genes_sexual_orientation</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>
+
 </Defs>

Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml

@@ -1,48 +1,112 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-    <GeneDef>
+    
+    <GeneDef Name="SpecialBase" Abstract="True">
+      <displayCategory>rjw_genes_special</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="SpecialBase">
         <defName>rjw_genes_orgasm_rush</defName>
         <label>Orgasm Rush</label>
-        <displayCategory>rjw_genes_special</displayCategory>
-        <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>
         <displayOrderInCategory>1</displayOrderInCategory>
     </GeneDef>
 	
-    <GeneDef>
+    <GeneDef ParentName="SpecialBase">
         <defName>rjw_genes_youth_fountain</defName>
         <label>Youth Fountain</label>
-        <displayCategory>rjw_genes_special</displayCategory>
         <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>
         <displayOrderInCategory>2</displayOrderInCategory>
+        <modExtensions>
+            <li Class="RJW_Genes.AgeTransferExtension">
+                <!-- 60k = 1 day -->
+                <ageTickChange>60000</ageTickChange>
+                <minAgeInYears>18</minAgeInYears>
+            </li>
+        </modExtensions>
     </GeneDef>
     
-    <GeneDef>
+    <GeneDef ParentName="SpecialBase">
         <defName>rjw_genes_sex_age_drain</defName>
         <label>Sexual Age Drain</label>
-        <displayCategory>rjw_genes_special</displayCategory>
         <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>
         <displayOrderInCategory>3</displayOrderInCategory>
+        <modExtensions>
+            <li Class="RJW_Genes.AgeTransferExtension">
+                <!-- 120k = 2 days -->
+                <ageTickChange>120000</ageTickChange>
+                <minAgeInYears>18</minAgeInYears>
+            </li>
+        </modExtensions>
     </GeneDef>
     
-    <GeneDef>
+    <GeneDef ParentName="SpecialBase">
         <defName>rjw_genes_aphrodisiac_pheromones</defName>
         <label>Aphrodisiac Pheromones</label>
-        <displayCategory>rjw_genes_special</displayCategory>
-		    <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>UI/Memes/FleshPurity</iconPath>
+        <iconPath>Genes/Icons/Pheromones</iconPath>
         <displayOrderInCategory>4</displayOrderInCategory>
         <biostatCpx>1</biostatCpx>
         <biostatMet>1</biostatMet>
+
+        <modExtensions>
+			<li Class="RJW_Genes.TickIntervalExtension">
+				<!-- One day has 60k ticks, so we check every hour with 60000/48 = 1250-->
+				<tickInterval>1250</tickInterval>
+			</li>
+			<li Class="RJW_Genes.DistanceExtension">
+				<!-- distance 25 means 25 tiles in every direction from the pheromone-pawn.-->
+				<distance>25</distance>
+			</li>
+        </modExtensions>
     </GeneDef>
     
+    <GeneDef ParentName="SpecialBase">
+        <defName>rjw_genes_sexual_mytosis</defName>
+        <label>Orgasmic Mytosis</label>
+		<!-- <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>
+        <iconPath>UI/Icons/Genes/Gene_PsychicBonding</iconPath>
+        <displayOrderInCategory>5</displayOrderInCategory>
+        <biostatCpx>5</biostatCpx>
+        <biostatMet>-5</biostatMet>
+    </GeneDef>    
+
+    <GeneDef ParentName="SpecialBase">
+        <defName>rjw_genes_hormonal_saliva</defName>
+        <label>Hormonal Saliva</label>
+        <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" -->
+                <sizeIncrement>0.02</sizeIncrement>
+                <maxBodySize>2.5</maxBodySize>
+                <!-- CumMultiplier is applied "exponential" -->
+                <cumMultiplier>1.05</cumMultiplier>
+            </li>
+        </modExtensions>
+    </GeneDef>
+
 </Defs>

Common/Defs/GeneDefs/GeneDefs_SpecifiedGender.xml

@@ -9,6 +9,18 @@
         <iconPath>Genes/Icons/Female_Only</iconPath>
         <geneClass>RJW_Genes.Gene_FemaleOnly</geneClass>
         <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>
 
     <GeneDef>
@@ -20,6 +32,50 @@
         <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>
     
+
+    <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

@@ -0,0 +1,124 @@
+<?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

@@ -6,7 +6,7 @@
     <label>Succubus</label>
     <description>Succubi are strongly enhanced xenohumans. These overnaturally beautiful creatures 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>UI/Icons/Xenotypes/Sanguophage</iconPath>
+    <iconPath>Genes/Icons/Xenotypes/Xenotype-Succubus</iconPath>
     <soundDefOnImplant>PawnBecameSanguophage</soundDefOnImplant>
     <generateWithXenogermReplicatingHediffChance>0.5</generateWithXenogermReplicatingHediffChance>
     <xenogermReplicatingDurationLeftDaysRange>0.1~140</xenogermReplicatingDurationLeftDaysRange>
@@ -35,7 +35,10 @@
 
         <li>rjw_genes_paralysingkiss</li>
         <li>rjw_genes_seduce</li>
+        <li MayRequire="rjw.sexperience">AptitudeRemarkable_Sex</li>
 		
+        <li MayRequire="Sl4vP0weR.DominantGene">DominantGene</li>
+        <li MayRequire="LustLicentia.RJWLabs">rjw_genes_elasticity</li>
 		    <li>rjw_genes_succubus_wings</li>
         <li>rjw_genes_succubus_tail</li>
         <li>rjw_genes_aphrodisiac_pheromones</li>
@@ -53,7 +56,7 @@
     <label>Incubus</label>
     <description>Incubi are strongly enhanced xenohumans. These overnaturally beautiful creatures 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>UI/Icons/Xenotypes/Sanguophage</iconPath>
+    <iconPath>Genes/Icons/Xenotypes/Xenotype-Incubus</iconPath>
     <soundDefOnImplant>PawnBecameSanguophage</soundDefOnImplant>
     <generateWithXenogermReplicatingHediffChance>0.5</generateWithXenogermReplicatingHediffChance>
     <xenogermReplicatingDurationLeftDaysRange>0.1~140</xenogermReplicatingDurationLeftDaysRange>
@@ -77,6 +80,10 @@
 		    <li>rjw_genes_drainer</li>
 		    <li>rjw_genes_demonic_genitalia</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>rjw_genes_succubus_tail</li>
@@ -98,7 +105,7 @@
     <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>
     <descriptionShort>Female only, strong meele fighters, that use Fertilin from bitten-off cocks for powerful buffs.</descriptionShort>
-    <iconPath>UI/Icons/Xenotypes/Neanderthal</iconPath>
+    <iconPath>Genes/Icons/Xenotypes/Xenotype-Cumazon</iconPath>
     <generateWithXenogermReplicatingHediffChance>0.5</generateWithXenogermReplicatingHediffChance>
     <xenogermReplicatingDurationLeftDaysRange>0.1~140</xenogermReplicatingDurationLeftDaysRange>
     <combatPowerFactor>2.5</combatPowerFactor>

Common/Defs/HediffDefs/Hediffs_Evergrowth.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+	<HediffDef>
+		<defName>rjw_genes_evergrowth_sideeffect</defName>
+		<hediffClass>HediffWithComps</hediffClass>
+		<label>genital hybris</label>
+		<description>science has gone too far - a tool like this needs constant attention.</description>
+		<defaultLabelColor>(1,0,0.5)</defaultLabelColor>
+		<maxSeverity>1.0</maxSeverity>
+		<comps>
+			<li Class="HediffCompProperties_SeverityPerDay">
+				<severityPerDay>-0.025</severityPerDay>
+			</li>
+		</comps>
+		<stages>
+			<li>
+				<label>minor</label>
+				<statFactors>
+					<SexFrequency>3</SexFrequency>
+				</statFactors>
+			</li>
+			<li>
+				<minSeverity>0.5</minSeverity>
+				<label>moderate</label>
+				<statFactors>
+					<SexFrequency>5</SexFrequency>
+				</statFactors>
+                <capMods>
+                        <li>
+                            <capacity>Consciousness</capacity>
+                            <offset>-0.05</offset>
+                        </li>
+                        </capMods>
+			</li>
+			<li>
+				<minSeverity>0.9</minSeverity>
+				<label>strong</label>
+				<statFactors>
+					<SexFrequency>7</SexFrequency>
+				</statFactors>
+                    <capMods>
+                    <li>
+                        <capacity>Consciousness</capacity>
+                        <offset>-0.1</offset>
+                    </li>
+                    </capMods>
+			</li>
+		</stages>
+	</HediffDef>
+
+</Defs>

Common/Defs/HediffDefs/Hediffs_Fertilin.xml

@@ -74,7 +74,7 @@
 				<statOffsets>
 					<WorkSpeedGlobal>-0.2</WorkSpeedGlobal>
 				</statOffsets>
-        		<vomitMtbDays>0.01</vomitMtbDays>
+        		<vomitMtbDays>0.4</vomitMtbDays>
 				<hungerRateFactorOffset>0.1</hungerRateFactorOffset>
 				<restFallFactorOffset>0.35</restFallFactorOffset>
 			</li>
@@ -163,4 +163,4 @@
     <isBad>false</isBad>
   </HediffDef>
 
-</Defs>
+</Defs>

Common/Defs/HediffDefs/Hediffs_OrgasmicMytosis.xml

@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+  <HediffDef>
+    <defName>rjw_genes_orgasmic_mytosis_hediff</defName>
+    <hediffClass>HediffWithComps</hediffClass>
+    <label>Orgasmic Instability</label>
+    <description>Xenotypes with this Gene grow more unstable on orgasm - upon reaching critical level they will initate a process of mytosis.</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.9</severityPerDay>
+      </li>
+    </comps>
+    <stages>
+      <li>
+        <label>stable</label>
+        <capMods>
+          <li>
+            <capacity>Moving</capacity>
+            <offset>0.05</offset>
+          </li>
+          <li>
+            <capacity>Consciousness</capacity>
+            <offset>0.08</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <label>agitated</label>
+        <minSeverity>0.4</minSeverity>
+        <capMods>
+          <li>
+            <capacity>Moving</capacity>
+            <offset>0.15</offset>
+          </li>
+          <li>
+            <capacity>Consciousness</capacity>
+            <offset>0.15</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <label>unstable</label>
+        <minSeverity>0.7</minSeverity>
+        <capMods>
+          <li>
+            <capacity>Moving</capacity>
+            <offset>-0.1</offset>
+          </li>
+          <li>
+            <capacity>Consciousness</capacity>
+            <offset>-0.1</offset>
+          </li>
+          <li>
+            <capacity>BloodPumping</capacity>
+            <offset>+0.2</offset>
+          </li>
+        </capMods>
+      </li>
+      
+      <li>
+        <label>critical</label>
+        <minSeverity>0.9</minSeverity>
+        <capMods>
+          <li>
+            <capacity>Moving</capacity>
+            <offset>-0.25</offset>
+          </li>
+          <li>
+            <capacity>Consciousness</capacity>
+            <offset>-0.25</offset>
+          </li>
+          <li>
+            <capacity>BloodPumping</capacity>
+            <offset>+0.5</offset>
+          </li>
+        </capMods>
+      </li>
+    </stages>
+  </HediffDef>
+
+  <HediffDef>
+    <defName>rjw_genes_mytosis_shock_hediff</defName>
+    <hediffClass>HediffWithComps</hediffClass>
+    <label>Mytosis Shock</label>
+    <description>Recently underwent (successful) mytosis. As this is a taxing process, some time for regeneration is required. While regenerating, no new mytosis can be started.</description>
+    <defaultLabelColor>(240,200,110)</defaultLabelColor>
+    <scenarioCanAdd>false</scenarioCanAdd>
+    <maxSeverity>1.0</maxSeverity>
+    <isBad>true</isBad>
+    <tendable>false</tendable>
+    <comps>
+      <li Class="HediffCompProperties_SeverityPerDay">
+        <severityPerDay>-0.20</severityPerDay>
+      </li>
+    </comps>
+    <stages>
+      <li>
+        <label>wearing off</label>
+        <capMods>
+          <li>
+            <capacity>Moving</capacity>
+            <offset>-0.25</offset>
+          </li>
+          <li>
+            <capacity>Consciousness</capacity>
+            <offset>-0.25</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <label>fresh</label>
+        <minSeverity>0.6</minSeverity>
+        <capMods>
+          <li>
+            <capacity>Moving</capacity>
+            <offset>-0.50</offset>
+          </li>
+          <li>
+            <capacity>Consciousness</capacity>
+            <offset>-0.7</offset>
+          </li>
+        </capMods>
+      </li>
+    </stages>
+  </HediffDef>
+
+
+
+</Defs>
+

Common/Defs/HiveOffspringChanceDef/HiveOffspringChanceDefs.xml

@@ -0,0 +1,36 @@
+<?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/QueenWorkerMappingDefs/QueenWorkerMappingDefs_base.xml

@@ -0,0 +1,43 @@
+<?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/Scenarios/Halamyr_Hive.xml

@@ -0,0 +1,158 @@
+<?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

@@ -0,0 +1,102 @@
+<?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_Special.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>
+
+	<ThoughtDef>
+		<defName>rjw_genes_pheromone_carrier_nearby</defName>
+		<thoughtClass>Thought_SituationalSocial</thoughtClass>
+		<workerClass>RJW_Genes.ThoughtWorker_Aphrodisiac_Pheromones_Social</workerClass>
+		<stages>
+			<li>
+				<label>Pheromones</label>
+				<description>{0} has a special vibe, we should hang out more often.</description>
+				<baseOpinionOffset>+3</baseOpinionOffset>
+			</li>
+		</stages>
+	</ThoughtDef>
+
+</Defs>

Common/Languages/English/Keyed/Dialog_StatsReport.xml

@@ -0,0 +1,9 @@
+<?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

@@ -0,0 +1,7 @@
+<?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/Lifeforce.xml

@@ -14,4 +14,7 @@
 	
 	<rjw_genes_sexdemon_visit_incident_label>Dirty dreams</rjw_genes_sexdemon_visit_incident_label>
 	<rjw_genes_sexdemon_visit_incident_description>The dirty dreams of your colonists have attracted succubi.\n\nThey will hang around for a couple of days trying to seduce your colonists. They may decide to join your colony, if they are impressed by your colonists's sexual prowess.</rjw_genes_sexdemon_visit_incident_description>
-</LanguageData>
+
+	<rjw_genes_succubus_joins_letter_label>Guest Joins</rjw_genes_succubus_joins_letter_label>
+	<rjw_genes_succubus_joins_letter_description>{0} enjoys it here and has decided to stay.</rjw_genes_succubus_joins_letter_description>
+</LanguageData>

Common/Patches/ThingDefs/RJW_Used_Condoms.xml

@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Patch>
-	<!-- Add RJW Sex meditation focus icon to VanillaPsycastsExpanded -->
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimJobWorld</li>
-		</mods>
-		<match Class="PatchOperationAdd">
+	<!-- 
+		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
+		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
+		Please if you write mods, do not just purge out XMLs. Thanks. 
+
+		This patch was kindly provided by Infi over Discord. 
+	-->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="UsedCondom"]/ingestible/outcomeDoers</xpath>
+		<nomatch Class="PatchOperationAdd">
 			<xpath>/Defs/ThingDef[defName="UsedCondom"]/ingestible</xpath>
 			<value>
 				<outcomeDoers>
@@ -14,6 +22,15 @@
 					</li>
 				</outcomeDoers>
 			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="UsedCondom"]/ingestible/outcomeDoers</xpath>
+			<value>
+				<li Class="RJW_Genes.IngestionOutcomeDoer_LifeForceOffset">
+						<FertilinPerUnit>1</FertilinPerUnit>
+					</li>
+			</value>
 		</match>
 	</Operation>
+	
 </Patch>

Common/Patches/ThingDefs/Sexperience_Cum.xml

@@ -1,17 +1,42 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-	<!-- Add RJW Sex meditation focus icon to VanillaPsycastsExpanded -->
+
+	<!-- 
+		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
+		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
+		Please if you write mods, do not just purge out XMLs. Thanks. 
+
+		This patch was kindly mirrored after Infis Patch of UsedCondoms. 
+	-->
 	<Operation Class="PatchOperationFindMod">
 		<mods>
 			<li>RJW Sexperience</li>
 		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>/Defs/ThingDef[defName="GatheredCum"]/ingestible/outcomeDoers</xpath>
-			<value>
-				<li Class="RJW_Genes.IngestionOutcomeDoer_LifeForceOffset">
-					<FertilinPerUnit>1</FertilinPerUnit>
-				</li>
-			</value>
+		<match Class="PatchOperationConditional">
+			<xpath>Defs/ThingDef[defName="GatheredCum"]/ingestible/outcomeDoers</xpath>
+			<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>
+				</value>
+			</match>
 		</match>
 	</Operation>
+
 </Patch>

Common/Patches/Xenotypes/FromOtherMods/PatchKijinRace3.xml

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

Common/Patches/Xenotypes/FromOtherMods/PatchNarai.xml

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

Common/Patches/Xenotypes/FromOtherMods/PatchNyaron.xml

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

Common/Patches/Xenotypes/FromOtherMods/PatchPapou.xml

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

Common/Patches/Xenotypes/FromOtherMods/PatchRoosMinotaur.xml

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

Common/Patches/Xenotypes/FromOtherMods/PatchSaurid.xml

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

Common/Patches/Xenotypes/FromOtherMods/PatchVREPhytokin.xml

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Patch>
-<Operation Class="PatchOperationSequence">
-    <operations>
-        <li Class="PatchOperationFindMod">
-            <mods>
-                <li>Vanilla Races Expanded - Phytokin</li>
-            </mods>
-            <match Class="PatchOperationAdd">
-                <xpath>Defs/XenotypeDef[defName="VRE_Poluxkin"]/genes</xpath>
-                <value>
-                    <li>rjw_genes_tight_female_genitalia</li>
-                    <li>rjw_genes_tight_anus</li>
-                    <li>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_Gauranlenkin"]/genes</xpath>
-                <value>
-                    <li>rjw_genes_tight_female_genitalia</li>
-                    <li>rjw_genes_tight_anus</li>
-                    <li>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>rjw_genes_elasticity</li>
-                    <li>rjw_genes_bisexual</li>
-                </value>
-            </match>
-        </li>
-    </operations>
-</Operation>
-</Patch>

Common/Patches/Xenotypes/FromRJWGenes/PatchLicentiaLabs.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>LustLicentia.RJWLabs</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs/XenotypeDef[defName="rjw_genes_succubus"]/genes</xpath>
-			<value>
-				<li>rjw_genes_elasticity</li>
-			</value>
-		</match>
-	</Operation>
-</Patch>

Common/Patches/Xenotypes/FromRJWGenes/Patch_Dominant_Gene.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Patch>
-<Operation Class="PatchOperationSequence">
-    <operations>
-        <li Class="PatchOperationFindMod">
-            <mods>
-                <li>Dominant Gene</li>
-            </mods>
-            <match Class="PatchOperationAdd">
-                <xpath>Defs/XenotypeDef[defName="rjw_genes_succubus"]/genes</xpath>
-                <value>
-                    <li>DominantGene</li>
-                </value>
-            </match>
-        </li>
-        <li Class="PatchOperationFindMod">
-            <mods>
-                <li>Dominant Gene</li>
-            </mods>
-            <match Class="PatchOperationAdd">
-                <xpath>Defs/XenotypeDef[defName="rjw_genes_incubus"]/genes</xpath>
-                <value>
-                    <li>DominantGene</li>
-                </value>
-            </match>
-        </li>
-
-        <li Class="PatchOperationFindMod">
-            <mods>
-                <li>Dominant Gene</li>
-            </mods>
-            <match Class="PatchOperationAdd">
-                <xpath>Defs/XenotypeDef[defName="rjw_genes_cumazone"]/genes</xpath>
-                <value>
-                    <li>DominantGene</li>
-                </value>
-            </match>
-        </li>
-    </operations>
-</Operation>
-</Patch>

Common/Patches/Xenotypes/FromRJWGenes/Patch_Sexperience_SexSkill.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Patch>
-<Operation Class="PatchOperationSequence">
-    <operations>
-        <li Class="PatchOperationFindMod">
-            <mods>
-                <li>RJW Sexperience</li>
-            </mods>
-            <match Class="PatchOperationAdd">
-                <xpath>Defs/XenotypeDef[defName="rjw_genes_succubus"]/genes</xpath>
-                <value>
-                    <li>AptitudeRemarkable_Sex</li>
-                </value>
-            </match>
-        </li>
-        <li Class="PatchOperationFindMod">
-            <mods>
-                <li>RJW Sexperience</li>
-            </mods>
-            <match Class="PatchOperationAdd">
-                <xpath>Defs/XenotypeDef[defName="rjw_genes_incubus"]/genes</xpath>
-                <value>
-                    <li>AptitudeRemarkable_Sex</li>
-                </value>
-            </match>
-        </li>
-
-    </operations>
-</Operation>
-</Patch>

Common/Patches/Xenotypes/PatchAlphaGenes.xml

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

Common/Patches/Xenotypes/PatchBiotechNyaron.xml

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

Common/Patches/Xenotypes/PatchErinsAuronya.xml

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

Common/Patches/Xenotypes/PatchErinsShisune.xml

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

Common/Patches/Xenotypes/PatchKijinRace3.xml

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

Common/Patches/Xenotypes/PatchNarai.xml

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

Common/Patches/Xenotypes/PatchNyaron.xml

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

Common/Patches/Xenotypes/PatchPapou.xml

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

Common/Patches/Xenotypes/PatchRoosFaun.xml

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

Common/Patches/Xenotypes/PatchRoosMinotaur.xml

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

Common/Patches/Xenotypes/PatchRoosSatyr.xml

@@ -2,13 +2,14 @@
 <Patch>
 <Operation Class="PatchOperationFindMod">
     <mods>
-        <li>Biotech Nyaron</li>
+        <li>Roo's Satyr Xenotype</li>
     </mods>
     <match Class="PatchOperationAdd">
-		<xpath>Defs/XenotypeDef[defName="Nyaron"]/genes</xpath>
+        <xpath>Defs/XenotypeDef[defName="RBSF_Satyr"]/genes</xpath>
 		<value>
-			<li>rjw_genes_feline_genitalia</li>
+			<li>rjw_genes_aphrodisiac_pheromones</li>
+			<li>rjw_genes_much_cum</li>
 		</value>
 	</match>
 </Operation>
-</Patch>
+</Patch>

Common/Patches/Xenotypes/PatchSaurid.xml

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

Common/Patches/Xenotypes/PatchVREPhytokin.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+    <Operation Class="PatchOperationSequence">
+        <operations>
+            <li Class="PatchOperationFindMod">
+                <mods>
+                    <li>Vanilla Races Expanded - Phytokin</li>
+                </mods>
+                <match Class="PatchOperationAdd">
+                    <xpath>Defs/XenotypeDef[defName="VRE_Poluxkin"]/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_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

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

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+    <Operation Class="PatchOperationSequence">
+        <operations>
+            <li Class="PatchOperationFindMod">
+                <mods>
+                    <li>[LTS]Xenotech</li>
+                </mods>
+                <match Class="PatchOperationAdd">
+                    <xpath>Defs/XenotypeDef[defName="LTS_Nyankind"]/genes</xpath>
+                    <value>
+                        <li>rjw_genes_feline_genitalia</li>
+                    </value>
+                </match>
+            </li>
+            <li Class="PatchOperationFindMod">
+                <mods>
+                    <li>[LTS]Xenotech</li>
+                </mods>
+                <match Class="PatchOperationAdd">
+                    <xpath>Defs/XenotypeDef[defName="LTS_Growler"]/genes</xpath>
+                    <value>
+                        <li>rjw_genes_canine_genitalia</li>
+                    </value>
+                </match>
+            </li>
+
+            <li Class="PatchOperationFindMod">
+                <mods>
+                    <li>[LTS]Xenotech</li>
+                </mods>
+                <match Class="PatchOperationAdd">
+                    <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="PatchOperationFindMod">
+                <mods>
+                    <li>[LTS]Xenotech</li>
+                </mods>
+                <match Class="PatchOperationAdd">
+                    <xpath>Defs/XenotypeDef[defName="LTS_Ork"]/genes</xpath>
+                    <value>
+                        <li>rjw_genes_big_male_genitalia</li>
+                        <li>rjw_genes_loose_female_genitalia</li>
+                    </value>
+                </match>
+            </li>
+
+            <li Class="PatchOperationFindMod">
+                <mods>
+                    <li>[LTS]Xenotech</li>
+                </mods>
+                <match Class="PatchOperationAdd">
+                    <xpath>Defs/XenotypeDef[defName="LTS_Lilime"]/genes</xpath>
+                    <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>
+    </Operation>
+</Patch>