Merge branch 'Dev' into 'AddBreastReduction2'
# Conflicts: # RimJobWorld.Main.csproj
No related branches found
No related tags found
Showing
- About/Manifest.xml 1 addition, 1 deletionAbout/Manifest.xml
- About/ModSync.xml 1 addition, 1 deletionAbout/ModSync.xml
- Assemblies/RJW.dll 0 additions, 0 deletionsAssemblies/RJW.dll
- Defs/RecipeDefs/Recipes_Surgery_Multi.xml 4 additions, 4 deletionsDefs/RecipeDefs/Recipes_Surgery_Multi.xml
- RimJobWorld.Main.csproj 9 additions, 1 deletionRimJobWorld.Main.csproj
- Source/Common/DataStore.cs 0 additions, 2 deletionsSource/Common/DataStore.cs
- Source/Common/PawnData.cs 0 additions, 444 deletionsSource/Common/PawnData.cs
- Source/Designators/Breedee.cs 91 additions, 0 deletionsSource/Designators/Breedee.cs
- Source/Designators/Breeder.cs 59 additions, 0 deletionsSource/Designators/Breeder.cs
- Source/Designators/Comfort.cs 74 additions, 0 deletionsSource/Designators/Comfort.cs
- Source/Designators/Hero.cs 100 additions, 0 deletionsSource/Designators/Hero.cs
- Source/Designators/Milking.cs 39 additions, 0 deletionsSource/Designators/Milking.cs
- Source/Designators/Service.cs 66 additions, 0 deletionsSource/Designators/Service.cs
- Source/Designators/Utility.cs 97 additions, 0 deletionsSource/Designators/Utility.cs
- Source/Designators/_RJWdesignationsWidget.cs 6 additions, 6 deletionsSource/Designators/_RJWdesignationsWidget.cs
- Source/Harmony/SocialCardUtilityPatch.cs 79 additions, 0 deletionsSource/Harmony/SocialCardUtilityPatch.cs
- Source/Harmony/patch_ui_rjw_buttons.cs 2 additions, 0 deletionsSource/Harmony/patch_ui_rjw_buttons.cs
- Source/JobGivers/JobGiver_JoinInBed.cs 4 additions, 3 deletionsSource/JobGivers/JobGiver_JoinInBed.cs
- Source/Modules/Pregnancy/Pregnancy_Helper.cs 3 additions, 1 deletionSource/Modules/Pregnancy/Pregnancy_Helper.cs
- Source/WorkGivers/WorkGiver_Rape.cs 1 addition, 1 deletionSource/WorkGivers/WorkGiver_Rape.cs
Loading
Please register or sign in to comment