Merge branch 'master' into 'master'

Decoupled Textures from version folders and added new bed gizmo icons.

See merge request Ed86/rjw-whoring!6

1.4/Source/Mod/Whoring_Bed_Utilities.cs

@@ -287,7 +287,11 @@ namespace rjwwhoring
 		}
 		public static bool IsAllowedForWhoringOwner(this Building_Bed bed)
 		{
-			if (!bed.def.building.bed_humanlike || bed.Faction != Faction.OfPlayerSilentFail || bed.Medical || bed.def.defName.Contains("Guest"))
+			if (!bed.def.building.bed_humanlike ||
+				bed.Faction != Faction.OfPlayerSilentFail ||
+				bed.Medical ||
+				bed.def.defName.Contains("Guest") ||
+				bed.def.defName.Contains("Android") )
 			{
 				return false;
 			}
@@ -322,7 +326,13 @@ namespace rjwwhoring
 		{
 			if (WhoringBase.DataStore.GetBedData(bed).allowedForWhoringAll)
 			{
-				if (!bed.def.building.bed_humanlike || bed.Faction != Faction.OfPlayerSilentFail || bed.Medical || bed.ForPrisoners || bed.def.defName.Contains("Guest") || bed.GetRoom()?.IsPrisonCell == true)
+				if (!bed.def.building.bed_humanlike ||
+					bed.Faction != Faction.OfPlayerSilentFail ||
+					bed.Medical ||
+					bed.ForPrisoners ||
+					bed.def.defName.Contains("Guest") ||
+					bed.def.defName.Contains("Android")  ||
+					bed.GetRoom()?.IsPrisonCell == true)
 				{
 					return false;
 				}

1.4/Source/Mod/harmony_Building_BedPatches.cs

@@ -52,7 +52,13 @@ namespace rjwwhoring
 			private static IEnumerable<Gizmo> Process(Building_Bed __instance, IEnumerable<Gizmo> __result)
 			{
 				var isPrisonCell = __instance.GetRoom()?.IsPrisonCell == true;
-				if (!__instance.ForPrisoners && !__instance.Medical && __instance.def.building.bed_humanlike && __instance.Faction == Faction.OfPlayerSilentFail && !__instance.def.defName.Contains("Guest") && !isPrisonCell)
+				if (!__instance.ForPrisoners && 
+					!__instance.Medical && 
+					__instance.def.building.bed_humanlike && 
+					__instance.Faction == Faction.OfPlayerSilentFail && 
+					!__instance.def.defName.Contains("Guest") && 
+					!__instance.def.defName.Contains("Android") && 
+					!isPrisonCell)
 				{
 
 					yield return