From 12575b00a46d006ee33318575b2fa4bf61d97395 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 22 Dec 2019 17:01:31 -0500
Subject: [PATCH] | fixes

---
 src/uncategorized/remoteSurgery.tw | 296 +++++++++++++++--------------
 1 file changed, 152 insertions(+), 144 deletions(-)

diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 56c528a8ac4..781f11426a8 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -38,95 +38,98 @@
 <</if>>
 
 <h3>Work on $his face:</h3>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;
-
-$His $activeSlave.faceShape face is
-<<if $activeSlave.face < -95>>
-	very ugly.
-<<elseif $activeSlave.face < -40>>
-	ugly.
-<<elseif $activeSlave.face < -10>>
-	unattractive.
-<<elseif ($activeSlave.face <= 10)>>
-	quite average.
-<<elseif ($activeSlave.face <= 40)>>
-	attractive.
-<<elseif ($activeSlave.face <= 95)>>
-	beautiful.
-<<elseif ($activeSlave.face > 95)>>
-	very beautiful.
-<</if>>
-
-<<if $activeSlave.faceImplant == 0>>
-	It is entirely natural.
-<<elseif $activeSlave.faceImplant > 5>>
-	It has seen some work.
-<<elseif $activeSlave.faceImplant > 30>>
-	It has been totally reworked.
-<</if>>
+<div>
+	&nbsp;&nbsp;&nbsp;&nbsp;
+	$His $activeSlave.faceShape face is
+	<<if $activeSlave.face < -95>>
+		very ugly.
+	<<elseif $activeSlave.face < -40>>
+		ugly.
+	<<elseif $activeSlave.face < -10>>
+		unattractive.
+	<<elseif ($activeSlave.face <= 10)>>
+		quite average.
+	<<elseif ($activeSlave.face <= 40)>>
+		attractive.
+	<<elseif ($activeSlave.face <= 95)>>
+		beautiful.
+	<<elseif ($activeSlave.face > 95)>>
+		very beautiful.
+	<</if>>
+
+	<<if $activeSlave.faceImplant == 0>>
+		It is entirely natural.
+	<<elseif $activeSlave.faceImplant > 5>>
+		It has seen some work.
+	<<elseif $activeSlave.faceImplant > 30>>
+		It has been totally reworked.
+	<</if>>
 
-<<if $activeSlave.indentureRestrictions >= 2>>
-	//$His indenture forbids elective surgery//
-<<elseif $activeSlave.faceImplant > 95>>
-	//$His face cannot sustain further cosmetic surgery//
-<<else>>
-	<<set _artificiality = 25-5*Math.trunc($PC.skill.medicine/50)-5*$surgeryUpgrade>>
-	//Facial surgery can either rework it and improve its attractiveness, or simply make it more attractive. No facial surgery is perfect and each surgery will make it look less natural.
-	<<if $PC.skill.medicine >= 100 && $surgeryUpgrade>>
-		Your surgical skills and the advanced surgical suite will minimize this effect as much as possible.
-	<<elseif $PC.skill.medicine >= 100>>
-		Your surgical skills will reduce this effect.
-	<<elseif $surgeryUpgrade>>
-		The advanced surgical suite will reduce this effect.
-	<</if>>
-	<<if $activeSlave.faceImplant+_artificiality > 95>>
-		@@.yellow;<<if $activeSlave.faceImplant != 0>>Further f<<else>>F<</if>>acial surgery will create a severe uncanny valley effect.@@
-	<<elseif $activeSlave.faceImplant+_artificiality > 60 && $activeSlave.faceImplant <= 60>>
-		@@.yellow;<<if $activeSlave.faceImplant != 0>>Further f<<else>>F<</if>>acial surgery will be extremely obvious.@@
-	<<elseif $activeSlave.faceImplant+_artificiality > 30 && $activeSlave.faceImplant <= 30>>
-		@@.yellow;<<if $activeSlave.faceImplant != 0>>Further f<<else>>F<</if>>acial surgery will eliminate a natural appearance.@@
-	<<elseif $activeSlave.faceImplant+_artificiality > 10 && $activeSlave.faceImplant <= 10>>
-		@@.yellow;<<if $activeSlave.faceImplant != 0>>Further f<<else>>F<</if>>acial surgery will disturb a perfectly natural appearance.@@
-	<<else>>
-		A single facial surgery is not projected to significantly impact artificiality.
-	<</if>>//
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	<<if $activeSlave.faceShape != "normal">>
-		[[Make conventionally feminine|Surgery Degradation][$activeSlave.faceShape = "normal",$activeSlave.faceImplant = Math.clamp($activeSlave.faceImplant+_artificiality,0,100),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "face"]] |
-	<</if>>
-	<<if $activeSlave.faceShape == "masculine">>
-		[[Soften to androgynous|Surgery Degradation][$activeSlave.faceShape = "androgynous",$activeSlave.faceImplant = Math.clamp($activeSlave.faceImplant+_artificiality,0,100),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "face"]] |
+	<<if $activeSlave.indentureRestrictions >= 2>>
+		//$His indenture forbids elective surgery//
+	<<elseif $activeSlave.faceImplant > 95>>
+		//$His face cannot sustain further cosmetic surgery//
 	<<else>>
