Merge branch 'conditional-embarrassment' into 'dev'

Added exceptions to sidebar PC embarrassment based on location and gender appearance.

See merge request !2521

game/base-clothing/canvasmodel-img.twee

@@ -161,9 +161,18 @@ Requires prior <<selectmodel "main">>
 
 	<<set _coverBreastsWithArm to false>>
 	<<if $leftarm isnot "bound" and $leftarm isnot "grappled">>
+
 		<<if $dontHide is false and $worn.over_upper.exposed gte 1 and ($worn.upper.exposed gte 1 or $upperwetstage gte 3) and ($worn.lower.covers_top isnot 1) and (($uncomfortable.underwear is true and !$worn.under_upper.type.includes("naked")) or ($uncomfortable.nude is true and ($worn.under_upper.exposed gte 1 or $underupperwetstage gte 3)))>>
-			<<set _coverBreasts to true>>
-			<<set _modeloptions.arm_left to "cover">> <!-- might be changed back to "idle" if covering with wings -->
+			
+			<<if ($player.gender_appearance is "m" and $player.perceived_breastsize lte 2) 
+			or (["pool", "lake", "beach"].includes($location) and ($worn.under_upper.exposed lt 1 and $underupperwetstage lt 3))>>
+				<<set _coverBreasts to false>>
+				<<set _modeloptions.arm_left to "idle">>
+			<<else>>
+				<<set _coverBreasts to true>>
+				<<set _modeloptions.arm_left to "cover">> <!-- might be changed back to "idle" if covering with wings -->
+			<</if>>
+		
 		<<else>>
 			<<set _coverBreasts to false>>
 			<<set _modeloptions.arm_left to "idle">>
@@ -175,8 +184,15 @@ Requires prior <<selectmodel "main">>
 	<<if $rightarm isnot "bound" and $rightarm isnot "grappled">>
 		<<if $dontHide is false and $worn.over_lower.exposed gte 1 and ($worn.lower.exposed gte 1 or $lowerwetstage gte 3)
 		and (($uncomfortable.underwear is true and !$worn.under_lower.type.includes("naked")) or ($uncomfortable.nude is true and ($worn.under_lower.exposed gte 1 or $underlowerwetstage gte 3)))>>
-			<<set _coverCrotch to true>>
-			<<set _modeloptions.arm_right to "cover">> <!-- might be changed back to "idle" if covering with wings/tail -->
+			
+			<<if (["pool", "lake", "beach"].includes($location) and ($worn.under_lower.exposed lt 1 and $underlowerwetstage lt 3))>>
+				<<set _coverCrotch to false>>
+				<<set _modeloptions.arm_right to $worn.handheld.name isnot "naked" ? "hold" : "idle">>
+			<<else>>
+				<<set _coverCrotch to true>>
+				<<set _modeloptions.arm_right to "cover">> <!-- might be changed back to "idle" if covering with wings/tail -->
+			<</if>>
+
 		<<else>>
 			<<set _coverCrotch to false>>
 			<<set _modeloptions.arm_right to $worn.handheld.name isnot "naked" ? "hold" : "idle">>