Merge branch 'dev'

Apparently it goes off even if race support is installed right

This reverts commit 2737a680fa.

1.4/Defs/DNADef/DNADefs.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<Defs>
-<!-- Obsoleted
-  <RJW_Menstruation.DNADef>
-    <defName>Human</defName>
-    <label>human fetus</label>
-	<fetusTexPath>Fetus/Fetus_Default</fetusTexPath>
-	<cumThickness>0.2</cumThickness> 
--->
-  
-  
-  
-</Defs>

1.4/Defs/GeneDefs/GeneDefs_Menstruation.xml

@@ -9,7 +9,8 @@
 
 	<GeneDef Name="Menstruation_EggLifetime" Abstract="True">
 		<displayCategory>Menstruation</displayCategory>
-		<exclusionTags>
+    <iconPath>UI/Genes/Placeholder</iconPath>
+    <exclusionTags>
 			<li>Menstruation_EggLifetime</li>
 		</exclusionTags>
 	</GeneDef>
@@ -18,33 +19,49 @@
 		<defName>Menstruation_ShortEggLifetime</defName>
 		<label>short egg lifetime</label>
 		<description>Unfertilized eggs with this gene last three-quarters as long.</description>
-		<iconPath>UI/Genes/Placeholder</iconPath>
+		<iconPath>UI/Genes/ShortEggLifetime</iconPath>
 		<biostatMet>1</biostatMet>
 		<displayOrderInCategory>10</displayOrderInCategory>
+    <modExtensions>
+      <li Class ="RJW_Menstruation.MenstruationModExtension">
+        <eggLifeTimeFactor>0.75</eggLifeTimeFactor>
+      </li>
+    </modExtensions>
 	</GeneDef>
 
 	<GeneDef ParentName="Menstruation_EggLifetime">
 		<defName>Menstruation_DoubleEggLifetime</defName>
 		<label>double egg lifetime</label>
 		<description>Unfertilized eggs with this gene last twice as long.</description>
-		<iconPath>UI/Genes/Placeholder</iconPath>
+		<iconPath>UI/Genes/DoubleEggLifetime</iconPath>
 		<biostatMet>-1</biostatMet>
 		<displayOrderInCategory>12</displayOrderInCategory>
+    <modExtensions>
+      <li Class ="RJW_Menstruation.MenstruationModExtension">
+        <eggLifeTimeFactor>2.0</eggLifeTimeFactor>
+      </li>
+    </modExtensions>
 	</GeneDef>
 
 	<GeneDef ParentName="Menstruation_EggLifetime">
 		<defName>Menstruation_QuadEggLifetime</defName>
 		<label>quadrule egg lifetime</label>
 		<description>Eggs with this gene last four times as long.</description>
-		<iconPath>UI/Genes/Placeholder</iconPath>
+		<iconPath>UI/Genes/QuadEggLifetime</iconPath>
 		<biostatMet>-2</biostatMet>
 		<biostatCpx>1</biostatCpx>
 		<displayOrderInCategory>16</displayOrderInCategory>
+    <modExtensions>
+      <li Class ="RJW_Menstruation.MenstruationModExtension">
+        <eggLifeTimeFactor>4.0</eggLifeTimeFactor>
+      </li>
+    </modExtensions>
 	</GeneDef>
 
 	<GeneDef Name="Menstruation_Estrus" Abstract="True">
 		<displayCategory>Menstruation</displayCategory>
-		<exclusionTags>
+    <iconPath>UI/Genes/Placeholder</iconPath>
+    <exclusionTags>
 			<li>Menstruation_Estrus</li>
 		</exclusionTags>
 	</GeneDef>
@@ -53,24 +70,35 @@
 		<defName>Menstruation_NeverEstrus</defName>
 		<label>never estrus</label>
 		<description>Carriers of this gene will never go into estrus.</description>
-		<iconPath>UI/Genes/Placeholder</iconPath>
+		<iconPath>UI/Genes/NeverEstrus</iconPath>
 		<biostatMet>1</biostatMet>
 		<displayOrderInCategory>20</displayOrderInCategory>
+    <modExtensions>
+      <li Class ="RJW_Menstruation.MenstruationModExtension">
+        <neverEstrus>true</neverEstrus>
+      </li>
+    </modExtensions>
 	</GeneDef>
 
 	<GeneDef ParentName="Menstruation_Estrus">
 		<defName>Menstruation_FullEstrus</defName>
 		<label>full estrus</label>
 		<description>Carriers of this gene will enter full estrus every menstrual cycle, regardless of vagina type.</description>
-		<iconPath>UI/Genes/Placeholder</iconPath>
+		<iconPath>UI/Genes/FullEstrus</iconPath>
 		<biostatMet>-1</biostatMet>
 		<biostatCpx>1</biostatCpx>
 		<displayOrderInCategory>25</displayOrderInCategory>
+    <modExtensions>
+      <li Class ="RJW_Menstruation.MenstruationModExtension">
+        <alwaysEstrus>true</alwaysEstrus>
+      </li>
+    </modExtensions>
 	</GeneDef>
 	
 	<GeneDef Name="Menstruation_Ovulation" Abstract="True">
 		<displayCategory>Menstruation</displayCategory>
-		<exclusionTags>
+    <iconPath>UI/Genes/Placeholder</iconPath>
+    <exclusionTags>
 			<li>Menstruation_Ovulation</li>
 		</exclusionTags>
 	</GeneDef>
@@ -79,18 +107,28 @@
 		<defName>Menstruation_DoubleOvulation</defName>
 		<label>double ovulation</label>
 		<description>Carriers of this gene will ovulate twice as many eggs.</description>
-		<iconPath>UI/Genes/Placeholder</iconPath>
+		<iconPath>UI/Genes/DoubleOvulation</iconPath>
 		<biostatMet>-1</biostatMet>
 		<displayOrderInCategory>30</displayOrderInCategory>
+    <modExtensions>
+      <li Class ="RJW_Menstruation.MenstruationModExtension">
+        <ovulationFactor>2</ovulationFactor>
+      </li>
+    </modExtensions>
 	</GeneDef>
 
 	<GeneDef ParentName="Menstruation_Ovulation">
 		<defName>Menstruation_QuadOvulation</defName>
 		<label>quadruple ovulation</label>
 		<description>Carriers of this gene will ovulate four times as many eggs.</description>
-		<iconPath>UI/Genes/Placeholder</iconPath>
+		<iconPath>UI/Genes/QuadOvulation</iconPath>
 		<biostatMet>-1</biostatMet>
 		<displayOrderInCategory>35</displayOrderInCategory>
+    <modExtensions>
+      <li Class ="RJW_Menstruation.MenstruationModExtension">
+        <ovulationFactor>4</ovulationFactor>
+      </li>
+    </modExtensions>
 	</GeneDef>
 
 	<GeneDef>
@@ -98,9 +136,14 @@
 		<label>no bleeding</label>
 		<displayCategory>Menstruation</displayCategory>
 		<description>Carriers of this gene will not bleed at the end of their cycle.</description>
-		<iconPath>UI/Genes/Placeholder</iconPath>
-		<biostatMet>1</biostatMet>
+		<iconPath>UI/Genes/NoBleeding</iconPath>
+		<biostatMet>-1</biostatMet>
 		<displayOrderInCategory>40</displayOrderInCategory>
+    <modExtensions>
+      <li Class ="RJW_Menstruation.MenstruationModExtension">
+        <noBleeding>true</noBleeding>
+      </li>
+    </modExtensions>
 	</GeneDef>
 	
 	<!-- Pheromones? -->

1.4/Defs/HediffDef/Hediffs_Menstruation.xml

@@ -83,7 +83,13 @@
 					<SexSatisfaction>1.5</SexSatisfaction>
 				</statFactors>
 			</li>
-		</stages>	
+		</stages>
+    <comps>
+      <li Class="RJW_Menstruation.CompProperties_Pheromones">
+        <daysToMaxSeverity>0.25</daysToMaxSeverity>	<!-- The amount of time spent near someone in estrus for full effect -->
+        <range>6</range>
+      </li>
+    </comps>
 	</HediffDef>
 	
 	<HediffDef Name="Hediff_Estrus_Concealed">
@@ -113,6 +119,51 @@
 		</stages>	
 	</HediffDef>
 	
+  <HediffDef Name="Hediff_AffectedByPheromones">
+    <hediffClass>HediffWithComps</hediffClass>
+    <defName>Hediff_AffectedByPheromones</defName>
+    <label>Affected by pheromones</label>
+    <description>A condition caused by being around someone in estrus. Sex drive and satisfaction is increased by the scent of heat.</description>
+    <defaultLabelColor>(1.00,0.60,0.75)</defaultLabelColor>
+    <isBad>false</isBad>
+    <tendable>false</tendable>
+    <makesSickThought>false</makesSickThought>
+    <makesAlert>false</makesAlert>
+    <maxSeverity>1.0</maxSeverity>
+    <injuryProps>
+      <canMerge>true</canMerge>
+    </injuryProps>
+    <stages>
+      <li>
+        <label>weak</label>
+        <statFactors>
+          <SexFrequency>1.1</SexFrequency>
+        </statFactors>
+      </li>
+      <li>
+        <minSeverity>0.4</minSeverity>
+        <label>moderate</label>
+        <statFactors>
+          <SexFrequency>1.4</SexFrequency>
+          <SexSatisfaction>1.1</SexSatisfaction>
+        </statFactors>
+      </li>
+      <li>
+        <minSeverity>0.8</minSeverity>
+        <label>strong</label>
+        <statFactors>
+          <SexFrequency>2.0</SexFrequency>
+          <SexSatisfaction>1.2</SexSatisfaction>
+        </statFactors>
+      </li>
+    </stages>
+    <comps>
+      <li Class="HediffCompProperties_SeverityPerDay">
+        <severityPerDay>-1.0</severityPerDay>
+      </li>
+    </comps>
+  </HediffDef>
+  
 	
 	<HediffDef Name="Hediff_PainReliever">
 		<hediffClass>HediffWithComps</hediffClass>