-		<<if $activeSlave.faceShape != "cute">>
-			[[Cute|Surgery Degradation][$activeSlave.faceShape = "cute",$activeSlave.faceImplant = Math.clamp($activeSlave.faceImplant+_artificiality,0,100),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "face"]] |
-		<</if>>
-		<<if $activeSlave.faceShape != "exotic">>
-			[[Exotic|Surgery Degradation][$activeSlave.faceShape = "exotic",$activeSlave.faceImplant = Math.clamp($activeSlave.faceImplant+_artificiality,0,100),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "face"]] |
-		<</if>>
-		<<if $activeSlave.faceShape != "sensual">>
-			[[Sensual|Surgery Degradation][$activeSlave.faceShape = "sensual",$activeSlave.faceImplant = Math.clamp($activeSlave.faceImplant+_artificiality,0,100),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "face"]] |
-		<</if>>
-		<<if $activeSlave.faceShape != "androgynous">>
-			[[Androgynous|Surgery Degradation][$activeSlave.faceShape = "androgynous",$activeSlave.faceImplant = Math.clamp($activeSlave.faceImplant+_artificiality,0,100),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "face"]] |
+		<<set _artificiality = 25-5*Math.trunc($PC.skill.medicine/50)-5*$surgeryUpgrade>>
+		//Facial surgery can either rework it and improve its attractiveness, or simply make it more attractive. No facial surgery is perfect and each surgery will make it look less natural.
+		<<if $PC.skill.medicine >= 100 && $surgeryUpgrade>>
+			Your surgical skills and the advanced surgical suite will minimize this effect as much as possible.
+		<<elseif $PC.skill.medicine >= 100>>
+			Your surgical skills will reduce this effect.
+		<<elseif $surgeryUpgrade>>
+			The advanced surgical suite will reduce this effect.
+		<</if>>
+		<<if $activeSlave.faceImplant+_artificiality > 95>>
+			@@.yellow;<<if $activeSlave.faceImplant != 0>>Further f<<else>>F<</if>>acial surgery will create a severe uncanny valley effect.@@
+		<<elseif $activeSlave.faceImplant+_artificiality > 60 && $activeSlave.faceImplant <= 60>>
+			@@.yellow;<<if $activeSlave.faceImplant != 0>>Further f<<else>>F<</if>>acial surgery will be extremely obvious.@@
+		<<elseif $activeSlave.faceImplant+_artificiality > 30 && $activeSlave.faceImplant <= 30>>
+			@@.yellow;<<if $activeSlave.faceImplant != 0>>Further f<<else>>F<</if>>acial surgery will eliminate a natural appearance.@@
+		<<elseif $activeSlave.faceImplant+_artificiality > 10 && $activeSlave.faceImplant <= 10>>
+			@@.yellow;<<if $activeSlave.faceImplant != 0>>Further f<<else>>F<</if>>acial surgery will disturb a perfectly natural appearance.@@
 		<<else>>
