From ed9eb4c66b8c88ef1f48547a1dccc69b757bcb4a Mon Sep 17 00:00:00 2001
From: hexall90 <hexall90@gmail.com>
Date: Sat, 14 Oct 2017 18:22:17 +0200
Subject: [PATCH] finished working

---
 src/pregmod/incubator.tw        | 134 ++++---
 src/pregmod/incubatorReport.tw  | 689 --------------------------------
 src/uncategorized/dispensary.tw |  19 +-
 3 files changed, 107 insertions(+), 735 deletions(-)
 delete mode 100644 src/pregmod/incubatorReport.tw

diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index f295156eb96..d7db4032ab9 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -223,11 +223,39 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
 <<if $incubatorSlaves > 0>>
 <<for $i = 0; $i < $incubatorSlaves; $i++>>
 	<<capture $i>>
+		<br><br>$tanks[$i].slaveName occupies this tank. She appears to be <<if $tanks[$i].genes == "XX">>a natural girl<<else>>a natural boy<</if>>, with $tanks[$i].hColor hair<<if $tanks[$i].eyes != -2>> and $tanks[$i].eyeColor eyes<<else>>. She most likely will be blind.<</if>>
+		Statistical projections indicates that once released she will be around <<print $tanks[$i].height + random(-10,10)>>. Most likely she will be
+			<<if $tanks[$i].weight <= 30 && $tanks[$i].weight >= -30>>
+				at a healthy weight and
+			<<elseif $tanks[$i].weight >= 31 && $tanks[$i].weight <= 95>>
+				quite overweight and
+			<<elseif $tanks[$i].weight >= 96>>
+				very overweight and
+			<<elseif $tanks[$i].weight <= -31 && $tanks[$i].weight >= -95>>
+				quite thin and
+			<<elseif  $tanks[$i].weight <= -96>>
+				very thin and
+			<</if>>
+			<<if $tanks[$i].muscles <= 5 && $tanks[$i].muscles >= -5>>
+				with a normal musculature.
+			<<elseif $tanks[$i].muscles >= 6 && $tanks[$i].muscles <= 30>>
+				quite toned.
+			<<elseif $tanks[$i].muscles >= 31 && $tanks[$i].muscles <= 95>>
+				quite muscular.
+			<<elseif $tanks[$i].muscles >= 96>>
+				with a powerful msuculature.
+			<<elseif $tanks[$i].muscles <= -6 && $tanks[$i].muscles >= -30>>
+				quite weak.
+			<<elseif $tanks[$i].muscles <= -31 && $tanks[$i].muscles >= 95>>
+				very weak.
+			<<elseif $tanks[$i].muscles <= -96>>
+				extremely weak.
+			<</if>>
 		<<if $tanks[$i].growTime <= 0>>
 			<<set $readySlaves = 1>>
-			<br><br>@@.pink;$tanks[$i].slaveName@@ is ready to be released from her tank.
+			<br>@@.pink;$tanks[$i].slaveName@@ is ready to be released from her tank.
 		<<else>>
-			<br><br>@@.pink;<<print $tanks[$i].slaveName>>'s@@ growth is currently being accelerated. She will be ready for release in about <<print Math.round($tanks[$i].growTime/$incubatorUpgradeSpeed)>> weeks.
+			<br>@@.pink;<<print $tanks[$i].slaveName>>'s@@ growth is currently being accelerated. She will be ready for release in about <<print Math.round($tanks[$i].growTime/$incubatorUpgradeSpeed)>> weeks.
 		<</if>>
 		<br>The tank is imprinting her with basic life and sexual skills, though she will still be very naive and inexperienced on release.
 		<<if $tanks[$i].origin == "Shortly after birth, she was sealed in an aging tank until she was of age. She knows only of the terror that awaits her should she not obey her master.">>
@@ -277,68 +305,84 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
 		<</if>>
 		<<if $incubatorUpgradeOrgans == 1>>
 			<br>
-			Her tank has been modified to allow fabricated organs to be implanted.
+			You can extract a sample and prepare in the organ fabricator a new organ for her to be implanted once she exits her tank.
+			<<set $newOrgan = 0>>
+			<<set $tankOrgans = {
+				ovaries: 0,
+				penis: 0,
+				testicles:0,
+				eyes: 0,
+				voiceBox: 0}>>
+			<<for _i = 0; _i < $organs.length; _i++>>
+				<<if $tanks[$i].ID == $organs[_i].ID>>
+					<<if $organs[_i].type == "ovaries">>
+						<<set $tankOrgans.ovaries = 1>>
+					<</if>>
+					<<if $organs[_i].type == "testicles">>
+						<<set $tankOrgans.testicles = 1>>
+					<</if>>
+					<<if $organs[_i].type == "penis">>
+						<<set $tankOrgans.penis = 1>>
+					<</if>>
+					<<if $organs[_i].type == "eyes">>
+						<<set $tankOrgans.eyes = 1>>
+					<</if>>
+					<<if $organs[_i].type == "voicebox">>
+						<<set $tankOrgans.voicebox = 1>>
+					<</if>>
+				<</if>>
+			<</for>>
+			<<if $tanks[$i].genes == "XX">>
+				Being a natural girl, she possesses a functional vagina and ovaries, you can:
+			<<else>>
+				Being a natural boy, he possesses a functional penis and balls, you can:
+			<</if>>
 			<br>
-			<<if $tanks[$i].ovaries == 0>>
-				<<link "Implant ovaries">>
+			<<if $tanks[$i].ovaries == 0 && $tankOrgans.ovaries != 1>>
+				<<link "Prepare ovaries">>
 					<<set $cash -= 10000>>
-					<<set $tanks[$i].ovaries = 1>>
+					<<set $newOrgan = {type: "ovaries", weeksToCompletion: "5", ID: 0}>>
+					<<set $newOrgan.ID = $tanks[$i].ID>>
+					<<set $organs.push($newOrgan)>>
 					<<goto "Incubator">>
 				<</link>>
 			<</if>>