1.4/Defs/ThingDefs/Apparel_Absorbers.xml

@@ -59,9 +59,16 @@
       <tags>
         <li>Absorber</li>
       </tags>
+      <defaultOutfitTags>
+        <li>Worker</li>
+        <li>Soldier</li>
+        <li>Nudist</li>
+        <li>Slave</li>
+      </defaultOutfitTags>
     </apparel>
     <modExtensions>
       <li Class="RJW_Menstruation.AbsorberModExtension">
+        <passiveAbsorptionPerHour>0.2</passiveAbsorptionPerHour>
         <leakAfterDirty>false</leakAfterDirty>
         <effectsAfterDirty>true</effectsAfterDirty>
         <minHourstoDirtyEffect>10</minHourstoDirtyEffect>
@@ -116,6 +123,7 @@
     </apparel>
     <modExtensions>
       <li Class="RJW_Menstruation.AbsorberModExtension">
+        <passiveAbsorptionPerHour>0.2</passiveAbsorptionPerHour>
         <leakAfterDirty>false</leakAfterDirty>
         <effectsAfterDirty>true</effectsAfterDirty>
         <minHourstoDirtyEffect>8</minHourstoDirtyEffect>
@@ -190,9 +198,15 @@
       <tags>
         <li>Absorber</li>
       </tags>
+      <defaultOutfitTags>
+        <li>Worker</li>
+        <li>Soldier</li>
+        <li>Slave</li>
+      </defaultOutfitTags>
     </apparel>
     <modExtensions>
       <li Class="RJW_Menstruation.AbsorberModExtension">
+        <passiveAbsorptionPerHour>0.04</passiveAbsorptionPerHour>
         <leakAfterDirty>true</leakAfterDirty>
         <effectsAfterDirty>false</effectsAfterDirty>
         <dirtyDef>Absorber_Pad_Dirty</dirtyDef>
@@ -254,6 +268,7 @@
     </apparel>
     <modExtensions>
       <li Class="RJW_Menstruation.AbsorberModExtension">
+        <passiveAbsorptionPerHour>0.04</passiveAbsorptionPerHour>
         <leakAfterDirty>true</leakAfterDirty>
         <effectsAfterDirty>false</effectsAfterDirty>
         <dirtyDef>Absorber_Pad_Dirty</dirtyDef>

1.4/Defs/ThoughtDefs/Thoughts_sex.xml

@@ -30,6 +30,10 @@
 				<baseOpinionOffset>1</baseOpinionOffset>
 			</li>
 		</stages>
+    <replaceThoughts>
+      <li>CameInsideMIdeo</li>
+      <li>CameInsideM</li>
+    </replaceThoughts>
 	</ThoughtDef>
 
 	<ThoughtDef>
@@ -63,6 +67,9 @@
 				<baseOpinionOffset>5</baseOpinionOffset>
 			</li>
 		</stages>
+    <replaceThoughts>
+      <li>CameInsideFIdeo</li>
+    </replaceThoughts>
 	</ThoughtDef>
 
 	<ThoughtDef>
@@ -80,6 +87,16 @@
 				<baseOpinionOffset>-10</baseOpinionOffset>
 			</li>
 		</stages>
+    <replaceThoughts>
+      <li>HaterCameInsideFEstrus</li>
+      <li>CameInsideF</li>
+      <li>HaterCameInsideFSafe</li>
+      <li>CameInsideFLowFert</li>
+      <li>CameInsideFFetishSafe</li>
+      <li>HaterCameInsideFIdeo</li>
+      <li>CameInsideFFetish</li>
+      <li>CameInsideFIdeo</li>
+    </replaceThoughts>
 	</ThoughtDef>
 
 	<ThoughtDef>
@@ -93,10 +110,19 @@
 			<li>
 				<label>{0} came inside</label>
 				<description>What was I thinking, letting him do that?</description>
-				<baseMoodEffect>-2</baseMoodEffect>
+				<baseMoodEffect>-3</baseMoodEffect>
 				<baseOpinionOffset>-5</baseOpinionOffset>
 			</li>
 		</stages>
+    <replaceThoughts>
+      <li>CameInsideF</li>
+      <li>HaterCameInsideFSafe</li>
+      <li>CameInsideFLowFert</li>
+      <li>CameInsideFFetishSafe</li>
+      <li>HaterCameInsideFIdeo</li>
+      <li>CameInsideFFetish</li>
+      <li>CameInsideFIdeo</li>
+    </replaceThoughts>
 	</ThoughtDef>
 
 	<ThoughtDef>
@@ -113,6 +139,12 @@
 				<baseMoodEffect>-1</baseMoodEffect>
 			</li>
 		</stages>
+    <replaceThoughts>
+      <li>CameInsideFFetishSafe</li>
+      <li>HaterCameInsideFIdeo</li>
+      <li>CameInsideFFetish</li>
+      <li>CameInsideFIdeo</li>
+    </replaceThoughts>
 	</ThoughtDef>
 
 	<ThoughtDef>
@@ -130,6 +162,14 @@
 				<baseOpinionOffset>-2</baseOpinionOffset>
 			</li>
 		</stages>
+    <replaceThoughts>
+      <li>HaterCameInsideFSafe</li>
+      <li>CameInsideFLowFert</li>
+      <li>CameInsideFFetishSafe</li>
+      <li>HaterCameInsideFIdeo</li>
+      <li>CameInsideFFetish</li>
+      <li>CameInsideFIdeo</li>
+    </replaceThoughts>
 	</ThoughtDef>
 
 	<ThoughtDef>
@@ -147,6 +187,11 @@
 				<baseOpinionOffset>1</baseOpinionOffset>
 			</li>
 		</stages>
+    <replaceThoughts>
+      <li>HaterCameInsideFIdeo</li>
+      <li>CameInsideFFetish</li>
+      <li>CameInsideFIdeo</li>
+    </replaceThoughts>
 	</ThoughtDef>
 	
 	<ThoughtDef>
@@ -164,6 +209,13 @@
 				<baseOpinionOffset>-5</baseOpinionOffset>
 			</li>
 		</stages>
+    <replaceThoughts>
+      <li>CameInsideFLowFert</li>
+      <li>CameInsideFFetishSafe</li>
+      <li>HaterCameInsideFIdeo</li>
+      <li>CameInsideFFetish</li>
+      <li>CameInsideFIdeo</li>
+    </replaceThoughts>
 	</ThoughtDef>
 
 	<ThoughtDef>
@@ -226,7 +278,7 @@
 		</stages>
 	</ThoughtDef>
 
-	<ThoughtDef MayRequire="Ludeon.Rimworld.Ideology">
+	<ThoughtDef>
 		<defName>EggRestorationReceived</defName>
 		<thoughtClass>Thought_Memory</thoughtClass>
 		<durationDays>4</durationDays>
@@ -239,6 +291,77 @@
 			</li>
 		</stages>
 	</ThoughtDef>
-		
-	
+
+  <ThoughtDef>
+    <defName>CameInsideMIdeo</defName>
+    <thoughtClass>Thought_MemorySocial</thoughtClass>
+    <durationDays>1.0</durationDays>
+    <stackLimit>5</stackLimit>
+    <stackedEffectMultiplier>0.4</stackedEffectMultiplier>
+    <stages>
+      <li>
+        <label>came inside of {0}</label>
+        <description>It is my duty to make her pregnant.</description>
+        <baseMoodEffect>3</baseMoodEffect>
+        <baseOpinionOffset>2</baseOpinionOffset>
+      </li>
+    </stages>
+    <replaceThoughts>
+      <li>CameInsideM</li>
+    </replaceThoughts>
+  </ThoughtDef>
+
+  <ThoughtDef>
+    <defName>CameInsideFIdeo</defName>
+    <thoughtClass>Thought_MemorySocial</thoughtClass>
+    <durationDays>3.0</durationDays>
+    <stackLimit>5</stackLimit>
+    <stackedEffectMultiplier>0.1</stackedEffectMultiplier>
+    <stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
+    <stages>
+      <li>
+        <label>{0} came inside</label>
+        <description>I hope this makes me pregnant like should be.</description>
+        <baseMoodEffect>15</baseMoodEffect>
+        <baseOpinionOffset>10</baseOpinionOffset>
+      </li>
+    </stages>
+  </ThoughtDef>
+
+  <ThoughtDef>
+    <defName>HaterCameInsideFIdeo</defName>
+    <thoughtClass>Thought_MemorySocial</thoughtClass>
+    <durationDays>3.0</durationDays>
+    <stackLimit>5</stackLimit>
+    <stackedEffectMultiplier>0.1</stackedEffectMultiplier>
+    <stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
+    <stages>
+      <li>
+        <label>{0} came inside</label>
+        <description>I know I should become pregnant, but does it have to be his?</description>
+        <baseMoodEffect>5</baseMoodEffect>
+        <baseOpinionOffset>2</baseOpinionOffset>
+      </li>
+    </stages>
+    <replaceThoughts>
+      <li>CameInsideFFetish</li>
+      <li>CameInsideFIdeo</li>
+    </replaceThoughts>
+  </ThoughtDef>
+
+  <ThoughtDef>
+    <defName>HateTookContraceptivePillIdeo</defName>
+    <thoughtClass>Thought_Memory</thoughtClass>
+    <durationDays>7.0</durationDays>
+    <stackLimit>5</stackLimit>
+    <stackedEffectMultiplier>0.1</stackedEffectMultiplier>
+    <stages>
+      <li>
+        <label>took contraceptive pill</label>
+        <description>My beliefs demand I become pregnant.</description>
+        <baseMoodEffect>-5</baseMoodEffect>
+      </li>
+    </stages>
+  </ThoughtDef>
+
 </Defs>