-			[[Masculine|Surgery Degradation][$activeSlave.faceShape = "masculine",$activeSlave.faceImplant = Math.clamp($activeSlave.faceImplant+_artificiality,0,100),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "face"]] |
-		<</if>>
-	<</if>>
-	[[Just improve attractiveness|Surgery Degradation][$activeSlave.faceImplant = Math.clamp($activeSlave.faceImplant+_artificiality,0,100),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "face"]]
-	<<if ($activeSlave.ageImplant > 1)>>
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;
-		//$He's had a multiple facelifts and other cosmetic procedures in an effort to preserve $his youth.//
-	<<elseif ($activeSlave.ageImplant > 0)>>
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;
-		//$He's had a face lift and other minor cosmetic procedures to make $him look younger.//
-	<<elseif ($activeSlave.physicalAge >= 25) && ($activeSlave.visualAge >= 25)>>
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;
-		//$He's old enough that a face lift and other minor cosmetic procedures could make $him look younger.//
-		[[Age lift|Surgery Degradation][$activeSlave.ageImplant = 1,$activeSlave.faceImplant = Math.clamp($activeSlave.faceImplant+_artificiality,0,100),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "age"]]
+			A single facial surgery is not projected to significantly impact artificiality.
+		<</if>>//
+		<div style="margin-left:2em">
+			<<if $activeSlave.faceShape != "normal">>
+				[[Make conventionally feminine|Surgery Degradation][$activeSlave.faceShape = "normal",$activeSlave.faceImplant = Math.clamp($activeSlave.faceImplant+_artificiality,0,100),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "face"]] |
+			<</if>>
+			<<if $activeSlave.faceShape == "masculine">>
+				[[Soften to androgynous|Surgery Degradation][$activeSlave.faceShape = "androgynous",$activeSlave.faceImplant = Math.clamp($activeSlave.faceImplant+_artificiality,0,100),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "face"]] |
+			<<else>>
+				<<if $activeSlave.faceShape != "cute">>
+					[[Cute|Surgery Degradation][$activeSlave.faceShape = "cute",$activeSlave.faceImplant = Math.clamp($activeSlave.faceImplant+_artificiality,0,100),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "face"]] |
+				<</if>>
+				<<if $activeSlave.faceShape != "exotic">>
+					[[Exotic|Surgery Degradation][$activeSlave.faceShape = "exotic",$activeSlave.faceImplant = Math.clamp($activeSlave.faceImplant+_artificiality,0,100),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "face"]] |
+				<</if>>
+				<<if $activeSlave.faceShape != "sensual">>
+					[[Sensual|Surgery Degradation][$activeSlave.faceShape = "sensual",$activeSlave.faceImplant = Math.clamp($activeSlave.faceImplant+_artificiality,0,100),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "face"]] |
+				<</if>>
+				<<if $activeSlave.faceShape != "androgynous">>
+					[[Androgynous|Surgery Degradation][$activeSlave.faceShape = "androgynous",$activeSlave.faceImplant = Math.clamp($activeSlave.faceImplant+_artificiality,0,100),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "face"]] |
+				<<else>>
+					[[Masculine|Surgery Degradation][$activeSlave.faceShape = "masculine",$activeSlave.faceImplant = Math.clamp($activeSlave.faceImplant+_artificiality,0,100),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "face"]] |
+				<</if>>
+			<</if>>
+			[[Just improve attractiveness|Surgery Degradation][$activeSlave.faceImplant = Math.clamp($activeSlave.faceImplant+_artificiality,0,100),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$activeSlave.health -= 10,$surgeryType = "face"]]
+			<<if ($activeSlave.ageImplant > 1)>>
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				//$He's had a multiple facelifts and other cosmetic procedures in an effort to preserve $his youth.//
+			<<elseif ($activeSlave.ageImplant > 0)>>
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				//$He's had a face lift and other minor cosmetic procedures to make $him look younger.//
+			<<elseif ($activeSlave.physicalAge >= 25) && ($activeSlave.visualAge >= 25)>>
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;
+				//$He's old enough that a face lift and other minor cosmetic procedures could make $him look younger.//
+				[[Age lift|Surgery Degradation][$activeSlave.ageImplant = 1,$activeSlave.faceImplant = Math.clamp($activeSlave.faceImplant+_artificiality,0,100),cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "age"]]
+			<</if>>
+		</div>
 	<</if>>
-<</if>>
+</div>
 
-<br>&nbsp;&nbsp;&nbsp;&nbsp;
+<div style="margin-left:2em">
+&nbsp;&nbsp;&nbsp;&nbsp;
 $He has <<print App.Desc.eyesType($activeSlave)>><<if hasAnyEyes($activeSlave)>>,
 they are <<print App.Desc.eyesVision($activeSlave)>>
 <</if>>.
@@ -135,29 +138,30 @@ they are <<print App.Desc.eyesVision($activeSlave)>>
 	<<set _n = 0>>
 	<<if getLeftEyeVision($activeSlave) === 2 && getLeftEyeType($activeSlave) === 1>>
 		<<set _n++>>
