diff --git a/1.3/Textures/UI/Commands/AsWhore.png b/1.3/Textures/UI/Commands/AsWhore.png deleted file mode 100644 index b5f14e1..0000000 Binary files a/1.3/Textures/UI/Commands/AsWhore.png and /dev/null differ diff --git a/1.3/Textures/UI/Commands/AsWhoreMany.png b/1.3/Textures/UI/Commands/AsWhoreMany.png deleted file mode 100644 index f7c1989..0000000 Binary files a/1.3/Textures/UI/Commands/AsWhoreMany.png and /dev/null differ diff --git a/1.4/Source/Mod/Whoring_Bed_Utilities.cs b/1.4/Source/Mod/Whoring_Bed_Utilities.cs index a93a898..74ac8a1 100644 --- a/1.4/Source/Mod/Whoring_Bed_Utilities.cs +++ b/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; } diff --git a/1.4/Source/Mod/harmony_Building_BedPatches.cs b/1.4/Source/Mod/harmony_Building_BedPatches.cs index 78a1794..bd6c086 100644 --- a/1.4/Source/Mod/harmony_Building_BedPatches.cs +++ b/1.4/Source/Mod/harmony_Building_BedPatches.cs @@ -52,7 +52,13 @@ namespace rjwwhoring private static IEnumerable Process(Building_Bed __instance, IEnumerable __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 diff --git a/1.4/Textures/UI/Commands/AsWhore.png b/1.4/Textures/UI/Commands/AsWhore.png deleted file mode 100644 index b5f14e1..0000000 Binary files a/1.4/Textures/UI/Commands/AsWhore.png and /dev/null differ diff --git a/1.4/Textures/UI/Commands/AsWhoreMany.png b/1.4/Textures/UI/Commands/AsWhoreMany.png deleted file mode 100644 index f7c1989..0000000 Binary files a/1.4/Textures/UI/Commands/AsWhoreMany.png and /dev/null differ diff --git a/1.4/Textures/UI/Commands/Service_Refuse.png b/1.4/Textures/UI/Commands/Service_Refuse.png deleted file mode 100644 index 7b57c3b..0000000 Binary files a/1.4/Textures/UI/Commands/Service_Refuse.png and /dev/null differ diff --git a/1.4/Textures/UI/Commands/Service_off.png b/1.4/Textures/UI/Commands/Service_off.png deleted file mode 100644 index 3b46e97..0000000 Binary files a/1.4/Textures/UI/Commands/Service_off.png and /dev/null differ diff --git a/1.4/Textures/UI/Commands/Service_on.png b/1.4/Textures/UI/Commands/Service_on.png deleted file mode 100644 index b427f88..0000000 Binary files a/1.4/Textures/UI/Commands/Service_on.png and /dev/null differ diff --git a/1.4/Textures/UI/Tab/ComfortPrisoner_off.png b/1.4/Textures/UI/Tab/ComfortPrisoner_off.png deleted file mode 100644 index 7cb8f64..0000000 Binary files a/1.4/Textures/UI/Tab/ComfortPrisoner_off.png and /dev/null differ diff --git a/1.4/Textures/UI/Tab/ComfortPrisoner_off_nobg.png b/1.4/Textures/UI/Tab/ComfortPrisoner_off_nobg.png deleted file mode 100644 index ce033a1..0000000 Binary files a/1.4/Textures/UI/Tab/ComfortPrisoner_off_nobg.png and /dev/null differ diff --git a/1.4/Textures/UI/Tab/ComfortPrisoner_on.png b/1.4/Textures/UI/Tab/ComfortPrisoner_on.png deleted file mode 100644 index c2a76ee..0000000 Binary files a/1.4/Textures/UI/Tab/ComfortPrisoner_on.png and /dev/null differ diff --git a/1.4/Textures/UI/Tab/Service_off.png b/1.4/Textures/UI/Tab/Service_off.png deleted file mode 100644 index 510041b..0000000 Binary files a/1.4/Textures/UI/Tab/Service_off.png and /dev/null differ diff --git a/1.4/Textures/UI/Tab/Service_on.png b/1.4/Textures/UI/Tab/Service_on.png deleted file mode 100644 index cdcc073..0000000 Binary files a/1.4/Textures/UI/Tab/Service_on.png and /dev/null differ diff --git a/Textures/UI/Commands/AsWhore.png b/Textures/UI/Commands/AsWhore.png new file mode 100644 index 0000000..d42acf0 Binary files /dev/null and b/Textures/UI/Commands/AsWhore.png differ diff --git a/Textures/UI/Commands/AsWhoreMany.png b/Textures/UI/Commands/AsWhoreMany.png new file mode 100644 index 0000000..04ccb25 Binary files /dev/null and b/Textures/UI/Commands/AsWhoreMany.png differ diff --git a/1.3/Textures/UI/Commands/Service_Refuse.png b/Textures/UI/Commands/Service_Refuse.png similarity index 100% rename from 1.3/Textures/UI/Commands/Service_Refuse.png rename to Textures/UI/Commands/Service_Refuse.png diff --git a/1.3/Textures/UI/Commands/Service_off.png b/Textures/UI/Commands/Service_off.png similarity index 100% rename from 1.3/Textures/UI/Commands/Service_off.png rename to Textures/UI/Commands/Service_off.png diff --git a/1.3/Textures/UI/Commands/Service_on.png b/Textures/UI/Commands/Service_on.png similarity index 100% rename from 1.3/Textures/UI/Commands/Service_on.png rename to Textures/UI/Commands/Service_on.png diff --git a/1.3/Textures/UI/Tab/ComfortPrisoner_off.png b/Textures/UI/Tab/ComfortPrisoner_off.png similarity index 100% rename from 1.3/Textures/UI/Tab/ComfortPrisoner_off.png rename to Textures/UI/Tab/ComfortPrisoner_off.png diff --git a/1.3/Textures/UI/Tab/ComfortPrisoner_off_nobg.png b/Textures/UI/Tab/ComfortPrisoner_off_nobg.png similarity index 100% rename from 1.3/Textures/UI/Tab/ComfortPrisoner_off_nobg.png rename to Textures/UI/Tab/ComfortPrisoner_off_nobg.png diff --git a/1.3/Textures/UI/Tab/ComfortPrisoner_on.png b/Textures/UI/Tab/ComfortPrisoner_on.png similarity index 100% rename from 1.3/Textures/UI/Tab/ComfortPrisoner_on.png rename to Textures/UI/Tab/ComfortPrisoner_on.png diff --git a/1.3/Textures/UI/Tab/Service_off.png b/Textures/UI/Tab/Service_off.png similarity index 100% rename from 1.3/Textures/UI/Tab/Service_off.png rename to Textures/UI/Tab/Service_off.png diff --git a/1.3/Textures/UI/Tab/Service_on.png b/Textures/UI/Tab/Service_on.png similarity index 100% rename from 1.3/Textures/UI/Tab/Service_on.png rename to Textures/UI/Tab/Service_on.png