1.4/Languages/ChineseTraditional/DefInjected/HediffDef/Hediffs_Menstruation.xml

@@ -13,4 +13,10 @@
     <Hediff_PainReliever.description>緩解源自於痛經及此類神經痛的苦楚。</Hediff_PainReliever.description>
     <Hediff_Cyclosporine.label>環孢素</Hediff_Cyclosporine.label>
     <Hediff_Cyclosporine.description>由於免疫抑製劑的作用，身體抵抗感染和疾病的能力受扼制。</Hediff_Cyclosporine.description>
+    <!--Auto generated: Wed Aug 30 16:05:07 2023-->
+    <Hediff_AffectedByPheromones.label>受費洛蒙影響</Hediff_AffectedByPheromones.label>
+    <Hediff_AffectedByPheromones.description>受附近某人處於發情期之故，此人的性需求及娛樂需求正急遽上升。</Hediff_AffectedByPheromones.description>
+    <Hediff_AffectedByPheromones.stages.0.label>弱</Hediff_AffectedByPheromones.stages.0.label>
+    <Hediff_AffectedByPheromones.stages.1.label>中</Hediff_AffectedByPheromones.stages.1.label>
+    <Hediff_AffectedByPheromones.stages.2.label>強</Hediff_AffectedByPheromones.stages.2.label>
 </LanguageData>

1.4/Languages/ChineseTraditional/DefInjected/ThoughtDefs/Thoughts_sex.xml

@@ -11,4 +11,13 @@
     <!--Auto generated: Thu Jan  5 22:13:15 2023-->
     <EggRestorationReceived.stages.0.label>卵母細胞再生術</EggRestorationReceived.stages.0.label>
     <EggRestorationReceived.stages.0.description>我可以繼續繁衍一小段時間了!</EggRestorationReceived.stages.0.description>
+    <!--Auto generated: Wed Aug 30 16:05:07 2023-->
+    <CameInsideMIdeo.stages.0.label>內射了{0}</CameInsideMIdeo.stages.0.label>
+    <CameInsideMIdeo.stages.0.description>讓她懷孕正是我的職責所在。</CameInsideMIdeo.stages.0.description>
+    <CameInsideFIdeo.stages.0.label>{0}內射了我</CameInsideFIdeo.stages.0.label>
+    <CameInsideFIdeo.stages.0.description>我希望這次能懷上，讓我盡到責任。</CameInsideFIdeo.stages.0.description>
+    <HaterCameInsideFIdeo.stages.0.label>{0}內射了我</HaterCameInsideFIdeo.stages.0.label>
+    <HaterCameInsideFIdeo.stages.0.description>我知道我有生育的義務，但是難道非他不可嗎？</HaterCameInsideFIdeo.stages.0.description>
+    <HateTookContraceptivePillIdeo.stages.0.label>服用避孕藥</HateTookContraceptivePillIdeo.stages.0.label>
+    <HateTookContraceptivePillIdeo.stages.0.description>我的信仰要求我能夠懷孕。</HateTookContraceptivePillIdeo.stages.0.description>
 </LanguageData>

1.4/Languages/ChineseTraditional/Keyed/RJW_Menstruation.xml

@@ -37,7 +37,8 @@
     <Option7_Label>月經加速</Option7_Label>
     <Option7_Desc>加快月經週期</Option7_Desc>
     <Option8_Label>除錯</Option8_Label>
-    <Option8_Desc>顯示除錯資訊&#10;啟用時會令「胎兒信息級別」選項調至「全部細節」。</Option8_Desc>
+    <Option8_Desc>顯示除錯資訊
+啟用時會令「胎兒信息級別」選項調至「全部細節」。</Option8_Desc>
     <Option9_Label>子宮狀態</Option9_Label>
     <Option9_Desc>在狀態窗口中繪製子宮圖標</Option9_Desc>
     <Option10_Label>陰道狀態</Option10_Label>
@@ -147,4 +148,24 @@
     <CannotNoEggs>沒有卵細胞</CannotNoEggs>
     <CannotNoWomb>必須擁有子宮</CannotNoWomb>
     <EggRestorationCompleted>{PAWN_labelShort}完成了{PAWN_possessive}卵母細胞再生術(cycle)</EggRestorationCompleted>
+    <!--Auto generated: Tue Apr 11 17:51:09 2023-->
+    <OvulationChanceLabel>排卵機率：{0}</OvulationChanceLabel>
+    <OvulationChanceDesc>排卵期內每個卵子的獨立排卵機率。</OvulationChanceDesc>
+    <Option_EnableBiotechTwins_Label>(測試中！) 允許在「生機」(Biotech)追加的懷孕機制中出現多胞胎。</Option_EnableBiotechTwins_Label>
+    <Option_EnableBiotechTwins_Desc>啟用這個選項將允許同卵或異卵雙胞胎出現在「生機」(Biotech)追加的懷孕機制中。
+一併將啟用雜交系統；然而兩個類人(humanlikes)生物絕不可能生出動物。</Option_EnableBiotechTwins_Desc>
+    <!--Auto generated: Wed Aug 30 16:05:07 2023-->
+    <Option_ColonistUpdateInterval_Label>玩家小人刷新間隔</Option_ColonistUpdateInterval_Label>
+    <Option_ColonistUpdateInterval_Desc>殖民者、囚犯和奴隸的子宮狀態應該每隔多久刷新一次？
+較小的刷新間隔可以更精確地模擬真實子宮；較大的刷新間隔可以提升遊戲流暢度</Option_ColonistUpdateInterval_Desc>
+    <Option_NonColonistUpdateInterval_Label>非玩家小人刷新間隔</Option_NonColonistUpdateInterval_Label>
+    <Option_NonColonistUpdateInterval_Desc>非玩家勢力控制下的小人的子宮應該每隔多久刷新一次？
+較小的刷新間隔可以更精確地模擬真實子宮；較大的刷新間隔可以提升遊戲流暢度</Option_NonColonistUpdateInterval_Desc>
+    <Option_AnimalUpdateInterval_Label>動物子宮刷新間隔</Option_AnimalUpdateInterval_Label>
+    <Option_AnimalUpdateInterval_Desc>動物們的子宮應該多久刷新一次？
+較小的刷新間隔可以更精確地模擬真實子宮；較大的刷新間隔可以提升遊戲流暢度</Option_AnimalUpdateInterval_Desc>
+    <Option_EnablePheromones_Label>啟用費洛蒙機制</Option_EnablePheromones_Label>
+    <Option_EnablePheromones_Desc>擁有發情期的類人生物在發情期將刺激附近的雄性類人生物，使其性慾大增。</Option_EnablePheromones_Desc>
+    <Option_AnimalPheromoneEffect_Label>動物費洛蒙效果</Option_AnimalPheromoneEffect_Label>
+    <Option_AnimalPheromoneEffect_Desc>選定擁有發情期的動物在發情期內對類人生物的影響。</Option_AnimalPheromoneEffect_Desc>
 </LanguageData>

1.4/Languages/English/Keyed/RJW_Menstruation.xml

@@ -36,10 +36,8 @@
   <Dialog_WombInfo07>Ovulated</Dialog_WombInfo07>
   <Dialog_WombInfo08></Dialog_WombInfo08>
   <Dialog_WombInfo09></Dialog_WombInfo09>
-  <Dialog_DoCleanWomb_Tooltip>Gather cum into bucket</Dialog_DoCleanWomb_Tooltip>
-  <Dialog_DontCleanWomb_Tooltip>Store cum in womb</Dialog_DontCleanWomb_Tooltip>
   <Dialog_FatherUnknown>Unknown</Dialog_FatherUnknown>
-    
+  <Description_Absorbed>Absorbed</Description_Absorbed>
   
   
   <Option1_Label_1>Enable womb icon</Option1_Label_1>
@@ -56,6 +54,12 @@
   <Option6_Desc>Cum will lose fertility by this amount every hour&#10;This value affects fertilization chance indirectly.</Option6_Desc>
   <Option7_Label>Cycle acceleration</Option7_Label>
   <Option7_Desc>Accelerate menstruation cycle&#10;This can cause early menopause and infertility.&#10;Setting this lower than x12 is recommended.&#10;Rimworld's timescale: x6(default)</Option7_Desc>