-		[[Blur left eye|Surgery Degradation][eyeSurgery($activeSlave, "left", "blur"), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 5, $surgeryType = "eyeBlur"]]
+		| [[Blur left eye|Surgery Degradation][eyeSurgery($activeSlave, "left", "blur"), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 5, $surgeryType = "eyeBlur"]]
 	<</if>>
 	<<if getRightEyeVision($activeSlave) === 2 && getRightEyeType($activeSlave) === 1>>
 		<<set _n++>>
-		[[Blur right eye|Surgery Degradation][eyeSurgery($activeSlave, "right", "blur"), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 5, $surgeryType = "eyeBlur"]]
+		| [[Blur right eye|Surgery Degradation][eyeSurgery($activeSlave, "right", "blur"), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 5, $surgeryType = "eyeBlur"]]
 	<</if>>
 	<<if _n === 2>>
-		[[Blur both eyes|Surgery Degradation][eyeSurgery($activeSlave, "both", "blur"), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "eyeBlur"]]
+		| [[Blur both eyes|Surgery Degradation][eyeSurgery($activeSlave, "both", "blur"), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "eyeBlur"]]
 	<</if>>
 	<<set _n = 0>>
 	<<if getLeftEyeVision($activeSlave) === 1 && getLeftEyeType($activeSlave) === 1>>
 		<<set _n++>>
-		[[Fix left eye|Surgery Degradation][eyeSurgery($activeSlave, "left", "fix"), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 5, $surgeryType = "eyeFix"]]
+		| [[Fix left eye|Surgery Degradation][eyeSurgery($activeSlave, "left", "fix"), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 5, $surgeryType = "eyeFix"]]
 	<</if>>
 	<<if getRightEyeVision($activeSlave) === 1 && getRightEyeType($activeSlave) === 1>>
 		<<set _n++>>
-		[[Fix right eye|Surgery Degradation][eyeSurgery($activeSlave, "right", "fix"), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 5, $surgeryType = "eyeFix"]]
+		| [[Fix right eye|Surgery Degradation][eyeSurgery($activeSlave, "right", "fix"), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 5, $surgeryType = "eyeFix"]]
 	<</if>>
 	<<if _n === 2>>
-		[[Fix both eyes|Surgery Degradation][eyeSurgery($activeSlave, "both", "fix"), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "eyeFix"]]
+		| [[Fix both eyes|Surgery Degradation][eyeSurgery($activeSlave, "both", "fix"), cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "eyeFix"]]
 	<</if>>
 <</if>>
 
+
 <<if ($seeExtreme == 1)>>
 	<<if $activeSlave.indentureRestrictions < 1>>
 		/* blind */
@@ -544,7 +548,7 @@ $He has
 
 <h3>Work on $his chest:</h3>
 
-<br>&nbsp;&nbsp;&nbsp;&nbsp;
+	&nbsp;&nbsp;&nbsp;&nbsp;
 	$His
 	<<if $activeSlave.boobs < 300>><<print either("androgynous", "flat")>> chest is barely there.
 	<<elseif $activeSlave.boobs < 400>><<print either("pointy", "tiny")>>, <<print $activeSlave.boobs>>cc chest only fill A-cups.
@@ -708,10 +712,11 @@ $He has
 <h3>Work on $his midriff:</h3>
 
 <<if $activeSlave.indentureRestrictions >= 2 && $activeSlave.weight > 30>>
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;
+	&nbsp;&nbsp;&nbsp;&nbsp;
 	//$His indenture forbids elective surgery//
+	<br> /* no line break needed after heading.  Since this section is optional, set up waist for formatting success */
 <<elseif $activeSlave.weight > 30>>
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;
+	&nbsp;&nbsp;&nbsp;&nbsp;
 	<<if $activeSlave.weight > 190>>
 		$He is extremely fat. [[Major liposuction|Surgery Degradation][$activeSlave.health -= 40, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = "liposuction"]]
 	<<elseif $activeSlave.weight > 130>>
@@ -722,9 +727,10 @@ $He has
 	<<if $surgeryUpgrade == 1>>
 		| [[Fat grafting|fat grafting workaround][$activeSlave.health -= 40, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)*2, $availabeFat = Math.round($activeSlave.weight/10), $boobFat = 0, $buttFat = 0, $surgeryType = "fat graft"]]
 	<</if>>
+	<br>
 <</if>>
 
-<br>&nbsp;&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp;&nbsp;
 $He has
 <<if $activeSlave.waist > 95>>a masculine
 <<elseif $activeSlave.waist > 40>>an ugly
