Merge branch 'master' into 'master'

Decoupled Textures from version folders and added new bed gizmo icons. See merge request Ed86/rjw-whoring!6
update for 5.3.8
2024-03-18 10:53:45 +00:00 · 2024-03-18 00:03:49 +02:00 · 2024-01-16 23:22:31 +01:00
25 changed files with 2 additions and 2 deletions
--- a/1.3/Textures/UI/Commands/AsWhore.png
+++ b/1.3/Textures/UI/Commands/AsWhore.png
--- a/1.3/Textures/UI/Commands/AsWhoreMany.png
+++ b/1.3/Textures/UI/Commands/AsWhoreMany.png
--- a/1.4/Assemblies/RimJobWorldWhoring.dll
+++ b/1.4/Assemblies/RimJobWorldWhoring.dll
--- a/1.4/Source/Mod/JobGivers/JobGiver_WhoreInvitingVisitors.cs
+++ b/1.4/Source/Mod/JobGivers/JobGiver_WhoreInvitingVisitors.cs
@ -110,7 +110,7 @@ namespace rjwwhoring
 			{
 				//Rand.PopState();
 				//Rand.PushState(RJW_Multiplayer.PredictableSeed());
-				if (xxx.isSingleOrPartnerNotHere(client) || xxx.is_lecher(client) || Rand.Value < 0.9f)
+				if (xxx.IsSingleOrPartnersNotHere(client) || xxx.is_lecher(client) || Rand.Value < 0.9f)
 				{
 					if (client != LovePartnerRelationUtility.ExistingLovePartner(whore))
 					{ //Exception for prisoners to account for PrisonerWhoreSexualEmergencyTree, which allows prisoners to try to hook up with anyone who's around (mostly other prisoners or warden)
--- a/1.4/Textures/UI/Commands/AsWhore.png
+++ b/1.4/Textures/UI/Commands/AsWhore.png
--- a/1.4/Textures/UI/Commands/AsWhoreMany.png
+++ b/1.4/Textures/UI/Commands/AsWhoreMany.png
--- a/1.4/Textures/UI/Commands/Service_Refuse.png
+++ b/1.4/Textures/UI/Commands/Service_Refuse.png
--- a/1.4/Textures/UI/Commands/Service_off.png
+++ b/1.4/Textures/UI/Commands/Service_off.png
--- a/1.4/Textures/UI/Commands/Service_on.png
+++ b/1.4/Textures/UI/Commands/Service_on.png
--- a/1.4/Textures/UI/Tab/ComfortPrisoner_off.png
+++ b/1.4/Textures/UI/Tab/ComfortPrisoner_off.png
--- a/1.4/Textures/UI/Tab/ComfortPrisoner_off_nobg.png
+++ b/1.4/Textures/UI/Tab/ComfortPrisoner_off_nobg.png
--- a/1.4/Textures/UI/Tab/ComfortPrisoner_on.png
+++ b/1.4/Textures/UI/Tab/ComfortPrisoner_on.png
--- a/1.4/Textures/UI/Tab/Service_off.png
+++ b/1.4/Textures/UI/Tab/Service_off.png
--- a/1.4/Textures/UI/Tab/Service_on.png
+++ b/1.4/Textures/UI/Tab/Service_on.png
--- a/About/Manifest.xml
+++ b/About/Manifest.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
 	<identifier>RimJobWorld Whoring</identifier>
-	<version>1.0.7</version>
+	<version>1.0.8</version>
 	<dependencies>
 		<li>RimJobWorld</li>
 	</dependencies>
--- a/Textures/UI/Commands/AsWhore.png
+++ b/Textures/UI/Commands/AsWhore.png
--- a/Textures/UI/Commands/AsWhoreMany.png
+++ b/Textures/UI/Commands/AsWhoreMany.png
--- a/1.3/Textures/UI/Commands/Service_Refuse.png
+++ b/1.3/Textures/UI/Commands/Service_Refuse.png
--- a/1.3/Textures/UI/Commands/Service_off.png
+++ b/1.3/Textures/UI/Commands/Service_off.png
--- a/1.3/Textures/UI/Commands/Service_on.png
+++ b/1.3/Textures/UI/Commands/Service_on.png
--- a/1.3/Textures/UI/Tab/ComfortPrisoner_off.png
+++ b/1.3/Textures/UI/Tab/ComfortPrisoner_off.png
--- a/1.3/Textures/UI/Tab/ComfortPrisoner_off_nobg.png
+++ b/1.3/Textures/UI/Tab/ComfortPrisoner_off_nobg.png
--- a/1.3/Textures/UI/Tab/ComfortPrisoner_on.png
+++ b/1.3/Textures/UI/Tab/ComfortPrisoner_on.png
--- a/1.3/Textures/UI/Tab/Service_off.png
+++ b/1.3/Textures/UI/Tab/Service_off.png
--- a/1.3/Textures/UI/Tab/Service_on.png
+++ b/1.3/Textures/UI/Tab/Service_on.png
Author	SHA1	Message	Date
Zimtraucher	a3cf5fbcc9	Merge branch 'master' into 'master' Decoupled Textures from version folders and added new bed gizmo icons. See merge request Ed86/rjw-whoring!6	2024-03-18 10:53:45 +00:00
Ed86	78e9291743	update for 5.3.8	2024-03-18 00:03:49 +02:00
Wasmachensachen	f59b358fba	Decoupled Textures from version folders and new gizmo icons.	2024-01-16 23:22:31 +01:00