+  <Option_ColonistUpdateInterval_Label>Colonist update interval</Option_ColonistUpdateInterval_Label>
+  <Option_ColonistUpdateInterval_Desc>How often the womb of each of your colonists, prisoners, and slaves update.&#10;Lowering this will improve accuracy, increasing this can improve performance.</Option_ColonistUpdateInterval_Desc>
+  <Option_NonColonistUpdateInterval_Label>Non-colonist update interval</Option_NonColonistUpdateInterval_Label>
+  <Option_NonColonistUpdateInterval_Desc>How often the womb of humans you don't control update.&#10;Lowering this will improve accuracy, increasing this can improve performance.</Option_NonColonistUpdateInterval_Desc>
+  <Option_AnimalUpdateInterval_Label>Animal update interval</Option_AnimalUpdateInterval_Label>
+  <Option_AnimalUpdateInterval_Desc>How often the womb of animals update.&#10;Lowering this will improve accuracy, increasing this can improve performance.</Option_AnimalUpdateInterval_Desc>
   <Option8_Label>Debug</Option8_Label>
   <Option8_Desc>Show debug information.</Option8_Desc>
   <Option9_Label>Womb status</Option9_Label>
@@ -68,7 +72,11 @@
   <Option11_Desc_3>Show only image of a fetus after discovered pregnancy.</Option11_Desc_3>
   <Option11_Desc_4>Do not show any information about a fetus.</Option11_Desc_4>
   <Option12_Label>Enable menopause</Option12_Label>
-  <Option12_Desc>Enable menopause effect that makes pawn infertile when they run out of eggs&#10;If you have problems with long lived races, turn off this option.</Option12_Desc>
+  <Option12_Desc>Enable menopause effect that makes pawn infertile when they run out of eggs.&#10;If you have problems with long lived races, turn off this option.</Option12_Desc>
+  <Option_EnablePheromones_Label>Enable pheromones</Option_EnablePheromones_Label>
+  <Option_EnablePheromones_Desc>Allow humanlikes in visible estrus to increase the sex drive of nearby humanlike males.</Option_EnablePheromones_Desc>
+  <Option_AnimalPheromoneEffect_Label>Animal pheromone effect</Option_AnimalPheromoneEffect_Label>
+  <Option_AnimalPheromoneEffect_Desc>Set the effect that animals in visible estrus have on humanlikes.</Option_AnimalPheromoneEffect_Desc>
   <Option13_Label>Use multiple pregnancy</Option13_Label>
   <Option13_Desc>Use multiple pregnancy instead RJW's default pregnancy&#10;Disable this option if you are in trouble with impregnation&#10;RJW pregnancy should be turned on.</Option13_Desc>
   <Option14_Label>Enable hetero ovular twins</Option14_Label>
@@ -112,7 +120,6 @@
   <Option31_Desc>Enable permanent vagina stretch after birth.&#10;If you are using another mod handling this, turn off this option.</Option31_Desc>
   <Option32_Label>Morph power</Option32_Label>
   <Option32_Desc>Set morph power.</Option32_Desc>
-  <Option_EnableGatherCumGizmo_Label>Enable gather cum gizmo</Option_EnableGatherCumGizmo_Label>
   <Option_EstrusOverride_Label>Estrus overrides RJW hookup settings</Option_EstrusOverride_Label>
   <Option_EstrusOverride_Desc>If enabled, a pawn in visible estrus will use these settings for potential impregnation hookups instead of the RJW settings.&#10;All settings default to their RJW counterparts.</Option_EstrusOverride_Desc>
   <Option_EstrusFuckability_Label>Hookup minimum fuckability in estrus</Option_EstrusFuckability_Label>
@@ -132,7 +139,6 @@
   <Option_EnableDraftedIcon_Desc>Draw womb icon for drafted pawns</Option_EnableDraftedIcon_Desc>
   <Button_ResetToDefault>Reset to default</Button_ResetToDefault>
 
-  <Gizmo_GatherCum>Gather cum</Gizmo_GatherCum>
   <FloatMenu_CleanSelf>Vaginal washing</FloatMenu_CleanSelf>
   
   <CustomHybrid_List_Title>Custom Hybrid Editor</CustomHybrid_List_Title>

1.4/Languages/Japanese/DefInjected/ApparelLayerDef/RJWMenstruation.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+  <Absorber.label>性器</Absorber.label>
+</LanguageData>

1.4/Languages/Japanese/DefInjected/Drugs/Pills_Menstruation.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LanguageData>
+    <PainReliever.label>鎮痛剤</PainReliever.label>
+    <PainReliever.description>生理痛を24時間和らげます。&#10;&#10;その他の痛みにも効果あり。</PainReliever.description>
+    <Cyclosporine.label>シクロスポリン</Cyclosporine.label>
+    <Cyclosporine.description>免疫抑制剤。&#10;&#10;抗精子抗体を直すことができるが、24時間の間、体の免疫力は低下する。</Cyclosporine.description>
+</LanguageData>

1.4/Languages/Japanese/DefInjected/HediffDef/RJWMenstruation.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LanguageData>
+  <Hediff_MenstrualCramp.label>生理中</Hediff_MenstrualCramp.label>
+  <Hediff_MenstrualCramp.description>月経周期の終わりに膣からの出血。よく痛い。</Hediff_MenstrualCramp.description>
+  <Hediff_MenstrualCramp.stages.0.label>不快</Hediff_MenstrualCramp.stages.0.label>
+  <Hediff_MenstrualCramp.stages.1.label>痒い</Hediff_MenstrualCramp.stages.1.label>
+  <Hediff_MenstrualCramp.stages.2.label>痛い</Hediff_MenstrualCramp.stages.2.label>
+  <Hediff_MenstrualCramp.stages.3.label>苦痛</Hediff_MenstrualCramp.stages.3.label>
+
+  
+  
+
+</LanguageData>

1.4/Languages/Japanese/DefInjected/JobDef/RJWMenstruation.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+  <VaginaWashing.reportString>膣を洗っている</VaginaWashing.reportString>
+
+  
+  
+</LanguageData>

1.4/Languages/Japanese/DefInjected/StatDef/RJWMenstruation.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+  <MaxAbsorbable.label>吸収量</MaxAbsorbable.label>
+  <MaxAbsorbable.description>吸収可能な液体の最大量。</MaxAbsorbable.description>
+  
+  
+</LanguageData>

1.4/Languages/Japanese/DefInjected/ThingDef/RJWMenstruation.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<LanguageData>
+
+<Absorber_Tampon.label>タンポン</Absorber_Tampon.label>
+
+<Absorber_Tampon.description>膣内の体液を吸収するタンポン。長時間に着けて感染症を引き起こすことがある。</Absorber_Tampon.description>
+
+<Absorber_Tampon_Dirty.label>汚れたタンポン</Absorber_Tampon_Dirty.label>
+
+<Absorber_Tampon_Dirty.description>濡れた使用済みタンポン。そのままにしておくと感染症を引き起こす可能性がある。</Absorber_Tampon_Dirty.description>
+
+<Absorber_Pad.label>生理用品</Absorber_Pad.label>
+
+<Absorber_Pad.description>膣からの体液を吸収するためのナプキン。</Absorber_Pad.description>
+
+<Absorber_Pad_Dirty.label>汚れた生理用品</Absorber_Pad_Dirty.label>
+
+<Absorber_Pad_Dirty.description>濡れた使用済みナプキン</Absorber_Pad_Dirty.description>
+
+<OvaryRegenerationPill.label>卵巣再生薬</OvaryRegenerationPill.label>
+
+<OvaryRegenerationPill.description>卵巣を回復させ、卵子の数をある程度を回復させる。&#10;卵子がほとんど残っていない卵巣にはあまり効果がない。&#10;更年期の回復はできない。</OvaryRegenerationPill.description>
+
+<SuperovulationInducingAgent.label>排卵剤</SuperovulationInducingAgent.label>
+
+<SuperovulationInducingAgent.description>過排卵を誘発し、次の排卵で卵子を1～4個余分に産生させる。&#10;&#10;更年期を早める可能性がある。</SuperovulationInducingAgent.description>
+
+<FilthMixture.label>混じった物</FilthMixture.label>
+
+</LanguageData>