@@ -896,7 +902,7 @@ $He's
 <br><br>
 
 <h3>Work on $his butt:</h3>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp;&nbsp;
 $He's got a
 <<if $activeSlave.butt <= 1>>flat and <<print either("skinny", "slim", "taut")>> ass.
 <<elseif $activeSlave.butt <= 2>><<print either("rounded, small", "small but rounded", "small, sleek")>> rear end.
@@ -944,70 +950,71 @@ $He's got a
 <h3>Work on $his sex:</h3>
 
 <<if $activeSlave.vagina > -1>>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;
-<<if $activeSlave.labia == 0>>
-	$He has minimal pussylips.
-<<elseif $activeSlave.labia == 1>>
-	$He has pretty, noticeable pussylips.
-<<elseif $activeSlave.labia == 2>>
-	$He has large pussylips.
-<<elseif $activeSlave.labia > 2>>
-	$He has extremely large pussylips.
-<</if>>
-<<if $activeSlave.labia > 0>>
-	<<if $activeSlave.indentureRestrictions < 2>>
-		[[Apply labiaplasty|Surgery Degradation][$activeSlave.labia = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "labiaplasty"]]
-	<</if>>
-<</if>>
-<<if ($activeSlave.labia < 3) && ($surgeryUpgrade == 1)>>
-	<<if $activeSlave.indentureRestrictions < 1>>
-		<<if $activeSlave.labia > 0>> | <</if>>
-		[[Increase labia|Surgery Degradation][$activeSlave.labia += 1,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "labiaplasty"]]
-	<</if>>
-<</if>>
-<<if $activeSlave.dick == 0>>
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	$He has
-	<<if $activeSlave.clit == 0>>
-		a small clit<<if ($seeCircumcision == 1) && $activeSlave.foreskin > 0>> with a hood<</if>>.
-	<<elseif $activeSlave.clit == 1>>
-		a big clit<<if ($seeCircumcision == 1) && $activeSlave.foreskin > 0>> with a hood<</if>>.
-	<<elseif $activeSlave.clit == 2>>
-		a huge clit<<if ($seeCircumcision == 1) && $activeSlave.foreskin > 0>> with a hood<</if>>.
-	<<elseif $activeSlave.clit > 2>>
-		an enormous clit<<if ($seeCircumcision == 1) && $activeSlave.foreskin > 0>> with a hood<</if>>.
-	<</if>>
-	<<if $activeSlave.clit > 0>>
+	&nbsp;&nbsp;&nbsp;&nbsp;
+	<<if $activeSlave.labia == 0>>
+		$He has minimal pussylips.
+	<<elseif $activeSlave.labia == 1>>
+		$He has pretty, noticeable pussylips.
+	<<elseif $activeSlave.labia == 2>>
+		$He has large pussylips.
+	<<elseif $activeSlave.labia > 2>>
+		$He has extremely large pussylips.
+	<</if>>
+	<<if $activeSlave.labia > 0>>
 		<<if $activeSlave.indentureRestrictions < 2>>
-			[[Apply clitoral reduction|Surgery Degradation][$activeSlave.clit = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "clitoral reduction"]]
+			[[Apply labiaplasty|Surgery Degradation][$activeSlave.labia = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "labiaplasty"]]
 		<</if>>
 	<</if>>
-	<<if ($activeSlave.clit < 3) && ($surgeryUpgrade == 1)>>
+	<<if ($activeSlave.labia < 3) && ($surgeryUpgrade == 1)>>
 		<<if $activeSlave.indentureRestrictions < 1>>
-			<<if $activeSlave.clit > 0>> | <</if>>
-			[[Increase clit|Surgery Degradation][$activeSlave.clit += 1,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "clitoral enlargement"]]
+			<<if $activeSlave.labia > 0>> | <</if>>
+			[[Increase labia|Surgery Degradation][$activeSlave.labia += 1,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "labiaplasty"]]
 		<</if>>
 	<</if>>
