Merge branch 'Taberu-master-patch-52772' into 'master'

Update and Recompile for 1.4

See merge request c0ffeeeeeeee/rjw-toys-and-masturbation!1
This commit is contained in:
Taberu 2023-07-10 01:50:21 +00:00
commit 67bf9b422e
8 changed files with 15 additions and 2 deletions

0
1.3/.gitkeep Normal file
View file

0
1.3/Assemblies/.gitkeep Normal file
View file

0
1.4/.gitkeep Normal file
View file

0
1.4/Assemblies/.gitkeep Normal file
View file

Binary file not shown.

13
LoadFolders.xml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<loadFolders>
<v1.3>
<li>/</li>
<li>1.3</li>
</v1.3>
<v1.4>
<li>/</li>
<li>1.4</li>
</v1.4>
</loadFolders>

View file

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@ -13,7 +13,7 @@ namespace RJW_ToysAndMasturbation {
public static IntVec3 FapLocation(Pawn p) => CasualSex_Helper.FindSexLocation(p);
protected override Job TryGiveJob(Pawn pawn) {
public override Job TryGiveJob(Pawn pawn) {
if (pawn.Drafted) {
return null;