1.4/Languages/Japanese/DefInjected/ThoughtDefs/RJWMenstruation.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<LanguageData>
+  <LeakingFluids.stages.0.label>ぽたぽた</LeakingFluids.stages.0.label>
+  <LeakingFluids.stages.0.description>これを吸収するものはないのかな？</LeakingFluids.stages.0.description>
+  <HaterCameInsideM.stages.0.label>{0}に中出した</HaterCameInsideM.stages.0.label>
+  <HaterCameInsideM.stages.0.description>ライバルに中出した</HaterCameInsideM.stages.0.description>
+  <CameInsideM.stages.0.label>{0}に中出した</CameInsideM.stages.0.label>
+  <CameInsideM.stages.0.description>気持ちよかった。</CameInsideM.stages.0.description>
+  <CameInsideFFetish.stages.0.label>{0}に中出した</CameInsideFFetish.stages.0.label>
+  <CameInsideFFetish.stages.0.description>妊娠するといいな。</CameInsideFFetish.stages.0.description>
+  <HaterCameInsideF.stages.0.label>{0}に中出された</HaterCameInsideF.stages.0.label>
+  <HaterCameInsideF.stages.0.description>あいつの子を妊娠したくない！</HaterCameInsideF.stages.0.description>
+  <HaterCameInsideFEstrus.stages.0.label>{0}に中出された</HaterCameInsideFEstrus.stages.0.label>
+  <HaterCameInsideFEstrus.stages.0.description>そんなことをさせるなんて、私は何を考えていたんだろう？</HaterCameInsideFEstrus.stages.0.description>
+  <CameInsideFLowFert.stages.0.label>{0}に中出された</CameInsideFLowFert.stages.0.label>
+  <CameInsideFLowFert.stages.0.description>可能性は低いけど、妊娠できるかどうか心配で...</CameInsideFLowFert.stages.0.description>
+  <CameInsideF.stages.0.label>{0}に中出された</CameInsideF.stages.0.label>
+  <CameInsideF.stages.0.description>妊娠しないか心配なんだ。</CameInsideF.stages.0.description>
+  <CameInsideFFetishSafe.stages.0.label>{0}に中出された</CameInsideFFetishSafe.stages.0.label>
+  <CameInsideFFetishSafe.stages.0.description>妊娠するとは思わないけど、妄想するのは楽しい。</CameInsideFFetishSafe.stages.0.description>
+  <HaterCameInsideFSafe.stages.0.label>{0}に中出された</HaterCameInsideFSafe.stages.0.label>
+  <HaterCameInsideFSafe.stages.0.description>妊娠することはないだろうけど、やっぱり嫌だ。</HaterCameInsideFSafe.stages.0.description>
+  <UnwantedPregnancy.stages.0.label>望まない妊娠</UnwantedPregnancy.stages.0.label>
+  <UnwantedPregnancy.stages.0.description>赤ん坊の世話なんてできるか？どうすればいい？</UnwantedPregnancy.stages.0.description>
+  <UnwantedPregnancyMild.stages.0.label>望まない妊娠</UnwantedPregnancyMild.stages.0.label>
+  <UnwantedPregnancyMild.stages.0.description>赤ちゃんが生まれる。なんとかなるといいな。</UnwantedPregnancyMild.stages.0.description>
+  <TookContraceptivePill.stages.0.label>避妊ピルを飲んだ</TookContraceptivePill.stages.0.label>
+  <TookContraceptivePill.stages.0.description>もう大丈夫です。</TookContraceptivePill.stages.0.description>
+  <HateTookContraceptivePill.stages.0.label>避妊ピルを飲んだ</HateTookContraceptivePill.stages.0.label>
+  <HateTookContraceptivePill.stages.0.description>妊娠したい。</HateTookContraceptivePill.stages.0.description>
+  <EggRestorationReceived.stages.0.label>卵巣復活を得た</EggRestorationReceived.stages.0.label>
+  <EggRestorationReceived.stages.0.description>もう少しの間、繁殖ことができる。</EggRestorationReceived.stages.0.description>
+</LanguageData> 

1.4/Languages/Japanese/Keyed/RJW_Menstruation.xml

