From 8ff3771a0ecd1112fe4462ad773137b3c0ce627f Mon Sep 17 00:00:00 2001
From: ADHD_Coder <temp-email-for-oauth-adhd_coder@gitlab.localhost>
Date: Mon, 17 Nov 2025 13:35:52 -0800
Subject: [PATCH 1/2] Fix UI so it displays the type of the vaginal the
 menstruationComp is linked to, instead of the first vagina the pawn has.

---
 .../RJW_Menstruation/UI/Dialog_WombStatus.cs                | 2 +-
 1.6/source/RJW_Menstruation/RJW_Menstruation/Utility.cs     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/1.6/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_WombStatus.cs b/1.6/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_WombStatus.cs
index 72706ef..7ead724 100644
--- a/1.6/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_WombStatus.cs
+++ b/1.6/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_WombStatus.cs
@@ -400,7 +400,7 @@ namespace RJW_Menstruation
             GUI.DrawTexture(genitalIconRect, vagina, ScaleMode.ScaleToFit);
 
             GUI.color = Color.white;
-            GUI.Label(genitalVaginaLabelRect, pawn.GetVaginaLabel(), fontstylecenter);
+            GUI.Label(genitalVaginaLabelRect, comp.GetVaginaLabel(), fontstylecenter);
             GUI.Label(genitalAnusLabelRect, pawn.GetAnusLabel(), fontstylecenter);
         }
 
diff --git a/1.6/source/RJW_Menstruation/RJW_Menstruation/Utility.cs b/1.6/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
index 26deb88..8276e6d 100644
--- a/1.6/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
+++ b/1.6/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
@@ -344,10 +344,10 @@ namespace RJW_Menstruation
         }
 
 
-        public static string GetVaginaLabel(this Pawn pawn)
+        public static string GetVaginaLabel(this HediffComp_Menstruation comp)
         {
-            Hediff hediff = pawn.health.hediffSet.hediffs.Find(h => VariousDefOf.AllVaginas.Contains(h.def));
-            return hediff.LabelBase.CapitalizeFirst() + "\n(" + hediff.LabelInBrackets + ")" + "\n" + xxx.CountOfSex.LabelCap.CapitalizeFirst() + ": " + pawn.records.GetAsInt(xxx.CountOfSex);
+            Hediff hediff = comp.parent;
+            return hediff.LabelBase.CapitalizeFirst() + "\n(" + hediff.LabelInBrackets + ")" + "\n" + xxx.CountOfSex.LabelCap.CapitalizeFirst() + ": " + comp.parent.pawn.records.GetAsInt(xxx.CountOfSex);
         }
         public static string GetAnusLabel(this Pawn pawn)
         {

From 5c83c807a3cf2ce659453532a519557a08ffe5b1 Mon Sep 17 00:00:00 2001
From: lutepickle <28810-lutepickle@users.noreply.gitgud.io>
Date: Wed, 5 Aug 2026 06:08:23 -0700
Subject: [PATCH 2/2] Make InterspeciesImplantFactor public

---
 .../RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs     | 2 +-
 About/Manifest.xml                                              | 2 +-
 changelogs.txt                                                  | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/1.6/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs b/1.6/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
index afca25e..4f40be0 100644
--- a/1.6/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
+++ b/1.6/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
@@ -1971,7 +1971,7 @@ namespace RJW_Menstruation
             }
         }
 
-        protected float InterspeciesImplantFactor(Pawn fertilizer)
+        public float InterspeciesImplantFactor(Pawn fertilizer)
         {
             if (fertilizer.def.defName == Pawn.def.defName) return 1.0f;
             else
diff --git a/About/Manifest.xml b/About/Manifest.xml
index bef173d..afec410 100644
--- a/About/Manifest.xml
+++ b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
 	<identifier>RJW Menstruation</identifier>
-	<version>1.6.2.4</version>
+	<version>1.6.2.5</version>
 	<dependencies>
 	</dependencies>
 	<incompatibleWith />
diff --git a/changelogs.txt b/changelogs.txt
index 7316879..1beebcf 100644
--- a/changelogs.txt
+++ b/changelogs.txt
@@ -1,3 +1,5 @@
+Version 1.6.2.5
+
 Version 1.6.2.4
  - Fix error on startup and missing womb status in RJW tab with RJW 6.1.4.