-			<<if $tanks[$i].dick == 0>>
-				|
-				<<link "Implant penis">>
+			<<if $tanks[$i].dick == 0 && $tankOrgans.penis != 1>>
+				<<link "Prepare penis">>
 					<<set $cash -= 5000>>
-					<<set $tanks[$i].dick = 1>>
+					<<set $newOrgan = {type: "penis", weeksToCompletion: "5", ID: 0}>>
+					<<set $newOrgan.ID = $tanks[$i].ID>>
+					<<set $organs.push($newOrgan)>>
 					<<goto "Incubator">>
 				<</link>>
 			<</if>>
-			<<if $tanks[$i].balls == 0>>
+			<<if $tanks[$i].balls == 0 && $tankOrgans.testicles != 1>>
 				|
-				<<link "Implant testicles">>
+				<<link "Prepare testicles">>
 					<<set $cash -= 5000>>
-					<<set $tanks[$i].balls = 1>>
+					<<set $newOrgan = {type: "testicles", weeksToCompletion: "5", ID: 0}>>
+					<<set $newOrgan.ID = $tanks[$i].ID>>
+					<<set $organs.push($newOrgan)>>
 					<<goto "Incubator">>
 				<</link>>
 			<</if>>
-			<<if $tanks[$i].vagina == -1>>
-				|
-				<<link "Implant vagina">>
-					<<set $cash -= $2500>>
-					<<set $tanks[$i].vagina = 0>>
-					<<goto "Incubator">>
-				<</link>>
-			<</if>>
-			<<if $tanks[$i].foreskin == 0>>
-				|
-				<<link "Implant foreskin">>
-					<<set $cash -= 2500>>
-					<<set $tanks[$i].foreskin = 1>>
-					<<goto "Incubator">>
-				<</link>>
-			<</if>>
-			<<if $tanks[$i].eyes == -2>>
-				|
-				<<link "Implant eyes">>
+			<<if $tanks[$i].eyes == -2 && $tankOrgans.eyes != 1>>
+				<br>She appears to be blind: 
+				<<link "Prepare eyes">>
 					<<set $cash -= 10000>>
-					<<set $tanks[$i].eyes = 1>>
-					<<goto "Incubator">>
-				<</link>>
-			<</if>>
-			<<if $tanks[$i].voice == 0>>
-				|
-				<<link "Implant vocal cords">>
-					<<set $cash -= 5000>>
-					<<set $tanks[$i].voice = random(1,3)>>
+					<<set $newOrgan = {type: "eyes", weeksToCompletion: "5", ID: 0}>>
+					<<set $newOrgan.ID = $tanks[$i].ID>>
+					<<set $organs.push($newOrgan)>>
 					<<goto "Incubator">>
 				<</link>>
 			<</if>>
-			<<if $tanks[$i].prostate == 0>>
-				|
-				<<link "Implant prostate">>
+			<<if $tanks[$i].voice == 0 && $tankOrgans.voicebox != 1>>
+				<br>It appears she was born a mute: 
+				<<link "Prepare vocal cords">>
 					<<set $cash -= 5000>>
-					<<set $tanks[$i].prostate = 1>>
+					<<set $newOrgan = {type: "voicebox", weeksToCompletion: "5", ID: 0}>>
+					<<set $newOrgan.ID = $tanks[$i].ID>>
+					<<set $organs.push($newOrgan)>>
 					<<goto "Incubator">>
 				<</link>>
 			<</if>>
diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw
deleted file mode 100644
index 00134b731a7..00000000000
--- a/src/pregmod/incubatorReport.tw
+++ /dev/null
@@ -1,689 +0,0 @@
-:: Incubator Report [nobr]
-
-<<set $incubatorSlaves = 0>>
-
-<<for _inc = 0; _inc < $tanks.length; _inc++>>
-	<<set $tanks[_inc].birthWeek += 1>>
-	<<if $tanks[_inc].birthWeek >= 52>>
-		<<set $tanks[_inc].birthWeek = 0>>
-		<<if $seeAge == 1>>
-			<<set $tanks[_inc].actualAge++, $tanks[_inc].ovaryAge++>>
-		<</if>>
-	<</if>>
-	<<set $incubatorSlaves += 1>>
-	<<if $tanks[_inc].growTime > 0>>
-		<<set $tanks[_inc].growTime -= $incubatorUpgradeSpeed>>
-		<br>@@.pink;<<print $tanks[_inc].slaveName>>'s@@ growth is currently being accelerated. She <<if Math.round($tanks[_inc].growTime/$incubatorUpgradeSpeed) <= 0>>is @@.lime;ready for release.@@ She will be ejected from her tank upon your approach<<else>>will be ready for release in about <<print Math.round($tanks[_inc].growTime/$incubatorUpgradeSpeed)>> weeks<</if>>.
-	<<else>>
-		@@.pink;$tanks[_inc].slaveName@@ is @@.lime;ready for release.@@ She will be ejected from her tank upon your approach.
-	<</if>>
-
-	<<if $incubatorUpgradeWeight == 1>>
-		<br>
-		<<if $incubatorWeightSetting == 1>>
-			<<if $tanks[_inc].weight < 200>>
-				<<if $incubatorUpgradeSpeed == 52>>
-					<<set $tanks[_inc].weight += 70>>
-				<<elseif $incubatorUpgradeSpeed == 18>>
-					<<set $tanks[_inc].weight += 40>>
-				<<elseif $incubatorUpgradeSpeed == 9>>
-					<<set $tanks[_inc].weight += 20>>
-				<<elseif $incubatorUpgradeSpeed == 6>>
-					<<set $tanks[_inc].weight += 10>>
-				<<elseif $incubatorUpgradeSpeed == 5>>
-					<<set $tanks[_inc].weight += 5>>
-				<</if>>			
-			<</if>>
-			The weight monitoring systems are overloading her intake causing @@.red;rapid weight gain.@@
-		<<elseif $incubatorWeightSetting == 2>>
-			<<if $tanks[_inc].weight > 10>>
-				<<if $incubatorUpgradeSpeed == 52>>
-					<<set $tanks[_inc].weight -= 30>>
-				<<elseif $incubatorUpgradeSpeed == 18>>
-					<<set $tanks[_inc].weight -= 10>>
-				<<elseif $incubatorUpgradeSpeed == 9>>
-					<<set $tanks[_inc].weight -= 5>>
-				<<elseif $incubatorUpgradeSpeed == 6>>
-					<<set $tanks[_inc].weight -= 2>>
-				<<elseif $incubatorUpgradeSpeed == 5>>
-					<<set $tanks[_inc].weight -= 1>>
-				<</if>>			
-				The weight monitoring systems detect she is overweight and @@.green;decrease her caloric intake.@@
-			<<elseif $tanks[_inc].weight < -10>>
-				<<if $incubatorUpgradeSpeed == 52>>
-					<<set $tanks[_inc].weight += 30>>
-				<<elseif $incubatorUpgradeSpeed == 18>>
-					<<set $tanks[_inc].weight += 10>>
-				<<elseif $incubatorUpgradeSpeed == 9>>
-					<<set $tanks[_inc].weight += 5>>
-				<<elseif $incubatorUpgradeSpeed == 6>>
-					<<set $tanks[_inc].weight += 2>>
-				<<elseif $incubatorUpgradeSpeed == 5>>
-					<<set $tanks[_inc].weight += 1>>
-				<</if>>			
-				The weight monitoring systems detect she is underweight and @@.green;increase her caloric intake.@@
-			<<else>>
-				She is @@.lime;currently a healthy weight;@@ efforts will be made to maintain it.
-			<</if>>
-		<<elseif $incubatorWeightSetting == 0>>
-			<<if $tanks[_inc].weight > -100>>
-				Her developing body @@.red;quickly sheds its gained weight.@@
-				<<set $tanks[_inc].weight -= 40>>
-			<</if>>
-		<</if>>
-	<<else>>
-		<<if $tanks[_inc].weight > -100>>
-			Her developing body @@.red;quickly sheds its gained weight.@@
-			<<set $tanks[_inc].weight -= 40>>
-		<</if>>
-	<</if>>
-	
-	<<if $incubatorUpgradeMuscles == 1>>
-		<br>
-		<<if $incubatorMusclesSetting == 2>>
-			<<if $tanks[_inc].muscles < 100>>
-				<<if $incubatorUpgradeSpeed == 52>>
-					<<set $tanks[_inc].muscles += 70>>
-				<<elseif $incubatorUpgradeSpeed == 18>>
-					<<set $tanks[_inc].muscles += 40>>
-				<<elseif $incubatorUpgradeSpeed == 9>>
-					<<set $tanks[_inc].muscles += 20>>
-				<<elseif $incubatorUpgradeSpeed == 6>>
-					<<set $tanks[_inc].muscles += 10>>
-				<<elseif $incubatorUpgradeSpeed == 5>>
-					<<set $tanks[_inc].muscles += 5>>
-				<</if>>			
-			<</if>>
-			The strength monitoring systems are overloading her with steroids causing @@.green;rapid muscle development.@@
-		<<elseif $incubatorMusclesSetting == 1>>
-			<<if $tanks[_inc].muscles > 10>>
-				<<if $incubatorUpgradeSpeed == 52>>
-					<<set $tanks[_inc].muscles -= 30>>
-				<<elseif $incubatorUpgradeSpeed == 18>>
-					<<set $tanks[_inc].muscles -= 10>>
-				<<elseif $incubatorUpgradeSpeed == 9>>
-					<<set $tanks[_inc].muscles -= 5>>
-				<<elseif $incubatorUpgradeSpeed == 6>>
-					<<set $tanks[_inc].muscles -= 2>>
-				<<elseif $incubatorUpgradeSpeed == 5>>
-					<<set $tanks[_inc].muscles-->>
-				<</if>>			
-				The strength monitoring systems detect she is overly muscular and @@.green;decrease her steroid dosage.@@
-			<<elseif $tanks[_inc].muscles < -10>>
-				<<if $incubatorUpgradeSpeed == 52>>
-					<<set $tanks[_inc].muscles += 30>>
-				<<elseif $incubatorUpgradeSpeed == 18>>
-					<<set $tanks[_inc].muscles += 10>>
-				<<elseif $incubatorUpgradeSpeed == 9>>
-					<<set $tanks[_inc].muscles += 5>>
-				<<elseif $incubatorUpgradeSpeed == 6>>
-					<<set $tanks[_inc].muscles += 2>>
-				<<elseif $incubatorUpgradeSpeed == 5>>
-					<<set $tanks[_inc].muscles++>>
-				<</if>>			
-				The strength monitoring systems detect she is weak and @@.green;increase her steroid dosage.@@
-			<<else>>
-				She has @@.lime;a healthy musculature;@@ efforts will be made to maintain it.
-			<</if>>
-		<<elseif $incubatorMusclesSetting == 0>>
-			<<if $tanks[_inc].muscles > -100>>
-				Her developing body @@.red;quickly loses its gained muscle.@@
-				<<set $tanks[_inc].muscles -= 40>>
-			<</if>>
-		<</if>>
-	<<else>>
-		<<if $tanks[_inc].muscles > -100>>
-			Her developing body @@.red;quickly loses its gained muscle.@@
-			<<set $tanks[_inc].muscles -= 40>>
-		<</if>>
-	<</if>>
-
-	<<if $incubatorUpgradeGrowthStims == 1 && $incubatorGrowthStimsSetting != 0>>
-		<br>
-		<<set _heightLimit =  Math.clamp((Height.mean($tanks[_inc].height) * 1.25),0,274)>>
-		<<set _heightLimitAge = Height.forAge($tanks[_inc].height, $tanks[_inc])>>
-		<<if $tanks[_inc].height >= _heightLimit>>
-			The monitoring system detects her body is not able to support further increases in height, so it carefully regulates stimulant injections to @@.yellow;maintain her current stature.@@
-			<<set $tanks[_inc].height = _heightLimit>>
-		<<elseif $incubatorGrowthStimsSetting == 2>>
-			The monitoring system floods her body with growth stimulants, causing @@.green;a sharp increase in growth rate.@@
-			<<if $incubatorWeightSetting >= 1 && $incubatorMusclesSetting <= 1 && $incubatorReproductionSetting <= 1>>
-				<<if $incubatorUpgradeSpeed == 52>>
-					<<set $tanks[_inc].height += random(3,6)>>
-				<<elseif $incubatorUpgradeSpeed == 18>>
-					<<set $tanks[_inc].height += random(2,5)>>
-				<<elseif $incubatorUpgradeSpeed == 9>>
-					<<set $tanks[_inc].height += random(1,4)>>
-				<<elseif $incubatorUpgradeSpeed == 6>>
-					<<set $tanks[_inc].height += random(1,3)>>
-				<<elseif $incubatorUpgradeSpeed == 5>>
-					<<set $tanks[_inc].height += random(1,2)>>
-				<</if>>
-			<<else>>
-				<<if $incubatorUpgradeSpeed == 52>>
-					<<set $tanks[_inc].height += random(2,5)>>
-				<<elseif $incubatorUpgradeSpeed == 18>>
-					<<set $tanks[_inc].height += random(1,4)>>
-				<<elseif $incubatorUpgradeSpeed == 9>>
-					<<set $tanks[_inc].height += random(1,3)>>
-				<<elseif $incubatorUpgradeSpeed == 6>>
-					<<set $tanks[_inc].height += random(1,2)>>
-				<<elseif $incubatorUpgradeSpeed == 5>>
-					<<set $tanks[_inc].height += random(0,1)>>
-				<</if>>
-			<</if>>
-		<<elseif $incubatorGrowthStimsSetting == 1>>
-			<<if $tanks[_inc].height > _heightLimitAge>>
-				The monitoring system detects she is near the expected height, so it carefully regulates stimulants injections to @@.yellow;maintain her current stature.@@
-				<<if random(1,10) == 10>>
-					<<if $incubatorUpgradeSpeed == 52>>
-						<<set $tanks[_inc].height += random(1,4)>>
-					<<elseif $incubatorUpgradeSpeed == 18>>
-						<<set $tanks[_inc].height += random(1,3)>>
-					<<elseif $incubatorUpgradeSpeed == 9>>
-						<<set $tanks[_inc].height += random(1,2)>>
-					<<elseif $incubatorUpgradeSpeed == 6>>
-						<<set $tanks[_inc].height += random(0,1)>>
-					<<elseif $incubatorUpgradeSpeed == 5>>
-						<<set $tanks[_inc].height += random(0,1)>>
-					<</if>>
-				<</if>>
-			<<else>>
-				The monitoring system detects her body is capable of developing more rapidly and @@.green;increases her growth stimulant dosage.@@
-				<<if $incubatorUpgradeSpeed == 52>>
-					<<set $tanks[_inc].height += random(1,4)>>
-				<<elseif $incubatorUpgradeSpeed == 18>>
-					<<set $tanks[_inc].height += random(1,3)>>
-				<<elseif $incubatorUpgradeSpeed == 9>>
-					<<set $tanks[_inc].height += random(1,2)>>
-				<<elseif $incubatorUpgradeSpeed == 6>>
-					<<set $tanks[_inc].height += random(0,1)>>
-				<<elseif $incubatorUpgradeSpeed == 5>>
-					<<set $tanks[_inc].height += random(0,1)>>
-				<</if>>
-			<</if>>
-		<</if>>
-		<<set $tanks[_inc].height = Math.clamp($tanks[_inc].height, 0, _heightLimit)>>
-	<<else>>
-		<br>
-		With the growth stimulant injections offline, her body is left to develop naturally.
-	<</if>>
-	
-	<<if $incubatorUpgradeReproduction == 1>>
-		<br>
-		<<if $incubatorReproductionSetting == 2>>
-			Her developing body is being flooded with hormones.
-			<<if $incubatorWeightSetting == 1>>
-				Combined with the abundant food provided to her, her body grows rapidly.
-				<<if $tanks[_inc].ovaries == 1>>
-					<<set $tanks[_inc].pubertyXX = 1>>
-					<<if $seeHyperPreg == 1>>
-						<<set $tanks[_inc].pregType = random(25,45)>>
-					<<else>>
-						<<set $tanks[_inc].pregType = random(3,8)>>
-					<</if>>
-					<<if $incubatorUpgradeSpeed == 52>>
-						<<if $tanks[_inc].boobs < 8000>>
-							The excess estrogen-laced growth hormones @@.green;rapidly balloon her breasts.@@
-							<<set $tanks[_inc].boobs += 2000>>
-						<</if>>
-						<<if $tanks[_inc].hips < 2 && random(1,100) > 50>>
-							The excess estrogen-laced growth hormones @@.green;cause her hips to widen for childbirth.@@
-							<<set $tanks[_inc].hips += 2>>
-						<</if>>
-						<<if $tanks[_inc].butt < 12 && random(1,100) > 30>>
-							The excess estrogen-laced growth hormones @@.green;cause her rear to grow fatter.@@
-							<<set $tanks[_inc].butt += 4>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 18>>
-						<<if $tanks[_inc].boobs < 8000>>
-							The excess estrogen-laced growth hormones @@.green;rapidly balloon her breasts.@@
-							<<set $tanks[_inc].boobs += 500>>
-						<</if>>
-						<<if $tanks[_inc].hips < 2 && random(1,100) > 50>>
-							The excess estrogen-laced growth hormones @@.green;cause her hips to widen for childbirth.@@
-							<<set $tanks[_inc].hips++>>
-						<</if>>
-						<<if $tanks[_inc].butt < 12 && random(1,100) > 50>>
-							The excess estrogen-laced growth hormones @@.green;cause her rear to grow fatter.@@
-							<<set $tanks[_inc].butt += 3>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 9>>
-						<<if $tanks[_inc].boobs < 8000>>
-							The excess estrogen-laced growth hormones @@.green;rapidly balloon her breasts.@@
-							<<set $tanks[_inc].boobs += 200>>
-						<</if>>
-						<<if $tanks[_inc].hips < 2 && random(1,100) > 60>>
-							The excess estrogen-laced growth hormones @@.green;causes her hips to widen for childbirth.@@
-							<<set $tanks[_inc].hips++>>
-						<</if>>
-						<<if $tanks[_inc].butt < 12 && random(1,100) > 50>>
-							The excess estrogen-laced growth hormones @@.green;cause her rear grow fatter.@@
-							<<set $tanks[_inc].butt += 2>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 6>>
-						<<if $tanks[_inc].boobs < 8000>>
-							The excess estrogen-laced growth hormones @@.green;rapidly balloon her breasts.@@
-							<<set $tanks[_inc].boobs += 100>>
-						<</if>>
-						<<if $tanks[_inc].hips < 2 && random(1,100) > 70>>
-							The excess estrogen-laced growth hormones @@.green;cause her hips to widen for childbirth.@@
-							<<set $tanks[_inc].hips++>>
-						<</if>>
-						<<if $tanks[_inc].butt < 12 && random(1,100) > 60>>
-							The excess estrogen-laced growth hormones @@.green;cause her rear to grow fatter.@@
-							<<set $tanks[_inc].butt++>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 5>>
-						<<if $tanks[_inc].boobs < 8000>>
-							The excess estrogen-laced growth hormones @@.green;rapidly balloon her breasts.@@
-							<<set $tanks[_inc].boobs += 100>>
-						<</if>>
-						<<if $tanks[_inc].hips < 2 && random(1,100) > 80>>
-							The excess estrogen-laced growth hormones @@.green;cause her hips to widen for childbirth.@@
-							<<set $tanks[_inc].hips++>>
-						<</if>>
-						<<if $tanks[_inc].butt < 12 && random(1,100) > 70>>
-							The excess estrogen-laced growth hormones @@.green;cause her rear to grow fatter.@@
-							<<set $tanks[_inc].butt++>>
-						<</if>>
-					<</if>>
-				<</if>>
-				<<if $tanks[_inc].balls > 0>>
-					<<set $tanks[_inc].pubertyXY = 1>>
-					<<if $incubatorUpgradeSpeed == 52>>
-						<<if $tanks[_inc].balls < 40>>
-							The excess testosterone-laced growth hormones @@.green;cause her balls to balloon for extra cum production.@@
-							<<set $tanks[_inc].balls += 16>>
-						<</if>>
-						<<if $tanks[_inc].dick < 10 && random(1,100) > 20>>
-							The excess testosterone-laced growth hormones @@.green;cause her penis to swell.@@
-							<<set $tanks[_inc].dick += 4>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 18>>
-						<<if $tanks[_inc].balls < 40 && random(1,100) > 10>>
-							The excess testosterone-laced growth hormones @@.green;cause her balls to balloon for extra cum production.@@
-							<<set $tanks[_inc].balls += 9>>
-						<</if>>
-						<<if $tanks[_inc].dick < 10 && random(1,100) > 30>>
-							The excess testosterone-laced growth hormones @@.green;cause her penis to swell.@@
-							<<set $tanks[_inc].dick += 3>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 9>>
-						<<if $tanks[_inc].balls < 40 && random(1,100) > 20>>
-							The excess testosterone-laced growth hormones @@.green;cause her balls to balloon for extra cum production.@@
-							<<set $tanks[_inc].balls += 4>>
-						<</if>>
-						<<if $tanks[_inc].dick < 10 && random(1,100) > 50>>
-							The excess testosterone-laced growth hormones @@.green;cause her penis to swell.@@
-							<<set $tanks[_inc].dick += 2>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 6>>
-						<<if $tanks[_inc].balls < 40 && random(1,100) > 30>>
-							The excess testosterone-laced growth hormones @@.green;cause her balls to balloon for extra cum production.@@
-							<<set $tanks[_inc].balls += 2>>
-						<</if>>
-						<<if $tanks[_inc].dick < 10 && random(1,100) > 70>>
-							The excess testosterone-laced growth hormones @@.green;cause her penis to swell.@@
-							<<set $tanks[_inc].dick++>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 5>>
-						<<if $tanks[_inc].balls < 40 && random(1,100) > 30>>
-							The excess testosterone-laced growth hormones @@.green;cause her balls to balloon for extra cum production.@@
-							<<set $tanks[_inc].balls++>>
-						<</if>>
-						<<if $tanks[_inc].dick < 10 && random(1,100) > 80>>
-							The excess testosterone-laced growth hormones @@.green;cause her penis to swell.@@
-							<<set $tanks[_inc].dick++>>
-						<</if>>
-					<</if>>
-				<</if>>
-			<<elseif $incubatorWeightSetting == 1>>
-				Combined with the healthy food provided to her, her body grows readily.
-				<<if $tanks[_inc].ovaries == 1>>
-					<<set $tanks[_inc].pubertyXX = 1>>
-					<<if $seeHyperPreg == 1>>
-						<<set $tanks[_inc].pregType = random(15,25)>>
-					<<else>>
-						<<set $tanks[_inc].pregType = random(2,6)>>
-					<</if>>
-					<<if $incubatorUpgradeSpeed == 52>>
-						<<if $tanks[_inc].boobs < 4000>>
-							The excess estrogen-laced growth hormones @@.green;rapidly balloon her breasts.@@
-							<<set $tanks[_inc].boobs += 1000>>
-						<</if>>
-						<<if $tanks[_inc].hips < 2 && random(1,100) > 70>>
-							The excess estrogen-laced growth hormones @@.green;cause her hips to widen for childbirth.@@
-							<<set $tanks[_inc].hips++>>
-						<</if>>
-						<<if $tanks[_inc].butt < 8 && random(1,100) > 50>>
-							The excess estrogen-laced growth hormones @@.green;cause her rear to grow fatter.@@
-							<<set $tanks[_inc].butt += 3>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 18>>
-						<<if $tanks[_inc].boobs < 4000>>
-							The excess estrogen-laced growth hormones @@.green;rapidly balloon her breasts.@@
-							<<set $tanks[_inc].boobs += 500>>
-						<</if>>
-						<<if $tanks[_inc].hips < 2 && random(1,100) > 80>>
-							The excess estrogen-laced growth hormones @@.green;cause her hips to widen for childbirth.@@
-							<<set $tanks[_inc].hips++>>
-						<</if>>
-						<<if $tanks[_inc].butt < 8 && random(1,100) > 50>>
-							The excess estrogen-laced growth hormones @@.green;cause her rear to grow fatter.@@
-							<<set $tanks[_inc].butt++>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 9>>
-						<<if $tanks[_inc].boobs < 4000>>
-							The excess estrogen-laced growth hormones @@.green;rapidly balloon her breasts.@@
-							<<set $tanks[_inc].boobs += 200>>
-						<</if>>
-						<<if $tanks[_inc].hips < 2 && random(1,100) > 90>>
-							The excess estrogen-laced growth hormones @@.green;cause her hips to widen for childbirth.@@
-							<<set $tanks[_inc].hips++>>
-						<</if>>
-						<<if $tanks[_inc].butt < 8 && random(1,100) > 60>>
-							The excess estrogen-laced growth hormones @@.green;cause her rear to grow fatter.@@
-							<<set $tanks[_inc].butt++>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 6>>
-						<<if $tanks[_inc].boobs < 4000>>
-							The excess estrogen-laced growth hormones @@.green;rapidly balloon her breasts.@@
-							<<set $tanks[_inc].boobs += 100>>
-						<</if>>
-						<<if $tanks[_inc].hips < 2 && random(1,100) > 95>>
-							The excess estrogen-laced growth hormones @@.green;cause her hips to widen for childbirth.@@
-							<<set $tanks[_inc].hips++>>
-						<</if>>
-						<<if $tanks[_inc].butt < 8 && random(1,100) > 70>>
-							The excess estrogen-laced growth hormones @@.green;cause her rear to grow fatter.@@
-							<<set $tanks[_inc].butt++>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 5>>
-						<<if $tanks[_inc].boobs < 4000>>
-							The excess estrogen-laced growth hormones @@.green;rapidly balloon her breasts.@@
-							<<set $tanks[_inc].boobs += 100>>
-						<</if>>
-						<<if $tanks[_inc].hips < 2 && random(1,100) > 95>>
-							The excess estrogen-laced growth hormones @@.green;cause her hips to widen for childbirth.@@
-							<<set $tanks[_inc].hips++>>
-						<</if>>
-						<<if $tanks[_inc].butt < 8 && random(1,100) > 80>>
-							The excess estrogen-laced growth hormones @@.green;cause her rear to grow fatter.@@
-							<<set $tanks[_inc].butt++>>
-						<</if>>
-					<</if>>
-				<</if>>
-				<<if $tanks[_inc].balls > 0>>
-					<<set $tanks[_inc].pubertyXY = 1>>
-					<<if $incubatorUpgradeSpeed == 52>>
-						<<if $tanks[_inc].balls < 10>>
-							The excess testosterone-laced growth hormones @@.green;cause her balls to balloon for extra cum production.@@
-							<<set $tanks[_inc].balls += 3>>
-						<</if>>
-						<<if $tanks[_inc].dick < 7 && random(1,100) > 20>>
-							The excess testosterone-laced growth hormones @@.green;cause her penis to swell.@@
-							<<set $tanks[_inc].dick += 2>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 18>>
-						<<if $tanks[_inc].balls < 10 && random(1,100) > 10>>
-							The excess testosterone-laced growth hormones @@.green;cause her balls to balloon for extra cum production.@@
-							<<set $tanks[_inc].balls += 2>>
-						<</if>>
-						<<if $tanks[_inc].dick < 7 && random(1,100) > 30>>
-							The excess testosterone-laced growth hormones @@.green;cause her penis to swell.@@
-							<<set $tanks[_inc].dick++>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 9>>
-						<<if $tanks[_inc].balls < 10 && random(1,100) > 20>>
-							The excess testosterone-laced growth hormones @@.green;cause her balls to balloon for extra cum production.@@
-							<<set $tanks[_inc].balls++>>
-						<</if>>
-						<<if $tanks[_inc].dick < 7 && random(1,100) > 50>>
-							The excess testosterone-laced growth hormones @@.green;cause her penis to swell.@@
-							<<set $tanks[_inc].dick++>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 6>>
-						<<if $tanks[_inc].balls < 10 && random(1,100) > 30>>
-							The excess testosterone-laced growth hormones @@.green;cause her balls to balloon for extra cum production.@@
-							<<set $tanks[_inc].balls++>>
-						<</if>>
-						<<if $tanks[_inc].dick < 7 && random(1,100) > 70>>
-							The excess testosterone-laced growth hormones @@.green;cause her penis to swell.@@
-							<<set $tanks[_inc].dick++>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 5>>
-						<<if $tanks[_inc].balls < 10 && random(1,100) > 30>>
-							The excess testosterone-laced growth hormones @@.green;cause her balls to balloon for extra cum production.@@
-							<<set $tanks[_inc].balls++>>
-						<</if>>
-						<<if $tanks[_inc].dick < 7 && random(1,100) > 80>>
-							The excess testosterone-laced growth hormones @@.green;cause her penis to swell.@@
-							<<set $tanks[_inc].dick++>>
-						<</if>>
-					<</if>>
-				<</if>>
-			<<else>>
-				Since her body has little to work with, her growth is fairly minor.
-				<<if $tanks[_inc].ovaries == 1>>
-					<<set $tanks[_inc].pubertyXX = 1>>
-					<<if $seeHyperPreg == 1>>
-						<<set $tanks[_inc].pregType = random(10,15)>>
-					<<else>>
-						<<set $tanks[_inc].pregType = random(2,4)>>
-					<</if>>
-					<<if $incubatorUpgradeSpeed == 52>>
-						<<if $tanks[_inc].boobs < 2000>>
-							The excess estrogen-laced growth hormones @@.green;rapidly balloon her breasts.@@
-							<<set $tanks[_inc].boobs += 700>>
-						<</if>>
-						<<if $tanks[_inc].hips < 2 && random(1,100) > 90>>
-							The excess estrogen-laced growth hormones @@.green;cause her hips to widen for childbirth.@@
-							<<set $tanks[_inc].hips += 2>>
-						<</if>>
-						<<if $tanks[_inc].butt < 6 && random(1,100) > 70>>
-							The excess estrogen-laced growth hormones @@.green;cause her rear to grow fatter.@@
-							<<set $tanks[_inc].butt += 2>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 18>>
-						<<if $tanks[_inc].boobs < 2000>>
-							The excess estrogen-laced growth hormones @@.green;rapidly balloon her breasts.@@
-							<<set $tanks[_inc].boobs += 200>>
-						<</if>>
-						<<if $tanks[_inc].hips < 2 && random(1,100) > 80>>
-							The excess estrogen-laced growth hormones @@.green;cause her hips to widen for childbirth.@@
-							<<set $tanks[_inc].hips++>>
-						<</if>>
-						<<if $tanks[_inc].butt < 6 && random(1,100) > 70>>
-							The excess estrogen-laced growth hormones @@.green;cause her rear to grow fatter.@@
-							<<set $tanks[_inc].butt++>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 9>>
-						<<if $tanks[_inc].boobs < 2000>>
-							The excess estrogen-laced growth hormones @@.green;rapidly balloon her breasts.@@
-							<<set $tanks[_inc].boobs += 50>>
-						<</if>>
-						<<if $tanks[_inc].hips < 2 && random(1,100) > 80>>
-							The excess estrogen-laced growth hormones @@.green;cause her hips to widen for childbirth.@@
-							<<set $tanks[_inc].hips++>>
-						<</if>>
-						<<if $tanks[_inc].butt < 6 && random(1,100) > 90>>
-							The excess estrogen-laced growth hormones @@.green;cause her rear to grow fatter.@@
-							<<set $tanks[_inc].butt++>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 6>>
-						<<if $tanks[_inc].boobs < 2000>>
-							The excess estrogen-laced growth hormones @@.green;rapidly grow her breasts.@@
-							<<set $tanks[_inc].boobs += 20>>
-						<</if>>
-						<<if $tanks[_inc].hips < 2 && random(1,100) > 90>>
-							The excess estrogen-laced growth hormones @@.green;cause her hips to widen for childbirth.@@
-							<<set $tanks[_inc].hips++>>
-						<</if>>
-						<<if $tanks[_inc].butt < 6 && random(1,100) > 90>>
-							The excess estrogen-laced growth hormones @@.green;cause her rear to grow fatter.@@
-							<<set $tanks[_inc].butt++>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 5>>
-						<<if $tanks[_inc].boobs < 2000>>
-							The excess estrogen-laced growth hormones @@.green;rapidly grow her breasts.@@
-							<<set $tanks[_inc].boobs += 10>>
-						<</if>>
-						<<if $tanks[_inc].hips < 2 && random(1,100) > 95>>
-							The excess estrogen-laced growth hormones @@.green;cause her hips to widen for childbirth.@@
-							<<set $tanks[_inc].hips++>>
-						<</if>>
-						<<if $tanks[_inc].butt < 6 && random(1,100) > 90>>
-							The excess estrogen-laced growth hormones @@.green;cause her rear to grow fatter.@@
-							<<set $tanks[_inc].butt++>>
-						<</if>>
-					<</if>>
-				<</if>>
-				<<if $tanks[_inc].balls > 0>>
-					<<set $tanks[_inc].pubertyXY = 1>>
-					<<if $incubatorUpgradeSpeed == 52>>
-						<<if $tanks[_inc].balls < 6>>
-							The excess testosterone-laced growth hormones @@.green;cause her balls to grow for extra cum production.@@
-							<<set $tanks[_inc].balls += 2>>
-						<</if>>
-						<<if $tanks[_inc].dick < 4 && random(1,100) > 60>>
-							The excess testosterone-laced growth hormones @@.green;cause her penis to swell.@@
-							<<set $tanks[_inc].dick++>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 18>>
-						<<if $tanks[_inc].balls < 6 && random(1,100) > 50>>
-							The excess testosterone-laced growth hormones @@.green;cause her balls to grow for extra cum production.@@
-							<<set $tanks[_inc].balls++>>
-						<</if>>
-						<<if $tanks[_inc].dick < 4 && random(1,100) > 60>>
-							The excess testosterone-laced growth hormones @@.green;cause her penis to swell.@@
-							<<set $tanks[_inc].dick++>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 9>>
-						<<if $tanks[_inc].balls < 6 && random(1,100) > 60>>
-							The excess testosterone-laced growth hormones @@.green;cause her balls to balloon for extra cum production.@@
-							<<set $tanks[_inc].balls++>>
-						<</if>>
-						<<if $tanks[_inc].dick < 4 && random(1,100) > 70>>
-							The excess testosterone-laced growth hormones @@.green;cause her penis to swell.@@
-							<<set $tanks[_inc].dick += 2>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 6>>
-						<<if $tanks[_inc].balls < 6 && random(1,100) > 70>>
-							The excess testosterone-laced growth hormones @@.green;cause her balls to grow for extra cum production.@@
-							<<set $tanks[_inc].balls++>>
-						<</if>>
-						<<if $tanks[_inc].dick < 4 && random(1,100) > 80>>
-							The excess testosterone-laced growth hormones @@.green;cause her penis to swell.@@
-							<<set $tanks[_inc].dick++>>
-						<</if>>
-					<<elseif $incubatorUpgradeSpeed == 5>>
-						<<if $tanks[_inc].balls < 6 && random(1,100) > 80>>
-							The excess testosterone-laced growth hormones @@.green;cause her balls to grow for extra cum production.@@
-							<<set $tanks[_inc].balls++>>
-						<</if>>
-						<<if $tanks[_inc].dick < 4 && random(1,100) > 90>>
-							The excess testosterone-laced growth hormones @@.green;cause her penis to swell.@@
-							<<set $tanks[_inc].dick++>>
-						<</if>>
-					<</if>>
-				<</if>>
-			<</if>>
-		<<elseif $incubatorReproductionSetting == 1>>
-			Her hormone levels are being carefully managed, @@.green;encouraging early puberty.@@
-			<<if $tanks[_inc].ovaries == 1>>
-				<<set $tanks[_inc].pubertyXX = 1>>
-				<<if $tanks[_inc].boobs < 400 && random(1,100) > 60>>
-					The added estrogen @@.green;causes her breasts to swell.@@
-					<<set $tanks[_inc].boobs += 50>>
-				<</if>>
-				<<if $tanks[_inc].hips < 2 && random(1,100) > 90>>
-					The added estrogen @@.green;causes her hips to widen.@@
-					<<set $tanks[_inc].hips++>>
-				<</if>>
-				<<if $tanks[_inc].butt < 5 && random(1,100) > 80>>
-					The added estrogen @@.green;causes her butt to grow.@@
-					<<set $tanks[_inc].butt++>>
-				<</if>>
-			<</if>>
-			<<if $tanks[_inc].balls > 0>>
-				<<set $tanks[_inc].pubertyXY = 1>>
-				<<if $tanks[_inc].balls < 3 && random(1,100) > 80>>
-					The added testosterone @@.green;causes her balls to swell.@@
-					<<set $tanks[_inc].balls++>>
-				<</if>>
-				<<if $tanks[_inc].dick < 3 && random(1,100) > 60>>
-					The added testosterone @@.green;causes her penis to grow.@@
-					<<set $tanks[_inc].dick++>>
-				<</if>>
-			<</if>>
-		<<else>>
-			<<if $tanks[_inc].balls > 0>>
-				<<if $tanks[_inc].balls > 1>>
-					<<set $tanks[_inc].balls -= 5>>
-				<</if>>
-				<<if $tanks[_inc].dick > 1>>
-					<<set $tanks[_inc].dick -= 5>>
-				<</if>>
-				<<if $tanks[_inc].balls <= 0>>
-					<<set $tanks[_inc].balls = 1>>
-				<</if>>
-				<<if $tanks[_inc].dick <= 0>>
-					<<set $tanks[_inc].dick = 1>>
-				<</if>>
-			<</if>>
-			<<if $tanks[_inc].boobs > 0>>
-				<<set $tanks[_inc].boobs -= 500>>
-			<</if>>
-			<<if $tanks[_inc].butt > 0>>
-				<<set $tanks[_inc].butt -= 4>>
-			<</if>>
-		<</if>>
-	<<else>>
-		<<if $tanks[_inc].balls > 0>>
-			<<if $tanks[_inc].balls > 1>>
-				<<set $tanks[_inc].balls -= 5>>
-			<</if>>
-			<<if $tanks[_inc].dick > 1>>
-				<<set $tanks[_inc].dick -= 5>>
-			<</if>>
-			<<if $tanks[_inc].balls <= 0>>
-				<<set $tanks[_inc].balls = 1>>
-			<</if>>
-			<<if $tanks[_inc].dick <= 0>>
-				<<set $tanks[_inc].dick = 1>>
-			<</if>>
-		<</if>>
-		<<if $tanks[_inc].boobs > 0>>
-			<<set $tanks[_inc].boobs -= 500>>
-		<</if>>
-		<<if $tanks[_inc].butt > 0>>
-			<<set $tanks[_inc].butt -= 4>>
-		<</if>>
-	<</if>>
-
-	<<if $incubatorReproductionSetting == 2>>
-		<<set $tanks[_inc].energy = 80, $tanks[_inc].need = 100>>
-	<<elseif $incubatorReproductionSetting == 1>>
-		<<set $tanks[_inc].energy = 50, $tanks[_inc].need = 20>>
-	<<else>>
-		<<set $tanks[_inc].energy = 0, $tanks[_inc].need = 0>>
-	<</if>>
-	
-	<<set $tanks[_inc].weight = Math.clamp($tanks[_inc].weight, -100, 200)>>
-	<<set $tanks[_inc].muscles = Math.clamp($tanks[_inc].muscles, -100, 100)>>
-	<<set $tanks[_inc].dick = Math.clamp($tanks[_inc].dick, 0, 10)>>
-	<<set $tanks[_inc].hips = Math.clamp($tanks[_inc].hips, -2, 2)>>
-	<<set $tanks[_inc].balls = Math.clamp($tanks[_inc].balls, 0, 40)>>
-	<<set $tanks[_inc].boobs = Math.clamp($tanks[_inc].boobs, 0, 30000)>>
-	<<set $tanks[_inc].height = Math.clamp($tanks[_inc].height, 0, 274)>>
-	
-<br>
-<</for>>
-/*
-<<if $incubatorSlaves == 0>>
-$incubatorNameCaps is currently unused.
-<</if>>
-*/
-
-<br><br>
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index 83ef65a2153..21649a0fa96 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -85,8 +85,25 @@ It is currently working on the following organs:
 				<<break>>
 			<</if>>
 		<</for>>
+		<<for $j = 0; $j < $incubatorSlaves; $j++>>
+			<<if $tanks[$j].ID == $organs[$i].ID>>
+				<br>
+				$tanks[$j].slaveName's $organs[$i].type,
+				<<if $organs[$i].weeksToCompletion <= 0>>
+					ready to be implanted as soon as she exits the incubator.
+				<<else>>
+					<<if $organFarmUpgrade == 1>>
+						<<print $organs[$i].weeksToCompletion>>
+					<<elseif $organFarmUpgrade == 2>>
+						<<print Math.ceil($organs[$i].weeksToCompletion/2)>>
+					<<elseif $organFarmUpgrade == 3>>
+						<<print Math.ceil($organs[$i].weeksToCompletion/4)>>
+					<</if>> weeks from completion.
+				<</if>>
+				<<break>>
+			<</if>>
+		<</for>>
 	<</for>>
-	<br>
 <</if>>
 
 <br>
-- 
GitLab