@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+  <Mod_Title>RJW Menstruation Cycle</Mod_Title>
+  
+  <Menstrual_Blood>経血</Menstrual_Blood>
+  <Info_noCum>空っぽ</Info_noCum>
+  <Stage_Follicular>卵胞期</Stage_Follicular>
+  <Stage_Ovulatory>排卵期</Stage_Ovulatory> 
+  <Stage_Luteal>黄体期</Stage_Luteal>
+  <Stage_Bleeding>月経期</Stage_Bleeding>
+  <Stage_Pregnant>妊娠</Stage_Pregnant>
+  <Stage_Recover>出産後</Stage_Recover>
+  <Stage_None>無し</Stage_None>
+  <Stage_Climacteric>クリマクテリック</Stage_Climacteric>
+  <Stage_Menopause>更年期</Stage_Menopause>
+  <Stage_Anestrus>無発情期</Stage_Anestrus>
+  <Stage_Follicular_Desc>卵巣は卵子を放出するの準備をしています。この時期の終わりに排卵が起こります。</Stage_Follicular_Desc>
+  <Stage_Follicular_Induced_Desc>卵巣は卵子を放出するの準備をしています。精液が子宮に入ると排卵が起こります。</Stage_Follicular_Induced_Desc>
+  <Stage_Ovulatory_Desc>卵巣が卵子を子宮に放出しています。</Stage_Ovulatory_Desc>
+  <Stage_Luteal_Desc>子宮は受精卵を受け入れる準備ができている。この時期が終る前に受精卵が着床すれば妊娠となります。</Stage_Luteal_Desc>
+  <Stage_Bleeding_Desc>子宮内膜は剥がれ落ち、着床できなかった受精卵を排出します。</Stage_Bleeding_Desc>
+  <Stage_Pregnant_Desc>子宮に赤ちゃんがいます。時間とケアによって、この世界の新しい住人となる。</Stage_Pregnant_Desc>
+  <Stage_Recover_Desc>子宮は最近の妊娠から回復しています。</Stage_Recover_Desc>
+  <Stage_None_Desc>子宮は繁殖能力がなく、妊娠することはできない。</Stage_None_Desc>
+  <Stage_Climacteric_Desc>卵巣が枯渇すると、月経周期が不規則になる。</Stage_Climacteric_Desc>
+  <Stage_Menopause_Desc>。卵巣が枯渇し、子宮が卵子を産み出せなくなる。</Stage_Menopause_Desc>
+  <Stage_Anestrus_Desc>繁殖期を過ぎた。時期が来れば発情周期は再開する。</Stage_Anestrus_Desc>
+  <Button_HealthTab>ステータス</Button_HealthTab>
+  <Button_MilkTooltip>自分を搾乳する</Button_MilkTooltip>
+  <Dialog_WombInfo01>ステータス</Dialog_WombInfo01>
+  <Dialog_WombInfo02>胎児</Dialog_WombInfo02>
+  <Dialog_WombInfo03>父親</Dialog_WombInfo03>
+  <Dialog_WombInfo04>精液リスト</Dialog_WombInfo04>
+  <Dialog_WombInfo05>受精卵</Dialog_WombInfo05>
+  <Dialog_WombInfo06>受精中</Dialog_WombInfo06>
+  <Dialog_WombInfo07>排卵済み</Dialog_WombInfo07>
+  <Dialog_WombInfo08></Dialog_WombInfo08>
+  <Dialog_WombInfo09></Dialog_WombInfo09>
+  <Dialog_DoCleanWomb_Tooltip>精液をバケッツに集める</Dialog_DoCleanWomb_Tooltip>
+  <Dialog_DontCleanWomb_Tooltip>子宮に精液をためる</Dialog_DontCleanWomb_Tooltip>
+  <Dialog_FatherUnknown>不明</Dialog_FatherUnknown>
+    
+  
+  
+  <Option1_Label_1>Enable womb icon</Option1_Label_1>
+  <Option1_Label_2>Enable button in health tab</Option1_Label_2>
+  <Option2_Label>Enable animal cycle</Option2_Label>
+  <Option2_Desc>Simulate animal cycles.&#10;Not recommended.</Option2_Desc>
+  <Option3_Label>Implantation chance</Option3_Label>
+  <Option3_Desc>Base implantation chance of fertilized egg&#10;This value affects the chance of impregnation.</Option3_Desc>
+  <Option4_Label>Fertilization chance</Option4_Label>
+  <Option4_Desc>The fertilization chance per ml of sperm per hour&#10;This value affects the chance of impregnation.</Option4_Desc>
+  <Option5_Label>Cum decay ratio per hour</Option5_Label>
+  <Option5_Desc>The amount of cum in the womb will drop by this amount every hour&#10;This value affects the chance of impregnation.</Option5_Desc>
+  <Option6_Label>Cum fertility decay ratio per hour</Option6_Label>
+  <Option6_Desc>Cum will lose fertility by this amount every hour&#10;This value affects fertilization chance indirectly.</Option6_Desc>
+  <Option7_Label>Cycle acceleration</Option7_Label>
+  <Option7_Desc>Accelerate menstruation cycle&#10;This can cause early menopause and infertility.&#10;Setting this lower than x12 is recommended.&#10;Rimworld's timescale: x6(default)</Option7_Desc>
+  <Option_ColonistUpdateInterval_Label>Colonist update interval</Option_ColonistUpdateInterval_Label>
+  <Option_ColonistUpdateInterval_Desc>How often the womb of each of your colonists, prisoners, and slaves update.&#10;Lowering this will improve accuracy, increasing this can improve performance.</Option_ColonistUpdateInterval_Desc>
+  <Option_NonColonistUpdateInterval_Label>Non-colonist update interval</Option_NonColonistUpdateInterval_Label>
+  <Option_NonColonistUpdateInterval_Desc>How often the womb of humans you don't control update.&#10;Lowering this will improve accuracy, increasing this can improve performance.</Option_NonColonistUpdateInterval_Desc>
+  <Option_AnimalUpdateInterval_Label>Animal update interval</Option_AnimalUpdateInterval_Label>
+  <Option_AnimalUpdateInterval_Desc>How often the womb of animals update.&#10;Lowering this will improve accuracy, increasing this can improve performance.</Option_AnimalUpdateInterval_Desc>
+  <Option8_Label>Debug</Option8_Label>
+  <Option8_Desc>Show debug information.</Option8_Desc>
+  <Option9_Label>Womb status</Option9_Label>
+  <Option9_Desc>Draw womb icon in status window.</Option9_Desc>
+  <Option10_Label>Vagina and breast status</Option10_Label>
+  <Option10_Desc>Draw vagina, anus and breast icons in the status window.</Option10_Desc>
+  <Option11_Label>Fetus information level</Option11_Label>
+  <Option11_Desc_1>Show all information about a fetus.</Option11_Desc_1>
+  <Option11_Desc_2>Show all information about a fetus after discovered pregnancy.</Option11_Desc_2>
+  <Option11_Desc_3>Show only image of a fetus after discovered pregnancy.</Option11_Desc_3>
+  <Option11_Desc_4>Do not show any information about a fetus.</Option11_Desc_4>
+  <Option12_Label>Enable menopause</Option12_Label>
+  <Option12_Desc>Enable menopause effect that makes pawn infertile when they run out of eggs&#10;If you have problems with long lived races, turn off this option.</Option12_Desc>
+  <Option13_Label>Use multiple pregnancy</Option13_Label>
+  <Option13_Desc>Use multiple pregnancy instead RJW's default pregnancy&#10;Disable this option if you are in trouble with impregnation&#10;RJW pregnancy should be turned on.</Option13_Desc>
+  <Option14_Label>Enable hetero ovular twins</Option14_Label>
+  <Option14_Desc>Allow pregnancy from multiple eggs at the same time.</Option14_Desc>
+  <Option15_Label>Enable enzygotic twins</Option15_Label>
+  <Option15_Desc>Enable a single egg to result in multiple identical offspring.</Option15_Desc>
+  <Option16_Label>Enzygotic twins chance</Option16_Label>
+  <Option16_Desc>The chance of identical twins.</Option16_Desc>
+  <Option17_Label>Max enzygotic twins</Option17_Label>
+  <Option17_Desc>The maximum number of identical siblings.</Option17_Desc>
+  <Option18_Label>Enable egg overlay</Option18_Label>
+  <Option18_Desc>Enable egg overlay on womb icon.</Option18_Desc>
+  <Option19_Label_1>Bleeding amount</Option19_Label_1>
+  <Option19_Label_2>Estimated total bleeding amount</Option19_Label_2>
+  <Option19_Desc>The approximate bleeding amount.&#10;The normal bleeding amount of a human is about 20~80ml per cycle.</Option19_Desc>
+  <Option20_Label_1>Colonist</Option20_Label_1>
+  <Option20_Label_2>Prisoner</Option20_Label_2>
+  <Option20_Label_3>Allied Faction</Option20_Label_3>
+  <Option20_Label_4>Neutral</Option20_Label_4>
+  <Option20_Label_5>Hostile Faction</Option20_Label_5>
+  <Option21_Label>Target pawns:</Option21_Label>
+  <Option21_Desc>The gizmo and button will appear for these pawns</Option21_Desc>
+  <Option22_Label>Use hybrid extension</Option22_Label>
+  <Option22_Desc>Overrides RJW and RaceSupport's hybrid definition.&#10;Dominant hybrid extension determines whose definition used first. Not recommended to change this.</Option22_Desc>
+  <Option23_Label>Dominant hybrid extension</Option23_Label>
+  <Option23_Label_1>母</Option23_Label_1>
+  <Option23_Label_2>父</Option23_Label_2>
+  <Option_MaxBreastIncrementFactor_Label>Breast growth during pregnancy</Option_MaxBreastIncrementFactor_Label>
+  <Option_MaxBreastIncrementFactor_Desc>Change how much a pregnant pawn's breasts will grow when pregnant. Some pawns will grow more than others.</Option_MaxBreastIncrementFactor_Desc>
+  <Option_MaxNippleIncrementFactor_Label>Nipple change during pregnancy</Option_MaxNippleIncrementFactor_Label>
+  <Option_MaxNippleIncrementFactor_Desc>Change how much a pregnant pawn's nipples will change during pregnancy.</Option_MaxNippleIncrementFactor_Desc>
+  <Option_PermanentNippleChange_Label>Permanent nipple change after pregnancy</Option_PermanentNippleChange_Label>
+  <Option_PermanentNippleChange_Desc>Adjusts approximately how much of a pregnant pawn's nipples will remain changed after the pregnancy ends.</Option_PermanentNippleChange_Desc>
+  <Option28_Label>Customize Hybrids</Option28_Label>
+  <Option28_Tooltip>Open custom hybrid editor.&#10;This will overrides hybrid definitions of XML files.</Option28_Tooltip>
+  <Option29_Label>Allow shrink icon</Option29_Label>
+  <Option29_Desc>Let icon become smaller if needed.</Option29_Desc>
+  <Option30_Label>Egg lifespan multiplier</Option30_Label>
+  <Option30_Desc>Multiply egg's lifespan.&#10;All non-implanted eggs will die at end of luteal stage regardless of this setting.</Option30_Desc>
+  <Option31_Label>Enable vagina morph after birth</Option31_Label>
+  <Option31_Desc>Enable permanent vagina stretch after birth.&#10;If you are using another mod handling this, turn off this option.</Option31_Desc>
+  <Option32_Label>Morph power</Option32_Label>
+  <Option32_Desc>Set morph power.</Option32_Desc>
+  <Option_EnableGatherCumGizmo_Label>Enable gather cum gizmo</Option_EnableGatherCumGizmo_Label>
+  <Option_EstrusOverride_Label>Estrus overrides RJW hookup settings</Option_EstrusOverride_Label>
+  <Option_EstrusOverride_Desc>If enabled, a pawn in visible estrus will use these settings for potential impregnation hookups instead of the RJW settings.&#10;All settings default to their RJW counterparts.</Option_EstrusOverride_Desc>
+  <Option_EstrusFuckability_Label>Hookup minimum fuckability in estrus</Option_EstrusFuckability_Label>
+  <Option_EstrusAttractability_Label>Hookup minimum attractability in estrus</Option_EstrusAttractability_Label>
+  <Option_EstrusRelationship_Label>Hookup minimum opinion in estrus</Option_EstrusRelationship_Label>
+  <EstimatedCumLifespan>Estimated sperm lifespan</EstimatedCumLifespan>
+  <EstimatedEggLifespan>Estimated egg lifespan</EstimatedEggLifespan>
+  <OvulationChanceLabel>排卵 {0}</OvulationChanceLabel>
+  <OvulationChanceDesc>排卵時に各卵が放出される確率。</OvulationChanceDesc>
+  <FertilityDesc>受精卵の着床確率。&#10;この時間に受精する確率{0}%</FertilityDesc>
+  <Option_PregnancyFromBaseRJW_Label>Use basic RJW pregnancy</Option_PregnancyFromBaseRJW_Label>
+  <Option_PregnancyFromMultiplePregnancy_Label>Use menstruation multiple pregnancy</Option_PregnancyFromMultiplePregnancy_Label>
+  <Option_PregnancyFromBiotech_Label>Use Biotech pregnancy</Option_PregnancyFromBiotech_Label>
+  <Option_EnableBiotechTwins_Label>(EXPERIMENTAL) Enable multiple babies/twins in a single Biotech pregnancy.</Option_EnableBiotechTwins_Label>
+  <Option_EnableBiotechTwins_Desc>Enabling this option will allow identical and hetero ovular twins with Biotech.&#10;Also allows the hybrid system, but two humanlikes cannot produce an animal.</Option_EnableBiotechTwins_Desc>
+  <Option_EnableDraftedIcon_Label>Show womb status when drafted</Option_EnableDraftedIcon_Label>
+  <Option_EnableDraftedIcon_Desc>Draw womb icon for drafted pawns</Option_EnableDraftedIcon_Desc>
+  <Button_ResetToDefault>Reset to default</Button_ResetToDefault>
+
+  <Gizmo_GatherCum>精液を収集</Gizmo_GatherCum>
+  <FloatMenu_CleanSelf>膣を洗う</FloatMenu_CleanSelf>
+  
+  <CustomHybrid_List_Title>Custom Hybrid Editor</CustomHybrid_List_Title>
+  <CustomHybrid_Title>Hybrids of {0}</CustomHybrid_Title>
+  <CustomHybrid_Tooltip>When {0} breed with {1}, {2} will be born at {3} chance.&#10;If both races have hybrid definitions for each other, the father's definition will be used.</CustomHybrid_Tooltip>
+
+  <CannotNoEggs>卵子がない</CannotNoEggs>
+  <CannotNoWomb>子宮が必要</CannotNoWomb>
+  <EggRestorationCompleted>{PAWN_labelShort} has completed {PAWN_possessive} egg restoration cycle.</EggRestorationCompleted>
+    
+</LanguageData>

1.4/MilkModule/Defs/JobDefs/Jobs_MilkSelf_MC.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-	<JobDef>
-		<defName>LactateSelf_MC</defName>
-		<driverClass>MilkModule.JobDriver_MilkSelf_MC</driverClass>
-		<reportString>lactating self</reportString>
-		<allowOpportunisticPrefix>true</allowOpportunisticPrefix>
-	</JobDef>
-</Defs>

