diff --git a/RJWSexperience/IdeologyAddon/Ideology/Rituals/JobGiver_DrugOrgy.cs b/RJWSexperience/IdeologyAddon/Ideology/Rituals/JobGiver_DrugOrgy.cs
index 80aa619..a85ba70 100644
--- a/RJWSexperience/IdeologyAddon/Ideology/Rituals/JobGiver_DrugOrgy.cs
+++ b/RJWSexperience/IdeologyAddon/Ideology/Rituals/JobGiver_DrugOrgy.cs
@@ -127,8 +127,9 @@ namespace RJWSexperience.Ideology
 			{
 				Partner.pather.StopDead();
 				Partner.jobs.curDriver.asleep = false;
-				usedCondom = CondomUtility.TryUseCondom(pawn) || CondomUtility.TryUseCondom(Partner);
+				
 				Start();
+				Sexprops.usedCondom = CondomUtility.TryUseCondom(pawn) || CondomUtility.TryUseCondom(Partner);
 			};
 			SexToil.AddPreTickAction(delegate
 			{
diff --git a/RJWSexperience/IdeologyAddon/Ideology/Rituals/JobGiver_GangbangVictim.cs b/RJWSexperience/IdeologyAddon/Ideology/Rituals/JobGiver_GangbangVictim.cs
index 03f1fd0..a7766e8 100644
--- a/RJWSexperience/IdeologyAddon/Ideology/Rituals/JobGiver_GangbangVictim.cs
+++ b/RJWSexperience/IdeologyAddon/Ideology/Rituals/JobGiver_GangbangVictim.cs
@@ -96,7 +96,7 @@ namespace RJWSexperience.Ideology
 				Partner.jobs.curDriver.asleep = false;
 				// Unlike normal rape try use comfort prisoner condom
 				CondomUtility.GetCondomFromRoom(Partner);
-				usedCondom = CondomUtility.TryUseCondom(Partner);
+				Sexprops.usedCondom = CondomUtility.TryUseCondom(Partner);
 
 				if (RJWSettings.DebugRape) ModLog.Message("JobDriver_RapeComfortPawn::MakeNewToils() - reserving prisoner");
 				//pawn.Reserve(Partner, xxx.max_rapists_per_prisoner, 0);
diff --git a/RJWSexperience/IdeologyAddon/Ideology/Rituals/RitualOutcomeComps.cs b/RJWSexperience/IdeologyAddon/Ideology/Rituals/RitualOutcomeComps.cs
index 15650f8..e86060c 100644
--- a/RJWSexperience/IdeologyAddon/Ideology/Rituals/RitualOutcomeComps.cs
+++ b/RJWSexperience/IdeologyAddon/Ideology/Rituals/RitualOutcomeComps.cs
@@ -40,8 +40,12 @@ namespace RJWSexperience.Ideology
 		}
 		
 
+<<<<<<< HEAD
 
 		public override ExpectedOutcomeDesc GetExpectedOutcomeDesc(Precept_Ritual ritual, TargetInfo ritualTarget, RitualObligation obligation, RitualRoleAssignments assignments, RitualOutcomeComp_Data data)
+=======
+        public override ExpectedOutcomeDesc GetExpectedOutcomeDesc(Precept_Ritual ritual, TargetInfo ritualTarget, RitualObligation obligation, RitualRoleAssignments assignments, RitualOutcomeComp_Data data)
+>>>>>>> 2c61e8b5425da0190af8f9c6a499a3da7cd49dcf
 		{
 			return new ExpectedOutcomeDesc
 			{
diff --git a/RJWSexperience/RJWSexperience/RJW_Patch.cs b/RJWSexperience/RJWSexperience/RJW_Patch.cs
index bfd004c..730d821 100644
--- a/RJWSexperience/RJWSexperience/RJW_Patch.cs
+++ b/RJWSexperience/RJWSexperience/RJW_Patch.cs
@@ -184,7 +184,7 @@ namespace RJWSexperience
         {
             if (__instance.Sexprops.sexType != xxx.rjwSextype.Masturbation && !(__instance is JobDriver_Masturbate))
             {
-                if (__instance.isRape)
+                if (__instance.Sexprops.isRape)
                 {
                     __instance.pawn?.skills?.Learn(VariousDefOf.SexSkill, 0.05f, true);
                 }
@@ -220,12 +220,20 @@ namespace RJWSexperience
 
         public static void Prefix(SexProps props, ref float satisfaction)
         {
+<<<<<<< HEAD
+=======
+            Pawn pawn = props.pawn;
+>>>>>>> 2c61e8b5425da0190af8f9c6a499a3da7cd49dcf
             Pawn partner = props.partner;
             satisfaction = Mathf.Max(base_sat_per_fuck, satisfaction * partner.GetSexStat());
         }
 
         public static void Postfix(SexProps props, float satisfaction)
         {
+<<<<<<< HEAD
+=======
+
+>>>>>>> 2c61e8b5425da0190af8f9c6a499a3da7cd49dcf
             Pawn pawn = props.pawn;
             Pawn partner = props.partner;
             float? lust = pawn.records?.GetValue(VariousDefOf.Lust);