About/About.xml

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

CHANGELOG.md

@@ -14,7 +14,6 @@
 - "Curiosity Genes" alongside other Curiosities from VRE. Thanks to @Jaaldabaoth (#88)
 - Support for many VE-Genetics Animals into the Animal-Framework. Thanks to @Jaaldabaoth (#88)
 - "Likes Cumflation"-Gene now also makes pawns immune against the effects of cumflations. They are still cumflated. 
-- Gasmasks make immune against Aphrodisiac Pheromones (#108)
 
 **Fixes**:
 

CONTRIBUTING.md

@@ -32,4 +32,3 @@ But please consider also the following:
 - Littered Birth, Many of the Penis Types are from Jaaldabaoth
 - Feline Genitalia, Animal Mating Call and Udder are from Kira-Bad-Artist
 - Sexual Tamer, Pheromone Spit and Mating call are from Archer
-- The Preview was started with [Yodayo](https://yodayo.com/) 

Common/Defs/GeneDefs/GeneDefs_Breeding.xml

@@ -1,14 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-  <!-- rjw_genes_mechbreeder,rjw_genes_insectincubator and rjw_genes_insectbreeder were kindly
+  <!-- rjw_genes_mechbreeder,rjw_genes_insectincubator and rjw_genes_insectbreeder were kindly supplied by `Shabalox` https://github.com/Shabalox/RJW_Genes_Addons/ -->
-  supplied by `Shabalox` https://github.com/Shabalox/RJW_Genes_Addons/ -->
 
   <GeneDef Name="BreedingBase" Abstract="True">
 		<displayCategory>rjw_genes_breeding</displayCategory>
 
 		<modExtensions>
-      <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
+				<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-        Class="VanillaGenesExpanded.GeneExtension">
 					<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
 					<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
 				</li>
@@ -42,8 +40,7 @@
   <GeneDef ParentName="BreedingBase">
       <defName>rjw_genes_fertile_anus</defName>
       <label>fertile anus</label>
-    <description>Xenotypes with this gene have a functional uterus connected to the anal cavity even
+      <description>Xenotypes with this gene have a functional uterus connected to the anal cavity even for males</description>
-      for males</description>
       <iconPath>Genes/Icons/Fertile_anus</iconPath>
       <displayOrderInCategory>54</displayOrderInCategory>    
   </GeneDef>
@@ -73,8 +70,7 @@
     <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
+    <description>Pawns that have a female (egg producing) ovipositor produce eggs at drastically increased speed.</description>
-      increased speed.</description>
     <iconPath>Genes/Icons/Fervent_Ovipositor</iconPath>
     <displayOrderInCategory>55</displayOrderInCategory>
     <biostatCpx>1</biostatCpx>

Common/Defs/GeneDefs/GeneDefs_Cosmetic.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Defs>
   <GeneDef Name="rjw_genes_wings" Abstract="True">
     <displayCategory>Miscellaneous</displayCategory>
@@ -44,8 +44,7 @@
 	</renderNodeProperties>
     
     <modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
+			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				Class="VanillaGenesExpanded.GeneExtension">
 				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
 				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
 			</li>
@@ -58,8 +57,7 @@
    <GeneDef ParentName="GeneTailBase">
     <defName>rjw_genes_succubus_tail</defName>
     <label>succubus tail</label>
-		<description>Carriers of this gene grow a slender tail ending with a heart that can act as a
+    <description>Carriers of this gene grow a slender tail ending with a heart that can act as a dexterous fifth limb.</description>
-			dexterous fifth limb.</description>
     <iconPath>Genes/Icons/Succubus_Tail</iconPath>
     <iconColor>(1, 0, 0)</iconColor>
     <displayOrderInCategory>1000</displayOrderInCategory>
@@ -104,8 +102,7 @@
 	  <randomChosen>true</randomChosen>
   
     <modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
+			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				Class="VanillaGenesExpanded.GeneExtension">
 				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
 				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
 			</li>

Common/Defs/GeneDefs/GeneDefs_Cum.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Defs>
     <GeneDef Name="GeneCumAmount" Abstract="True">
       <displayCategory>rjw_genes_cum</displayCategory>
@@ -7,8 +7,7 @@
       </exclusionTags>  
       <randomChosen>false</randomChosen>
       <modExtensions>
-      <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
+        <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-        Class="VanillaGenesExpanded.GeneExtension">
           <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
           <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
         </li>
@@ -41,8 +40,7 @@
   <GeneDef ParentName="GeneCumAmount">
     <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
+    <description>Males of this species produce a whole lot of fluid. They are like fountains basically.</description>
-      basically.</description>
     <iconPath>Genes/Icons/Very_Much_Cum</iconPath>
     <geneClass>RJW_Genes.Gene_VeryMuchCum</geneClass>
     <displayOrderInCategory>535</displayOrderInCategory>

Common/Defs/GeneDefs/GeneDefs_Damage.xml

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

Common/Defs/GeneDefs/GeneDefs_ExtraGenitalia.xml

@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Defs>
   <GeneDef Name="GeneExtraGenitaliaBase" Abstract="True">
 
 	  <randomChosen>false</randomChosen>
     <modExtensions>
-      <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
+			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-        Class="VanillaGenesExpanded.GeneExtension">
 				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
 				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
 			</li>
@@ -123,8 +122,7 @@
 	    <defName>rjw_genes_futa</defName>
 	    <label>futanari</label>
 	    <displayCategory>rjw_genes_gender</displayCategory>
-    <description>Males with this gene grow additional female genitalia, females grow additional male
+	    <description>Males with this gene grow additional female genitalia, females grow additional male genitalia.</description>
-      genitalia.</description>
 	    <iconPath>Genes/Icons/Futa</iconPath>
 	    <geneClass>RJW_Genes.Gene_Futa</geneClass>
 	    <displayOrderInCategory>709</displayOrderInCategory>

Common/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
   <GeneDef Name="GeneGenitalTypeBase" Abstract="True">
@@ -9,16 +9,15 @@
     </exclusionTags>
 	  <randomChosen>true</randomChosen>
     <biostatCpx>0</biostatCpx>
+    
     <modExtensions>
-      <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
+			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-        Class="VanillaGenesExpanded.GeneExtension">
 				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
 				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
 			</li>
 		</modExtensions>
   </GeneDef>
   
-
   <GeneDef ParentName="GeneGenitalTypeBase">
     <defName>rjw_genes_equine_genitalia</defName>
     <label>equine genitalia</label>
@@ -94,6 +93,7 @@
 	  	<li Class="RJW_Genes.QirkExtension">
         <Satisfiedquirk>DemonLoverQuirk</Satisfiedquirk>
 		</li>
+
     </modExtensions>
     <displayOrderInCategory>805</displayOrderInCategory>
   </GeneDef>
@@ -178,6 +178,7 @@
       <li Class="RJW_Genes.GenitaliaTypeExtension">
         <penis>RaccoonPenis</penis>
       </li>
+	  
     </modExtensions>
     <displayOrderInCategory>807</displayOrderInCategory>
   </GeneDef>
@@ -198,6 +199,10 @@
     <displayOrderInCategory>807</displayOrderInCategory>
   </GeneDef>
   
+  
+  
+  
+  
   <GeneDef ParentName="GeneGenitalTypeBase">
     <defName>rjw_genes_Ghost_genitalia</defName>
     <label>ghost genitalia</label>
@@ -315,6 +320,7 @@
     <displayOrderInCategory>807</displayOrderInCategory>
   </GeneDef>  
 
+
   <GeneDef ParentName="GeneGenitalTypeBase">
     <defName>rjw_genes_ovipositor_genitalia</defName>
     <label>insect genitalia</label>
@@ -331,10 +337,13 @@
 		</li>
     </modExtensions>
     <displayOrderInCategory>808</displayOrderInCategory>
+
     <exclusionTags>
 			<li>Egglaying</li>
 			<li>AG_Egglaying</li>
 		</exclusionTags>
+    
   </GeneDef>
 
+
 </Defs>

Common/Defs/GeneDefs/GeneDefs_LifeForce.xml

@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 	
 	<GeneDef Name="LifeForceBase" Abstract="True">
 		<displayCategory>rjw_genes_fertilin</displayCategory>
 		
 		<modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
+			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				Class="VanillaGenesExpanded.GeneExtension">
 				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
 				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
 			</li>
@@ -16,10 +15,7 @@
 	<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
+		<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>
-			resource called fertilin. The resource can be gained and spent in various ways, some of
-			which are unlocked by other genes.\n\nCarriers lose 5 fertilin per day from biological
-			entropy. \n\nGene is inactive until carrier is able to have sex.</description>
 		<geneClass>RJW_Genes.Gene_LifeForce</geneClass>
 		<resourceGizmoType>RJW_Genes.GeneGizmo_ResourceLifeForce</resourceGizmoType>
 		<resourceLabel>fertilin</resourceLabel>
@@ -30,10 +26,7 @@
 		</resourceGizmoThresholds>
 		<showGizmoOnWorldView>true</showGizmoOnWorldView>
 		<showGizmoWhenDrafted>true</showGizmoWhenDrafted>
-		<resourceDescription>A reserve of biological strength which can be gained and spent in a
+		<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>
-			variety of ways. \n\nFertilin can be increased by absorbing cum, typically through oral
-			sex or stored cum. \n\nIf fertilin reaches zero, {PAWN_nameDef} will become very unhappy
-			and may try to obtain some forcefully.</resourceDescription>
 		<iconPath>Genes/Icons/FertilinAlt</iconPath>
 		<selectionWeight>0</selectionWeight>
 		<displayOrderInCategory>-2</displayOrderInCategory>
@@ -43,9 +36,7 @@
 		</customEffectDescriptions>
 		<symbolPack>
 		  <prefixSymbols>
-				<li>
+			<li><symbol>fert</symbol></li>
-					<symbol>fert</symbol>
-				</li>
 		  </prefixSymbols>
 		</symbolPack>
 		<resourceLossPerDay>0.025</resourceLossPerDay>
@@ -87,15 +78,9 @@
 		<biostatMet>-1</biostatMet>
 		<symbolPack>
 			<suffixSymbols>
-				<li>
+				<li><symbol>life</symbol></li>
-					<symbol>life</symbol>
+				<li><symbol>pussy</symbol></li>
-				</li>
+				<li><symbol>heal</symbol></li>
-				<li>
-					<symbol>pussy</symbol>
-				</li>
-				<li>
-					<symbol>heal</symbol>
-				</li>
 			</suffixSymbols>
 		</symbolPack>
 	</GeneDef>
@@ -104,8 +89,7 @@
 		<defName>rjw_genes_cockeater</defName>
 		<label>cockeater</label>
 		<labelShortAdj>cockeater</labelShortAdj>
-		<description>Carriers of this gene are able eat cocks to restore their fertilin supply.
+		<description>Carriers of this gene are able eat cocks to restore their fertilin supply. Cocks are consumed during that process.</description>
-			Cocks are consumed during that process.</description>
 		<iconPath>Genes/Icons/cockeater</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>11</displayOrderInCategory>
@@ -119,15 +103,9 @@
 		<biostatMet>-1</biostatMet>
 		<symbolPack>
 			<suffixSymbols>
-				<li>
+				<li><symbol>life</symbol></li>
-					<symbol>life</symbol>
+				<li><symbol>cock</symbol></li>
-				</li>
+				<li><symbol>eat</symbol></li>
-				<li>
-					<symbol>cock</symbol>
-				</li>
-				<li>
-					<symbol>eat</symbol>
-				</li>
 			</suffixSymbols>
 		</symbolPack>
 	</GeneDef>
@@ -150,12 +128,8 @@
 		<biostatMet>-1</biostatMet>
 		<symbolPack>
 			<suffixSymbols>
-				<li>
+				<li><symbol>stun</symbol></li>
-					<symbol>stun</symbol>
+				<li><symbol>kiss</symbol></li>
-				</li>
-				<li>
-					<symbol>kiss</symbol>
-				</li>
 			</suffixSymbols>
 		</symbolPack>
 	</GeneDef>
@@ -179,12 +153,8 @@
 		
 		<symbolPack>
 			<suffixSymbols>
-				<li>
+				<li><symbol>stun</symbol></li>
-					<symbol>stun</symbol>
+				<li><symbol>kiss</symbol></li>
-				</li>
-				<li>
-					<symbol>kiss</symbol>
-				</li>
 			</suffixSymbols>
 		</symbolPack>
 	</GeneDef>
@@ -192,8 +162,7 @@
 	<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
+		<description>Carriers of this gene are able to temporarily increase their strength and resilience, while they are naked.</description>
-			resilience, while they are naked.</description>
 		<iconPath>Genes/Icons/rjw_naked_prowess</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>14</displayOrderInCategory>
@@ -210,8 +179,7 @@
 	<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
+		<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>
-			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>
@@ -221,8 +189,7 @@
 	<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
+		<description>Carriers of this gene are able to absorb the fertilin inside sperm through their vagina and anus.</description>
-			their vagina and anus.</description>
 		<iconPath>Genes/Icons/Vaginal_cum_absorption</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>2</displayOrderInCategory>
@@ -233,8 +200,7 @@
 		<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
+		<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>
-			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>
@@ -261,9 +227,7 @@
 	<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
+		<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>
-			the vitality of the partner. This is done passively through having sex with a
-			non-drained pawn that does not have this gene.</description>
 		<iconPath>Genes/Icons/Vitality_Drainer</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>4</displayOrderInCategory>

Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Defs>
     
     <GeneDef Name="SpecialBase" Abstract="True">
       <displayCategory>rjw_genes_special</displayCategory>
+      
       <modExtensions>
-            <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core"
+          <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-                Class="VanillaGenesExpanded.GeneExtension">
             <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
             <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
           </li>
@@ -15,8 +15,7 @@
     <GeneDef ParentName="SpecialBase">
         <defName>rjw_genes_orgasm_rush</defName>
         <label>orgasm rush</label>
-        <description>On orgasm, carriers of this gene get a boost in activity. (rest-need is
+        <description>On orgasm, carriers of this gene get a boost in activity. (rest-need is partially filled)</description>
-            partially filled)</description>
         <biostatCpx>1</biostatCpx>
         <biostatMet>-2</biostatMet>
         <iconPath>UI/Memes/FleshPurity</iconPath>
@@ -26,8 +25,7 @@
     <GeneDef ParentName="SpecialBase">
         <defName>rjw_genes_youth_fountain</defName>
         <label>youth fountain</label>
-        <description>Having sex with a carrier of this gene makes the partner slightly younger.
+        <description>Having sex with a carrier of this gene makes the partner slightly younger. (Partner stays adult)</description>
-            (Partner stays adult)</description>
         <biostatCpx>2</biostatCpx>
         <biostatMet>-2</biostatMet>
         <iconPath>UI/Ideoligions/FireLeaves</iconPath>
@@ -44,8 +42,7 @@
     <GeneDef ParentName="SpecialBase">
         <defName>rjw_genes_sex_age_drain</defName>
         <label>sexual age drain</label>
-        <description>Having sex transfers some of the partners life-time to themselves. (Pawn stays
+        <description>Having sex transfers some of the partners life-time to themselves. (Pawn stays adult)</description>
-            adult)</description>
         <biostatCpx>2</biostatCpx>
         <biostatMet>-1</biostatMet>
         <iconPath>UI/Icons/ColonistBar/Idle</iconPath>
@@ -68,6 +65,7 @@
         <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-->
@@ -84,10 +82,7 @@
         <defName>rjw_genes_sexual_mytosis</defName>
         <label>orgasmic mytosis</label>
 		<!-- <geneClass>RJW_Genes.Gene_Aphrodisiac_Pheromones</geneClass> -->
-        <description>Carriers have malfunctioning regenerative archites that grow more unstable with
+        <description>Carriers have malfunctioning regenerative archites that grow more unstable with ongoing multiple orgasms - climaxing in a process of mytosis. This will result in an (biologically) identical pawn and both twins are set in a regenerative state. Also, the pawn can have multiple orgasms: In a state of higher unstableness, they come quicker.</description>
-            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>
@@ -98,12 +93,12 @@
     <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
+        <description>The saliva of this xenotype stimulates growth in penises. Regular contact will lead to noticable growth.</description>
-            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" -->
@@ -119,8 +114,7 @@
 		<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)
+		<description>Carriers of this gene can produce a cocoon to prepare helpless (or willing) victims for breeding.</description>
-            victims for breeding.</description>
 		<iconPath>Genes/Icons/Cocoon</iconPath>
 		<displayOrderInCategory>11</displayOrderInCategory>
 		<abilities>

Common/Defs/GeneDefs/GeneDefs_SpecifiedGender.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Defs>
     <GeneDef>
         <defName>rjw_genes_female_only</defName>
@@ -9,13 +9,14 @@
         <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"
+          <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-        Class="VanillaGenesExpanded.GeneExtension">
             <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
             <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
           </li>
@@ -31,19 +32,21 @@
         <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"
+          <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-        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>
@@ -53,15 +56,17 @@
         <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"
+          <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-        Class="VanillaGenesExpanded.GeneExtension">
             <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
             <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
           </li>

Common/Defs/GeneDefs/Xenotype_Lifeforce.xml

@@ -1,13 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
   <XenotypeDef>
     <defName>rjw_genes_succubus</defName>
     <label>succubus</label>
-    <description>Succubi are strongly enhanced xenohumans. These overnaturally beautiful creatures
+    <description>Succubi are strongly enhanced xenohumans. These overnaturally beautiful creatures strive parasitically on the Fertilin found in semen.</description>
-      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>
-    <descriptionShort>Succubi are beautiful and extremely hungry Xenohumans. They strive on having
-      sex and extracting their victims life-force through this. </descriptionShort>
     <iconPath>Genes/Icons/Xenotypes/Xenotype-Succubus</iconPath>
     <soundDefOnImplant>PawnBecameSanguophage</soundDefOnImplant>
     <generateWithXenogermReplicatingHediffChance>0.5</generateWithXenogermReplicatingHediffChance>
@@ -31,11 +29,14 @@
         <li>rjw_genes_lifeforce</li>
         <li>rjw_genes_lifeforce_drain</li>
 		    <li>rjw_genes_demonic_genitalia</li>
+		
 		    <li>rjw_genes_cum_eater</li>
         <li>rjw_genes_fertilin_absorber</li>
+
         <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>
@@ -53,10 +54,8 @@
   <XenotypeDef>
     <defName>rjw_genes_incubus</defName>
     <label>incubus</label>
-    <description>Incubi are strongly enhanced xenohumans. These overnaturally beautiful creatures
+    <description>Incubi are strongly enhanced xenohumans. These overnaturally beautiful creatures strive parasitically on the Fertilin found in semen.</description>
-      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>
-    <descriptionShort>Incubi are beautiful and extremely hungry Xenohumans. They strive on having
-      sex and extracting their victims life-force through this. </descriptionShort>
     <iconPath>Genes/Icons/Xenotypes/Xenotype-Incubus</iconPath>
     <soundDefOnImplant>PawnBecameSanguophage</soundDefOnImplant>
     <generateWithXenogermReplicatingHediffChance>0.5</generateWithXenogermReplicatingHediffChance>
@@ -80,12 +79,16 @@
         <li>rjw_genes_lifeforce_drain</li>
 		    <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>
         <li>rjw_genes_aphrodisiac_pheromones</li>
+
         <li>Beauty_Pretty</li>
         <li>MoveSpeed_Quick</li>
         <li>Robust</li>
@@ -100,14 +103,8 @@
   <XenotypeDef>
     <defName>rjw_genes_cumazone</defName>
     <label>Cumazone</label>
-    <description>Cumazone are a female only xenotype that excel at meele combat. Originally created
+    <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>
-      as bodyguards for glitterworld amazon communities, they spred to other systems by mere
+    <descriptionShort>Female only, strong meele fighters, that use Fertilin from bitten-off cocks for powerful buffs.</descriptionShort>
-      strength and providing for some fetishes. They can use Fertilin to enhance their skin to
-      overpower any combatant in meele. Their only source for Fertilin is biting of male genitalia -
-      so be sure to have a steady supply of victim males or prepare to raid unsuspecting men of the
-      rim.</description>
-    <descriptionShort>Female only, strong meele fighters, that use Fertilin from bitten-off cocks
-      for powerful buffs.</descriptionShort>
     <iconPath>Genes/Icons/Xenotypes/Xenotype-Cumazon</iconPath>
     <generateWithXenogermReplicatingHediffChance>0.5</generateWithXenogermReplicatingHediffChance>
     <xenogermReplicatingDurationLeftDaysRange>0.1~140</xenogermReplicatingDurationLeftDaysRange>

Source/Genes/Special/Genes/Gene_Aphrodisiac_Pheromones.cs

@@ -57,10 +57,6 @@ namespace RJW_Genes
                 // Do nothing for pawns that also have pheromones
                 if (GeneUtility.HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_aphrodisiac_pheromones))
                     continue;
-                // Do nothing for pawns that wear Gas-Masks
-                if (pawn.apparel != null && pawn.apparel.AnyApparel)
-                    if (pawn.apparel.WornApparel.Any(apparel => apparel.def == RimWorld.ThingDefOf.Apparel_GasMask))
-                        continue;
 
                 // Actual Logic: 
                 // Pawn qualifies in right distance and needs line of sight.