1.4/Patches/CycleDisabledGenes.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Patch>
+  <Operation Class="PatchOperationFindMod">
+    <mods>
+      <li>Alpha Genes</li>
+    </mods>
+    <match Class="PatchOperationAddModExtension">
+      <xpath>/Defs/GeneDef[defName="AG_EggLaying"]</xpath>
+      <value>
+        <li Class="RJW_Menstruation.MenstruationModExtension">
+          <disableCycle>true</disableCycle>
+        </li>
+      </value>
+    </match>
+  </Operation>
+
+  <Operation Class="PatchOperationFindMod">
+    <mods>
+      <li>Vanilla Races Expanded - Saurid</li>
+    </mods>
+    <match Class="PatchOperationAddModExtension">
+      <xpath>/Defs/GeneDef[defName="VRESaurids_Oviparous"]</xpath>
+      <value>
+        <li Class="RJW_Menstruation.MenstruationModExtension">
+          <disableCycle>true</disableCycle>
+        </li>
+      </value>
+    </match>
+  </Operation>
+
+  <Operation Class="PatchOperationFindMod">
+    <mods>
+      <li>Vanilla Races Expanded - Phytokin</li>
+    </mods>
+    <match Class="PatchOperationAddModExtension">
+      <xpath>/Defs/GeneDef[defName="VRE_SaplingBirth"]</xpath>
+      <value>
+        <li Class="RJW_Menstruation.MenstruationModExtension">
+          <disableCycle>true</disableCycle>
+        </li>
+      </value>
+    </match>
+  </Operation>
+
+  <Operation Class="PatchOperationFindMod">
+    <mods>
+      <li>Erin's Corvyia</li>
+    </mods>
+    <match Class="PatchOperationAddModExtension">
+      <xpath>/Defs/GeneDef[defName="ERN_EggLayer"]</xpath>
+      <value>
+        <li Class="RJW_Menstruation.MenstruationModExtension">
+          <disableCycle>true</disableCycle>
+        </li>
+      </value>
+    </match>
+  </Operation>
+
+  <Operation Class="PatchOperationFindMod">
+    <mods>
+      <li>Outland - Genetics</li>
+    </mods>
+    <match Class="PatchOperationAddModExtension">
+      <xpath>/Defs/GeneDef[defName="Outland_EggLayer"]</xpath>
+      <value>
+        <li Class="RJW_Menstruation.MenstruationModExtension">
+          <disableCycle>true</disableCycle>
+        </li>
+      </value>
+    </match>
+  </Operation>
+</Patch>

1.4/Patches/Hediffs_PrivateParts.xml

@@ -144,11 +144,5 @@
 				</li>
 			</comps>
 		</value>
-	</Operation>
-	
-	
-	
-	
-	
-	
+	</Operation>	
 </Patch>

1.4/Patches/PawnModExtensions_Animals.xml

@@ -82,7 +82,7 @@
 		<xpath>/Defs/ThingDef[defName="Husky"]</xpath>
 		<value>
 				<li Class="RJW_Menstruation.PawnDNAModExtension">
-					<fetusTexPath>Fetus/Canines/Fetus_Dog</fetusTexPath>
+					<fetusTexPath>Fetus/Canines/Fetus_Canine</fetusTexPath>
 					<cumColor>(255,255,255,255)</cumColor> 
 					<cumThickness>0.05</cumThickness>
 					<hybridExtension>
@@ -95,7 +95,7 @@
 		<xpath>/Defs/ThingDef[defName="LabradorRetriever"]</xpath>
 		<value>
 				<li Class="RJW_Menstruation.PawnDNAModExtension">
-					<fetusTexPath>Fetus/Canines/Fetus_Dog</fetusTexPath>
+					<fetusTexPath>Fetus/Canines/Fetus_Canine</fetusTexPath>
 					<cumColor>(255,255,255,255)</cumColor> 
 					<cumThickness>0.05</cumThickness>
 					<hybridExtension>
@@ -108,7 +108,7 @@
 		<xpath>/Defs/ThingDef[defName="YorkshireTerrier"]</xpath>
 		<value>
 				<li Class="RJW_Menstruation.PawnDNAModExtension">
-					<fetusTexPath>Fetus/Canines/Fetus_Dog</fetusTexPath>
+					<fetusTexPath>Fetus/Canines/Fetus_Canine</fetusTexPath>
 					<cumColor>(255,255,255,255)</cumColor> 
 					<cumThickness>0.05</cumThickness>
 					<hybridExtension>
@@ -122,7 +122,7 @@
 		<xpath>/Defs/ThingDef[defName="Warg"]</xpath>
 		<value>
 				<li Class="RJW_Menstruation.PawnDNAModExtension">
-					<fetusTexPath>Fetus/Canines/Fetus_Dog</fetusTexPath>
+					<fetusTexPath>Fetus/Canines/Fetus_Canine</fetusTexPath>
 					<cumColor>(255,255,255,255)</cumColor> 
 					<cumThickness>0.05</cumThickness>
 					<hybridExtension>
@@ -135,7 +135,7 @@
 		<xpath>/Defs/ThingDef[@Name="ThingBaseWolf"]</xpath>
 		<value>
 				<li Class="RJW_Menstruation.PawnDNAModExtension">
-					<fetusTexPath>Fetus/Canines/Fetus_Dog</fetusTexPath>
+					<fetusTexPath>Fetus/Canines/Fetus_Canine</fetusTexPath>
 					<cumColor>(255,255,255,255)</cumColor> 
 					<cumThickness>0.05</cumThickness>
 					<hybridExtension>
@@ -148,7 +148,7 @@
 		<xpath>/Defs/ThingDef[@Name="ThingBaseFox"]</xpath>
 		<value>
 				<li Class="RJW_Menstruation.PawnDNAModExtension">
-					<fetusTexPath>Fetus/Canines/Fetus_Dog</fetusTexPath>
+					<fetusTexPath>Fetus/Canines/Fetus_CanineV</fetusTexPath>
 					<cumColor>(255,255,255,255)</cumColor> 
 					<cumThickness>0.05</cumThickness>
 					<hybridExtension>
@@ -161,7 +161,7 @@
 		<xpath>/Defs/ThingDef[defName="Pig"]</xpath>
 		<value>
 				<li Class="RJW_Menstruation.PawnDNAModExtension">
-					<fetusTexPath>Fetus/Livestocks/Fetus_Pig</fetusTexPath>
+					<fetusTexPath>Fetus/Pigs/Fetus_Pig</fetusTexPath>
 					<cumColor>(255,255,255,255)</cumColor> 
 					<cumThickness>0.8</cumThickness>
 					<hybridExtension>
@@ -174,7 +174,7 @@
 		<xpath>/Defs/ThingDef[defName="WildBoar"]</xpath>
 		<value>
 				<li Class="RJW_Menstruation.PawnDNAModExtension">
-					<fetusTexPath>Fetus/Livestocks/Fetus_Pig</fetusTexPath>
+					<fetusTexPath>Fetus/Pigs/Fetus_Pig</fetusTexPath>
 					<cumColor>(255,255,255,255)</cumColor> 
 					<cumThickness>0.8</cumThickness>
 					<hybridExtension>
