Merge branch 'master' into 'master'

Master See merge request c0ffeeeeeeee/rimworld-animations!7
2024-08-15 00:43:45 +00:00 · 2023-04-11 21:00:15 +00:00
5 changed files with 0 additions and 2 deletions
--- a/1.4/Assemblies/Rimworld-Animations.dll
+++ b/1.4/Assemblies/Rimworld-Animations.dll
--- a/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs
+++ b/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs
@ -109,7 +109,6 @@ namespace Rimworld_Animations {
 					int animTicks = anim.animationTimeTicks - (fastAnimForQuickie ? anim.animationStages[0].playTimeTicks : 0);
 					(pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).ticks_left = animTicks;
 					(pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).sex_ticks = animTicks;
-					(pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).orgasmStartTick = animTicks;
 					(pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).duration = animTicks;


--- a/Patch_HumanoidAlienRaces/1.4/Assemblies/Patch_HumanoidAlienRaces.dll
+++ b/Patch_HumanoidAlienRaces/1.4/Assemblies/Patch_HumanoidAlienRaces.dll
--- a/Patch_SexToysMasturbation/1.4/Assemblies/Patch_SexToysMasturbation.dll
+++ b/Patch_SexToysMasturbation/1.4/Assemblies/Patch_SexToysMasturbation.dll
--- a/Patch_SexToysMasturbation/Source/Patches/HarmonyPatch_JobDriver_SexBaseInitiator.cs
+++ b/Patch_SexToysMasturbation/Source/Patches/HarmonyPatch_JobDriver_SexBaseInitiator.cs
@ -59,7 +59,6 @@ namespace Patch_SexToysMasturbation

                (pawn.jobs.curDriver as JobDriver_Sex).ticks_left = anim.animationTimeTicks;
                (pawn.jobs.curDriver as JobDriver_Sex).sex_ticks = anim.animationTimeTicks;
-                (pawn.jobs.curDriver as JobDriver_Sex).orgasmStartTick = anim.animationTimeTicks;
                (pawn.jobs.curDriver as JobDriver_Sex).duration = anim.animationTimeTicks;
            }
            else