AblativeAbsolute/rjw-whoring
1
0
Fork 0
mirror of https://gitgud.io/Ed86/rjw-whoring.git synced 2024-08-15 00:03:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: AblativeAbsolute:678b0f57b5ef2d556d87031b6a4a936fe89f829c
Branches Tags
AblativeAbsolute:master
..
compare: AblativeAbsolute:a3cf5fbcc9013fb31d50a516267a13dc1dba97e6
Branches Tags
AblativeAbsolute:master

1 commit
678b0f57b5 ... a3cf5fbcc9

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
2 changed files with 3 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
1.4/Source/Mod/Whoring_Bed_Utilities.cs
View file

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

8
1.4/Source/Mod/harmony_Building_BedPatches.cs
View file

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