@@ -215,7 +215,7 @@
 		<xpath>Defs/ThingDef[defName="Sheep"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_S_Bovine</fetusTexPath>
+				<fetusTexPath>Fetus/Bovines/Fetus_Bovine</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.3</cumThickness>
 				<ingestionOutcomeDoers>
@@ -230,7 +230,7 @@
 		<xpath>Defs/ThingDef[defName="Goat"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_S_Bovine</fetusTexPath>
+				<fetusTexPath>Fetus/Bovines/Fetus_Bovine</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.3</cumThickness>
 				<ingestionOutcomeDoers>
@@ -245,7 +245,7 @@
 		<xpath>Defs/ThingDef[defName="Ibex"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_S_Bovine</fetusTexPath>
+				<fetusTexPath>Fetus/Cervines/Fetus_Cervine</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.3</cumThickness>
 				<ingestionOutcomeDoers>
@@ -260,7 +260,7 @@
 		<xpath>Defs/ThingDef[defName="Deer"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_S_Bovine</fetusTexPath>
+				<fetusTexPath>Fetus/Cervines/Fetus_Cervine</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.3</cumThickness>
 				<ingestionOutcomeDoers>
@@ -275,7 +275,7 @@
 		<xpath>Defs/ThingDef[defName="Gazelle"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_Bovine</fetusTexPath>
+				<fetusTexPath>Fetus/Cervines/Fetus_Cervine</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.3</cumThickness>
 				<ingestionOutcomeDoers>
@@ -290,7 +290,7 @@
 		<xpath>Defs/ThingDef[defName="Alpaca"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_Bovine</fetusTexPath>
+				<fetusTexPath>Fetus/Bovines/Fetus_Bovine</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.3</cumThickness>
 				<ingestionOutcomeDoers>
@@ -305,7 +305,7 @@
 		<xpath>Defs/ThingDef[defName="Yak"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_Bovine</fetusTexPath>
+				<fetusTexPath>Fetus/Bovines/Fetus_Bovine</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.3</cumThickness>
 				<ingestionOutcomeDoers>
@@ -320,7 +320,7 @@
 		<xpath>Defs/ThingDef[defName="Elk"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_Bovine</fetusTexPath>
+				<fetusTexPath>Fetus/Cervines/Fetus_Cervine</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.4</cumThickness>
 				<ingestionOutcomeDoers>
@@ -335,7 +335,7 @@
 		<xpath>Defs/ThingDef[defName="Caribou"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_S_Bovine</fetusTexPath>
+				<fetusTexPath>Fetus/Cervines/Fetus_Cervine</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.4</cumThickness>
 				<ingestionOutcomeDoers>
@@ -350,7 +350,7 @@
 		<xpath>Defs/ThingDef[defName="Horse"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_Bovine</fetusTexPath>
+				<fetusTexPath>Fetus/Bovines/Fetus_Bovine</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.4</cumThickness>
 				<ingestionOutcomeDoers>
@@ -365,7 +365,7 @@
 		<xpath>Defs/ThingDef[defName="Donkey"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_Bovine</fetusTexPath>
+				<fetusTexPath>Fetus/Bovines/Fetus_Bovine</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.4</cumThickness>
 				<ingestionOutcomeDoers>
@@ -380,7 +380,7 @@
 		<xpath>Defs/ThingDef[defName="Cow"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_Bovine</fetusTexPath>
+				<fetusTexPath>Fetus/Bovines/Fetus_Bovine</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.4</cumThickness>
 				<ingestionOutcomeDoers>
@@ -395,7 +395,7 @@
 		<xpath>Defs/ThingDef[defName="Boomalope"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_Bovine</fetusTexPath>
+				<fetusTexPath>Fetus/Boomies/Fetus_Boomalope</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.4</cumThickness>
 				<ingestionOutcomeDoers>
@@ -410,7 +410,7 @@
 		<xpath>Defs/ThingDef[defName="Muffalo"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_Bovine</fetusTexPath>
+				<fetusTexPath>Fetus/Muffalos/Fetus_Muffalo</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.4</cumThickness>
 				<ingestionOutcomeDoers>
@@ -425,7 +425,7 @@
 		<xpath>Defs/ThingDef[defName="Bison"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_S_Bovine</fetusTexPath>
+				<fetusTexPath>Fetus/Bovines/Fetus_Bovine</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.4</cumThickness>
 				<ingestionOutcomeDoers>
@@ -440,7 +440,7 @@
 		<xpath>Defs/ThingDef[defName="Dromedary"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_Bovine</fetusTexPath>
+				<fetusTexPath>Fetus/Bovines/Fetus_Bovine</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.4</cumThickness>
 				<ingestionOutcomeDoers>
@@ -455,7 +455,7 @@
 		<xpath>Defs/ThingDef[defName="Elephant"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_Elephant</fetusTexPath>
+				<fetusTexPath>Fetus/Elephants/Fetus_Elephant</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.5</cumThickness>
 				<ingestionOutcomeDoers>
@@ -470,7 +470,7 @@
 		<xpath>Defs/ThingDef[defName="Rhinoceros"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_Elephant</fetusTexPath>
+				<fetusTexPath>Fetus/Rhinoceroses/Fetus_Rhinoceros</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.5</cumThickness>
 				<ingestionOutcomeDoers>
@@ -485,7 +485,7 @@
 		<xpath>Defs/ThingDef[defName="Cat"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Feline/Fetus_Cat</fetusTexPath>
+				<fetusTexPath>Fetus/Felines/Fetus_Feline_D</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.1</cumThickness>
 				<ingestionOutcomeDoers>
@@ -500,7 +500,7 @@
 		<xpath>Defs/ThingDef[@Name="BigCatThingBase"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Feline/Fetus_Cat</fetusTexPath>
+				<fetusTexPath>Fetus/Felines/Fetus_Feline_W</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.2</cumThickness>
 				<ingestionOutcomeDoers>
@@ -515,7 +515,7 @@
 		<xpath>Defs/ThingDef[defName="Cougar"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Feline/Fetus_Cat</fetusTexPath>
+				<fetusTexPath>Fetus/Felines/Fetus_Feline_W</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.2</cumThickness>
 				<ingestionOutcomeDoers>
@@ -530,7 +530,7 @@
 		<xpath>Defs/ThingDef[defName="Panther"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Feline/Fetus_Cat</fetusTexPath>
+				<fetusTexPath>Fetus/Felines/Fetus_Feline_D</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.2</cumThickness>
 				<ingestionOutcomeDoers>
@@ -545,7 +545,7 @@
 		<xpath>Defs/ThingDef[defName="Iguana"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Reptile/Fetus_Lizard</fetusTexPath>
+				<fetusTexPath>Fetus/Reptiles/Fetus_Reptile</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.5</cumThickness>
 				<ingestionOutcomeDoers>
@@ -560,7 +560,7 @@
 		<xpath>Defs/ThingDef[defName="Tortoise"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Reptile/Fetus_Lizard</fetusTexPath>
+				<fetusTexPath>Fetus/Reptiles/Fetus_Reptile</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.5</cumThickness>
 				<ingestionOutcomeDoers>
@@ -575,7 +575,7 @@
 		<xpath>Defs/ThingDef[defName="Cobra"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Reptile/Fetus_Snake</fetusTexPath>
+				<fetusTexPath>Fetus/Snakes/Fetus_Snake</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.5</cumThickness>
 				<ingestionOutcomeDoers>
@@ -590,7 +590,7 @@
 		<xpath>Defs/ThingDef[@Name="BaseHare"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Pests/Fetus_Rodent</fetusTexPath>
+				<fetusTexPath>Fetus/Lagomorphs/Fetus_Lagomorph</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.4</cumThickness>
 				<ingestionOutcomeDoers>
@@ -605,7 +605,7 @@
 		<xpath>Defs/ThingDef[defName="Rat"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Pests/Fetus_Rodent</fetusTexPath>
+				<fetusTexPath>Fetus/Rodents/Fetus_Rodent</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.4</cumThickness>
 				<ingestionOutcomeDoers>
@@ -620,7 +620,7 @@
 		<xpath>Defs/ThingDef[defName="Boomrat"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Pests/Fetus_Rodent</fetusTexPath>
+				<fetusTexPath>Fetus/Boomies/Fetus_Boomrat</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.4</cumThickness>
 				<ingestionOutcomeDoers>
@@ -635,7 +635,7 @@
 		<xpath>Defs/ThingDef[defName="GuineaPig"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Pests/Fetus_Rodent</fetusTexPath>
+				<fetusTexPath>Fetus/Rodents/Fetus_Rodent</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.4</cumThickness>
 				<ingestionOutcomeDoers>
@@ -650,7 +650,7 @@
 		<xpath>Defs/ThingDef[defName="Chinchilla"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Pests/Fetus_Rodent</fetusTexPath>
+				<fetusTexPath>Fetus/Rodents/Fetus_Rodent</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.4</cumThickness>
 				<ingestionOutcomeDoers>
@@ -665,7 +665,7 @@
 		<xpath>Defs/ThingDef[defName="Snowhare"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Pests/Fetus_Rodent</fetusTexPath>
+				<fetusTexPath>Fetus/Lagomorphs/Fetus_Lagomorph</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.4</cumThickness>
 				<ingestionOutcomeDoers>
@@ -680,7 +680,7 @@
 		<xpath>Defs/ThingDef[defName="Capybara"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Pests/Fetus_Rodent</fetusTexPath>
+				<fetusTexPath>Fetus/Rodents/Fetus_Rodent</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.4</cumThickness>
 				<ingestionOutcomeDoers>
@@ -695,7 +695,7 @@
 		<xpath>Defs/ThingDef[defName="Raccoon"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Pests/Fetus_Rodent</fetusTexPath>
+				<fetusTexPath>Fetus/Rodents/Fetus_Rodent</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.4</cumThickness>
 				<ingestionOutcomeDoers>
@@ -710,7 +710,7 @@
 		<xpath>Defs/ThingDef[defName="Alphabeaver"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Pests/Fetus_Rodent</fetusTexPath>
+				<fetusTexPath>Fetus/Rodents/Fetus_Rodent</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.4</cumThickness>
 				<ingestionOutcomeDoers>
@@ -725,7 +725,7 @@
 		<xpath>Defs/ThingDef[defName="Squirrel"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Pests/Fetus_Rodent</fetusTexPath>
+				<fetusTexPath>Fetus/Rodents/Fetus_Rodent</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.4</cumThickness>
 				<ingestionOutcomeDoers>
@@ -740,7 +740,7 @@
 		<xpath>Defs/ThingDef[defName="Monkey"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Primate/Fetus_Monkey</fetusTexPath>
+				<fetusTexPath>Fetus/Primate/Fetus_Primate</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.2</cumThickness>
 				<ingestionOutcomeDoers>
@@ -755,7 +755,7 @@
 		<xpath>Defs/ThingDef[defName="Megasloth"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_S_Bovine</fetusTexPath>
+				<fetusTexPath>Fetus/Megasloths/Fetus_Megasloth</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.9</cumThickness>
 				<ingestionOutcomeDoers>
@@ -770,7 +770,7 @@
 		<xpath>Defs/ThingDef[defName="Thrumbo"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Livestocks/Fetus_S_Bovine</fetusTexPath>
+				<fetusTexPath>Fetus/Thrumbos/Fetus_Thrumbo</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.7</cumThickness>
 				<ingestionOutcomeDoers>
@@ -785,7 +785,7 @@
 		<xpath>Defs/ThingDef[@Name="BaseMechanoid"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Mech/Fetus_Mech</fetusTexPath>
+				<fetusTexPath>Fetus/Mechanoids/Fetus_Mechanoid</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.9</cumThickness>
 				<ingestionOutcomeDoers>
@@ -800,7 +800,7 @@
 		<xpath>Defs/ThingDef[@Name="BaseMechanoidWalker"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Mech/Fetus_Mech</fetusTexPath>
+				<fetusTexPath>Fetus/Mechanoids/Fetus_Mechanoid</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.9</cumThickness>
 				<ingestionOutcomeDoers>
@@ -840,5 +840,20 @@
 			</li>
 		</value>
 	</Operation>
-	
+
+  <Operation Class="PatchOperationAddModExtension">
+    <xpath>/Defs/ThingDef[@Name="BaseBear"]</xpath>
+    <value>
+      <li Class="RJW_Menstruation.PawnDNAModExtension">
+        <fetusTexPath>Fetus/Ursids/Fetus_Ursid</fetusTexPath>
+        <cumColor>(255,255,255,255)</cumColor>
+        <cumThickness>0.05</cumThickness>
+        <ingestionOutcomeDoers>
+        </ingestionOutcomeDoers>
+        <hybridExtension>
+        </hybridExtension>
+      </li>
+    </value>
+  </Operation>
+  
 </Patch>