diff --git a/src/gui/css/mainStyleSheet.tw b/src/gui/css/mainStyleSheet.tw
index 8faafdb51d0324856419c2b9293a8a72d5e1d862..20cbec7404a96db69e98d2d41da3b29610468bb8 100644
--- a/src/gui/css/mainStyleSheet.tw
+++ b/src/gui/css/mainStyleSheet.tw
@@ -72,6 +72,7 @@ object {
/* Colors are made as css classes, to allow them to be
changed for a light color scheme (for example). */
+.#68D { color: #68D } /* link color */
.aquamarine { color: aquamarine }
.coral { color: coral }
.cyan { color: cyan }
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index ea263f494ed75dfd9ee0c156a2801190bdef3439..c7aad52d7efb90b0e13c34956d01ee71851fd7e9 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -8,7 +8,7 @@
<</if>>
<<set $readySlaves = 0, $readySlave = 0, $incubatorSlaves = 0, _TL = $tanks.length, _SL = $slaves.length, _eligibility = 0>>
-<<for _i = 0; _i < _TL; _i++>>
+<<for _u = 0; _u < _TL; _u++>>
<<set $incubatorSlaves += 1>>
<</for>>
@@ -31,31 +31,31 @@ $incubatorNameCaps is a clean, cold hall designed to be lined with tanks and the
<br><br>
Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $incubator tanks, <<print $incubator-$incubatorSlaves>> are available. Of those, $reservedChildren tanks are reserved.
-<<for _i = 0; _i < _SL; _i++>>
- <<if $slaves[_i].pregType < 50 && $slaves[_i].preg > 3 && $slaves[_i].eggType == "human">>
- <<if $slaves[_i].assignment == "work in the dairy" && $dairyPregSetting > 0>>
+<<for _u = 0; _u < _SL; _u++>>
+ <<if $slaves[_u].pregType < 50 && $slaves[_u].preg > 3 && $slaves[_u].eggType == "human">>
+ <<if $slaves[_u].assignment == "work in the dairy" && $dairyPregSetting > 0>>
<<else>>
- <<if $slaves[_i].reservedChildren > 0>>
+ <<if $slaves[_u].reservedChildren > 0>>
<br>
- $slaves[_i].reservedChildren of ''@@.pink;$slaves[_i].slaveName's@@'' children will be placed in $incubatorName.
- <<if ($slaves[_i].reservedChildren < $slaves[_i].pregType) && ($reservedChildren < ($incubator-$incubatorSlaves))>>
+ $slaves[_u].reservedChildren of ''<<print "[[$slaves[" + _u + "].slaveName|Long Slave Description][$activeSlave = $slaves[" + _u + "], $nextLink = passage(), $eventDescription = 1]]">>@@color:#68D;'s@@'' children will be placed in $incubatorName.
+ <<if ($slaves[_u].reservedChildren < $slaves[_u].pregType) && ($reservedChildren < ($incubator-$incubatorSlaves))>>
<br>
- <<print "[[Keep another child|Incubator][$slaves[" + _i + "].reservedChildren += 1, $reservedChildren += 1]]">>
- <<if $slaves[_i].reservedChildren > 0>>
- | <<print "[[Keep one less child|Incubator][$slaves[" + _i + "].reservedChildren -= 1, $reservedChildren -= 1]]">>
+ <<print "[[Keep another child|Incubator][$slaves[" + _u + "].reservedChildren += 1, $reservedChildren += 1]]">>
+ <<if $slaves[_u].reservedChildren > 0>>
+ | <<print "[[Keep one less child|Incubator][$slaves[" + _u + "].reservedChildren -= 1, $reservedChildren -= 1]]">>
<</if>>
- <<elseif ($slaves[_i].reservedChildren == $slaves[_i].pregType) || ($reservedChildren == ($incubator-$tanks.length))>>
+ <<elseif ($slaves[_u].reservedChildren == $slaves[_u].pregType) || ($reservedChildren == ($incubator-$tanks.length))>>
<br>
- <<print "[[Keep one less child|Incubator][$slaves[" + _i + "].reservedChildren -= 1, $reservedChildren -= 1]]">>
+ <<print "[[Keep one less child|Incubator][$slaves[" + _u + "].reservedChildren -= 1, $reservedChildren -= 1]]">>
<</if>>
<<elseif $reservedChildren < ($incubator-$incubatorSlaves)>>
<br>
- ''@@.pink;$slaves[_i].slaveName@@'' is pregnant and you have an available aging tank.
+ ''<<print "[[$slaves[" + _u + "].slaveName|Long Slave Description][$activeSlave = $slaves[" + _u + "], $nextLink = passage(), $eventDescription = 1]]">>'' is pregnant and you have an available aging tank.
<br>
- <<print "[[Keep a child|Incubator][$slaves[" + _i + "].reservedChildren += 1, $reservedChildren += 1]]">>
+ <<print "[[Keep a child|Incubator][$slaves[" + _u + "].reservedChildren += 1, $reservedChildren += 1]]">>
<<elseif $reservedChildren == ($incubator-$incubatorSlaves)>>
<br>
- You have no room for ''@@.pink;$slaves[_i].slaveName's@@'' offspring.
+ You have no room for ''<<print "[[$slaves[" + _u + "].slaveName|Long Slave Description][$activeSlave = $slaves[" + _u + "], $nextLink = passage(), $eventDescription = 1]]">>@@color:#68D;'s@@'' offspring.
<</if>>
<<set _eligibility = 1>>
<</if>>
@@ -75,9 +75,9 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $
<<if $reservedChildren != 0>> /* the oops I made it go negative somehow button */
<br>
<<link "Clear all reserved children">>
- <<for _i = 0; _i < _SL; _i++>>
- <<if $slaves[_i].reservedChildren != 0>>
- <<set $slaves[_i].reservedChildren = 0>>
+ <<for _u = 0; _u < _SL; _u++>>
+ <<if $slaves[_u].reservedChildren != 0>>
+ <<set $slaves[_u].reservedChildren = 0>>
<</if>>
<</for>>
<<set $reservedChildren = 0>>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 66d07d4118bbd6b54d3419d147262e403677f108..bae861ef8d394d9b0d75f684b2f420bf775b3bda 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -290,50 +290,6 @@ The level of sexual energy in the suite is
<</if>>
<</if>>
-<<if $verboseDescriptions == 1>>
- <br> She <<include "SA please you">>
- <br>
- <<if $slaves[_i].choosesOwnClothes == 1>>
- <<include "SA chooses own clothes">>
- <<if ($slaves[_i].devotion <= 20)>>
- <<set $slaves[_i].devotion -= 5>>
- <<else>>
- <<set $slaves[_i].devotion++>>
- <</if>>
- <</if>>
- <<include "SA diet">>
- <<include "SA long term effects">>
- <<include "SA drugs">>
- <<include "SA relationships">>
- <<include "SA rivalries">>
- <br><<include "SA devotion">>
-<<else>>
- <<silently>>
- <<include "SA please you">>
- <<if $slaves[_i].choosesOwnClothes == 1>>
- <<include "SA chooses own clothes">>
- <<if ($slaves[_i].devotion <= 20)>>
- <<set $slaves[_i].devotion -= 5>>
- <<else>>
- <<set $slaves[_i].devotion++>>
- <</if>>
- <</if>>
- <<include "SA diet">>
- <<include "SA long term effects">>
- <<include "SA drugs">>
- <<include "SA relationships">>
- <<include "SA rivalries">>
- <<include "SA devotion">>
- <</silently>>
-<</if>>
-<<if $slaves[_i].health < 80>>
- <<if $masterSuiteUpgradeLuxury == 1>>
- <<set $slaves[_i].health += 20>>
- <<else>>
- <<set $slaves[_i].health += 10>>
- <</if>>
-<</if>>
-
<<if $masterSuiteUpgradePregnancy == 1>>
/* If they're not on fertility drugs and the toggle is active, stick them on (if they can take them). Otherwise take them off. */
<<if $slaves[_i].assignment == "serve in the master suite" || $slaves[_i].assignment == "be your Concubine">>
@@ -380,6 +336,50 @@ The level of sexual energy in the suite is
<</if>>
<</if>>
+<<if $verboseDescriptions == 1>>
+ <br> She <<include "SA please you">>
+ <br>
+ <<if $slaves[_i].choosesOwnClothes == 1>>
+ <<include "SA chooses own clothes">>
+ <<if ($slaves[_i].devotion <= 20)>>
+ <<set $slaves[_i].devotion -= 5>>
+ <<else>>
+ <<set $slaves[_i].devotion++>>
+ <</if>>
+ <</if>>
+ <<include "SA diet">>
+ <<include "SA long term effects">>
+ <<include "SA drugs">>
+ <<include "SA relationships">>
+ <<include "SA rivalries">>
+ <br><<include "SA devotion">>
+<<else>>
+ <<silently>>
+ <<include "SA please you">>
+ <<if $slaves[_i].choosesOwnClothes == 1>>
+ <<include "SA chooses own clothes">>
+ <<if ($slaves[_i].devotion <= 20)>>
+ <<set $slaves[_i].devotion -= 5>>
+ <<else>>
+ <<set $slaves[_i].devotion++>>
+ <</if>>
+ <</if>>
+ <<include "SA diet">>
+ <<include "SA long term effects">>
+ <<include "SA drugs">>
+ <<include "SA relationships">>
+ <<include "SA rivalries">>
+ <<include "SA devotion">>
+ <</silently>>
+<</if>>
+<<if $slaves[_i].health < 80>>
+ <<if $masterSuiteUpgradeLuxury == 1>>
+ <<set $slaves[_i].health += 20>>
+ <<else>>
+ <<set $slaves[_i].health += 10>>
+ <</if>>
+<</if>>
+
<</for>>
<<if $Concubine>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 03fad67c1e39dfb96bc5d8bc3f7e9d675174617a..6ce2fae5fad7720abfb10cb9c24c9e319bf4015b 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -566,7 +566,9 @@ $pronounCap has
<<if $activeSlave.vagina == -1>>
[[Convert genitalia to female|Surgery Degradation][$activeSlave.dick = 0,$activeSlave.dickAccessory = "none",$activeSlave.foreskin = 0,$activeSlave.scrotum = 0,$activeSlave.balls = 0,$activeSlave.vagina = 0,$activeSlave.preg = -2,$activeSlave.vaginalSkill = 0,$cash -= $surgeryCost, $activeSlave.health -= 40, $surgeryType = "mtf"]] |
<</if>>
+ <<if $activeSlave.dick > 0>>
[[Remove penis|Surgery Degradation][$activeSlave.dick = 0,$activeSlave.dickAccessory = "none",$activeSlave.foreskin = 0,$activeSlave.scrotum = 0,$activeSlave.balls = 0,$activeSlave.vaginalSkill = 0,$cash -= $surgeryCost, $activeSlave.health -= 20, $surgeryType = "chop"]]
+ <</if>>
<</if>>
<<if ($activeSlave.dick != 0) && ($activeSlave.vagina == -1) && ($surgeryUpgrade == 1)>>
<<if $activeSlave.indentureRestrictions < 1>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index d32bb90bd21f66dcdb1a40f07469779943686b20..be69376b9235f193ee1857afe03ac3c7cbe31b2f 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -3275,7 +3275,7 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
<<if $slaves[$i].induce == 1>>
Her child<<if $slaves[$i].pregType > 1>>ren visibly shift<<else>> visibly shifts<</if>> within her womb as they prepare to enter the world. She experiences several contractions, but not enough to deter her from her work.
<<elseif $slaves[$i].pregControl == "labor supressors">>
- Her child<<if $slaves[$i].pregType > 1>>ren<</if>> are oddly calm; it is unlikely she will give birth soon, despite being overdue.
+ Her child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> oddly calm; it is unlikely she will give birth soon, despite being overdue.
<<elseif $slaves[$i].preg > 34 && $slaves[$i].pregType < 50>>
She constantly beset by her squirming child<<if $slaves[$i].pregType > 1>>ren<</if>>. Given their liveliness, and how long she has been pregnant, it is likely that she will go into labor at any time now.
<<elseif $slaves[$i].preg > 32 && $slaves[$i].pregType < 50>>
@@ -3417,7 +3417,7 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
<<else>>
<<if $slaves[$i].pregType == 0>>
<<if ($slaves[$i].drugs is "super fertility drugs")>>
- <<if (($masterSuitePregnancyFertilitySupplements == 1) && (($slaves[$i].assignment is "serve in the master suite") || ($slaves[$i].ID is $Concubine.ID)))>>
+ <<if (($masterSuitePregnancyFertilitySupplements == 1) && (($slaves[$i].assignment is "serve in the master suite") || ($slaves[_i].assignment == "be your Concubine")))>>
<<if ($slaves[$i].hormones == 2)>>
<<set $slaves[$i].pregType to random(20,29)>>
<<else>>
@@ -3431,7 +3431,7 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
<</if>>
<</if>>
<<elseif ($slaves[$i].drugs is "fertility drugs")>>
- <<if (($masterSuitePregnancyFertilitySupplements == 1) && (($slaves[$i].assignment is "serve in the master suite") || ($slaves[$i].ID is $Concubine.ID)))>>
+ <<if (($masterSuitePregnancyFertilitySupplements == 1) && (($slaves[$i].assignment is "serve in the master suite") || ($slaves[_i].assignment == "be your Concubine")))>>
<<if ($slaves[$i].hormones == 2)>>
<<set $slaves[$i].pregType to random(4,5)>>
<<else>>
@@ -3728,7 +3728,7 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
<</if>>
<<elseif $slaves[$i].preg > 0 && $slaves[$i].pregType == 0>>
<<if ($slaves[$i].drugs is "super fertility drugs")>>
- <<if (($masterSuitePregnancyFertilitySupplements == 1) && (($slaves[$i].assignment is "serve in the master suite") || ($slaves[$i].ID is $Concubine.ID)))>>
+ <<if (($masterSuitePregnancyFertilitySupplements == 1) && (($slaves[$i].assignment is "serve in the master suite") || ($slaves[_i].assignment == "be your Concubine")))>>
<<if ($slaves[$i].hormones == 2)>>
<<set $slaves[$i].pregType to random(20,29)>>
<<else>>
@@ -3742,7 +3742,7 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
<</if>>
<</if>>
<<elseif ($slaves[$i].drugs is "fertility drugs")>>
- <<if (($masterSuitePregnancyFertilitySupplements == 1) && (($slaves[$i].assignment is "serve in the master suite") || ($slaves[$i].ID is $Concubine.ID)))>>
+ <<if (($masterSuitePregnancyFertilitySupplements == 1) && (($slaves[$i].assignment is "serve in the master suite") || ($slaves[_i].assignment == "be your Concubine")))>>
<<if ($slaves[$i].hormones == 2)>>
<<set $slaves[$i].pregType to random(4,5)>>
<<else>>