-	<<if ($activeSlave.foreskin > 0) && $activeSlave.clit > 0>>
-		<<if $seeCircumcision == 1>>
+	<<if $activeSlave.dick == 0>>
+		<br>&nbsp;&nbsp;&nbsp;&nbsp;
+		$He has
+		<<if $activeSlave.clit == 0>>
+			a small clit<<if ($seeCircumcision == 1) && $activeSlave.foreskin > 0>> with a hood<</if>>.
+		<<elseif $activeSlave.clit == 1>>
+			a big clit<<if ($seeCircumcision == 1) && $activeSlave.foreskin > 0>> with a hood<</if>>.
+		<<elseif $activeSlave.clit == 2>>
+			a huge clit<<if ($seeCircumcision == 1) && $activeSlave.foreskin > 0>> with a hood<</if>>.
+		<<elseif $activeSlave.clit > 2>>
+			an enormous clit<<if ($seeCircumcision == 1) && $activeSlave.foreskin > 0>> with a hood<</if>>.
+		<</if>>
+		<<if $activeSlave.clit > 0>>
 			<<if $activeSlave.indentureRestrictions < 2>>
-				| [[Remove clitoral hood|Surgery Degradation][$activeSlave.foreskin = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "circumcision"]]
+				[[Apply clitoral reduction|Surgery Degradation][$activeSlave.clit = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "clitoral reduction"]]
+			<</if>>
+		<</if>>
+		<<if ($activeSlave.clit < 3) && ($surgeryUpgrade == 1)>>
+			<<if $activeSlave.indentureRestrictions < 1>>
+				<<if $activeSlave.clit > 0>> | <</if>>
+				[[Increase clit|Surgery Degradation][$activeSlave.clit += 1,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "clitoral enlargement"]]
+			<</if>>
+		<</if>>
+		<<if ($activeSlave.foreskin > 0) && $activeSlave.clit > 0>>
+			<<if $seeCircumcision == 1>>
+				<<if $activeSlave.indentureRestrictions < 2>>
+					| [[Remove clitoral hood|Surgery Degradation][$activeSlave.foreskin = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "circumcision"]]
+				<</if>>
 			<</if>>
 		<</if>>
 	<</if>>
+	<br>
 <</if>>
-<</if>> /*closes vag check */
 
 /* TODO: add a check for slave's eggType */
 
 <<if ($activeSlave.preg > -2) && ($activeSlave.preg < 1) && ($activeSlave.ovaries != 0 || $activeSlave.mpreg != 0) && ($activeSlave.pubertyXX == 0)>>
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;
+	&nbsp;&nbsp;&nbsp;&nbsp;
 	$He has not had $his first period.
 <<elseif ($activeSlave.preg > -2) && ($activeSlave.preg < 1) && ($activeSlave.ovaries != 0 || $activeSlave.mpreg != 0)>>
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;
+	&nbsp;&nbsp;&nbsp;&nbsp;
 	$He has a working womb.
 <<elseif ($activeSlave.preg <= -2) && ($activeSlave.ovaries != 0 || $activeSlave.mpreg != 0)>>
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;
+	&nbsp;&nbsp;&nbsp;&nbsp;
 	$He has a sterile womb.
 <</if>>
 
@@ -1321,14 +1328,14 @@ $He has
 <br><br>
 
 <<if $geneticMappingUpgrade >= 1>>
-	Apply a retro-virus treatment:
+	<h2>Apply a retro-virus treatment:</h2>
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;
 	<<if ($activeSlave.indentureRestrictions >= 1)>>
 		//Modification at a genetic level clearly violates $his indenture contract//
 	<<elseif $activeSlave.health < 0>>
 		//$He's too unhealthy to undergo gene therapy//
 	<<else>>
-		Available treatments:
+		<h3>Available treatments:</h3>
 		<<if $arcologies[0].childhoodFertilityInducedNCSResearch == 1>>
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;
 			<<if $activeSlave.geneMods.NCS == 0>>
@@ -1522,7 +1529,7 @@ $He has
 	<br><br>
 <</if>>
 
-Deal with $his hair:
+<h3>Deal with $his hair:</h3>
 
 <<set _pubertyAge = Math.min($activeSlave.pubertyAgeXX, $activeSlave.pubertyAgeXY)>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;
@@ -1549,7 +1556,7 @@ Deal with $his hair:
 
 <br><br>
 
-Alter $his race:
+<h3>Alter $his race:</h3>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;
 <<if $activeSlave.indentureRestrictions < 1>>
 	$He is $activeSlave.race<<if $activeSlave.race != $activeSlave.origRace>>, but was originally $activeSlave.origRace<</if>>. Surgically alter $him to look more:
@@ -1854,6 +1861,7 @@ Alter $his race:
 
 
 <br>
+<h3>Perform more extreme surgery:</h3>
 <<if $seeExtreme == 1>>
 	<<if $activeSlave.fuckdoll == 0>>
 		<br>$He is a normal sex slave, not a living sex toy.
-- 
GitLab