diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 94aed3a91c2fc4b0bf48161ef5c13f482f3299f7..20c55e19c00fd3428119c69d36415d4d27b37c11 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -88,7 +88,6 @@ $menialCareers
"a nun"
"being homeschooled by her parents"
"a housesitter"
-"a babysitter"
"a handmaiden"
$entertainmentCareers
@@ -196,6 +195,13 @@ $attendantCareers
"a therapist"
"a psychologist"
+$matronCareers
+"a babysitter"
+"a nanny"
+"a practitioner"
+"a wet nurse"
+"an au pair"
+
$milkmaidCareers
"a dairy worker"
"a rancher"
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index d86e411af655b2110430601f429f08db7f851eb1..a0063c2e754af40f756536edc8e09aea6cb1980e 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -728,7 +728,7 @@ Choose a more particular entry below:
An ''Attendant'' can be selected once the [[Spa|Encyclopedia][$encyclopedia = "Spa"]] facility has been built. Attendants provide emotional help to slaves in the spa, and can also soften flaws and even fix mindbroken slaves. Good Attendants are free of fetishes or submissive, have a calm libido, older than 35, a motherly air, @@.cyan;intelligent@@, and naturally female.
<<case "Matron">>
- A ''Matron'' can be selected once the [[Nursery|Encyclopedia][$encyclopedia = "Nursery"]] facility has been built. Matrons oversee the day-to-day activities of the Nursery, and can soften flaws of nannies working under them. Good Matrons //This entry still needs work and will be updated with more information as it matures. If this message is still here, remind one of the devs to remove it.//
+ A ''Matron'' can be selected once the [[Nursery|Encyclopedia][$encyclopedia = "Nursery"]] facility has been built. Matrons oversee the day-to-day activities of the Nursery, and can soften flaws of nannies working under them. Good Matrons is [[caring|Encyclopedia][$encyclopedia = "Caring"]], [[intelligent|Encyclopedia][$encyclopedia = "Intelligence"]], and has given birth before. //This entry still needs work and will be updated with more information as it matures. If this message is still here, remind one of the devs to remove it.//
<<case "Bodyguard">>
//Slave bodyguards are best understood not as protection for a slaveowner's person, but rather as a projection of their skill at slave breaking.
@@ -1251,7 +1251,7 @@ SLAVE BEHAVIORAL QUIRKS
SLAVE SEXUAL QUIRKS
**********/
<<case "Caring">>
- ''Caring '' is a sexual [[quirk|Encyclopedia][$encyclopedia = "Quirks"]] developed from the [[apathetic|Encyclopedia][$encyclopedia = "Apathetic"]] [[flaw|Encyclopedia][$encyclopedia = "Flaws"]]. Caring slaves may naturally become [[pregnancy fetishists|Encyclopedia][$encyclopedia = "Pregnancy Fetishists"]]. In addition to the standard value and sexual assignment advantages, they get bonus @@.hotpink;[[devotion|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ while [[whoring|Encyclopedia][$encyclopedia = "Whoring"]].
+ ''Caring '' is a sexual [[quirk|Encyclopedia][$encyclopedia = "Quirks"]] developed from the [[apathetic|Encyclopedia][$encyclopedia = "Apathetic"]] [[flaw|Encyclopedia][$encyclopedia = "Flaws"]]. Caring slaves may naturally become [[pregnancy fetishists|Encyclopedia][$encyclopedia = "Pregnancy Fetishists"]]. In addition to the standard value and sexual assignment advantages, they get bonus @@.hotpink;[[devotion|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ while [[whoring|Encyclopedia][$encyclopedia = "Whoring"]] and nannying.
<<case "Gagfuck Queen">>
@@ -1668,9 +1668,9 @@ ARCOLOGY FACILITIES
The ''Spa'' is one of two //[[Rest|Encyclopedia][$encyclopedia = "Rest"]] facilities;// it focuses on slaves' mental well-being. The Spa will heal, rest, and reassure slaves until they are at least reasonably [[Healthy|Encyclopedia][$encyclopedia = "Health"]], happy, and free of [[Flaws|Encyclopedia][$encyclopedia = "Flaws"]]. The Spa can be furnished according to [[future society|Encyclopedia][$encyclopedia = "Future Societies"]] styles, and doing so will add a slight @@.hotpink;[[devotion|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ boost to slaves resting there.
<<case "Nursery">>
- The ''Nursery'' is used to rapidly age children kept within its aging tanks using a combination of growth hormones, accelerants, stem cells and other chemicals; slaves that come out of it are rarely healthy. Requires a massive amount of electricity to run, though once powered contains a battery backup to last at least a day. Can be upgraded to combat malnutrition and thinness caused by a body growing far beyond any natural rate. Hormones can also be added to encourage puberty and even sex organ development. Growth control systems include cost saving overrides, though enabling them may result in bloated, sex crazed slaves barely capable to moving.
+ The ''Nursery'' is used to raise children from birth naturally. Once a spot is reserved for the child, they will be placed in the Nursery upon birth and ejected once they are old enough.
- <br><br>To build it; ''Extended family mode needs to be enabled. Then go to the penthouse management screen and it should be there.'' //This entry still needs work and will be updated with more information as it matures. If this message is still here, remind one of the devs to remove it.//
+ <br><br>''Extended family mode must be enabled.'' //This entry still needs work and will be updated with more information as it matures. If this message is still here, remind one of the devs to remove it.//
<<case "Farmyard">>
The ''Farmyard'' is where the majority of the food in your arcology is grown, once it is built. <<if $seeBestiality == 1>>It also allows you to house animals, which you can have interact with your slaves.<</if>> //This entry still needs work and will be updated with more information as it matures. If this message is still here, remind one of the devs to remove it.//
@@ -2793,9 +2793,9 @@ LORE: INTERVIEWS
Not all drugs are applied directly to your slavegirl. In this case, gestation accelerants and deccelerants are passed through the mother into her unborn children to control the rate of fetal growth. While slightly unhealthy for the mother, gestation slowing drugs are relatively harmless, though an unwilling mother may become more distraught when she realizes her pregnancy will last even longer. Due to the extended duration of the pregnancy, the mother's body may become accustomed to being so round, leading towards a sagging middle once birth occurs. On the other hand, gestation hastening drugs are extremely dangerous to the mother. It is strongly recommended to keep her under the observation and care of an experienced doctor or nurse. Failure to do so will cause her body to struggle to keep up with the rate of growth of her children, harming her physical and mental health, as well as potentially bursting her uterus later in her pregnancy. Labor suppresants are exactly that; they prevent the mother from entering labor, thus allowing the child to grow longer than a normal pregnancy. Excessive use may lead to health complications, especially during childbirth, though going even further may result in the slave's body suddenly entering labor and rapidly birthing her children, often without giving the slave time to prepare or even get undressed.
<<case "The Incubation Facility">>
- A facility used to rapidly age children kept within its aging tanks using a combination of growth hormones, accelerants, stem cells and other chemicals; slaves that come out of it are rarely healthy. Requires a massive amount of electricity to run, though once powered contains a battery backup to last at least a day. Can be upgraded to combat malnutrition and thinness caused by a body growing far beyond any natural rate. Hormones can also be added to encourage puberty and even sex organ development. Growth control systems include cost saving overrides, though enabling them may result in bloated, sex crazed slaves barely capable to moving.
+ A facility used to rapidly age children kept within its aging tanks using a combination of growth hormones, accelerants, stem cells and other chemicals; slaves that come out of it are rarely healthy. The Incubator requires a massive amount of electricity to run, though once powered contains a battery backup that can last at least a day. It can be upgraded to combat malnutrition and thinness caused by a body growing far beyond any natural rate. Hormones can also be added to encourage puberty and even sex organ development. Growth control systems include cost saving overrides, though enabling them may result in bloated, sex crazed slaves barely capable of moving.
- <br><br>To build it; ''Extended family mode needs to be enabled and the power lines need to be replaced. Then go to the penthouse management screen and it should be there.''
+ <br><br>''Extended family mode must be enabled.'' /*Removed for brevity, replace if necessary*/
<<case "Organic Mesh Breast Implant">>
A specialized organic implant produced from the dispensary designed to be implanted into to a slave's natural breast tissue to maintain a slave's breast shape no matter how big her breasts may grow. An expensive and risky procedure proportional to the size of the breasts the mesh will be implanted into. Should health become an issue, the slave in surgery may undergo an emergency mastectomy. Furthermore, once implanted, the mesh cannot be safely removed from the breast. However, total breast removal will rid the slave of the implant; consider strongly when and if you want to implant the mesh before doing so. They are exceedingly difficult to identify once bound to the breast tissue, and combined with their natural shape, are often overlooked.
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index f028f06641e5a139d5e929462703cc913bce643d..60845b16f2eaa6e2a0a6e2dffe2a9e294fc4050a 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -576,6 +576,7 @@ window.expandFacilityAssignments = function(facilityAssignments) {
var assignmentPairs = {
"serve in the club": "be the DJ",
"rest in the spa": "be the Attendant",
+ "be a nanny": "be the Matron",
"work as a nanny": "be the Matron",
"work in the brothel": "be the Madam",
"work in the dairy": "be the Milkmaid",
@@ -585,7 +586,6 @@ window.expandFacilityAssignments = function(facilityAssignments) {
"serve in the master suite": "be your Concubine",
"learn in the schoolroom": "be the Schoolteacher",
"be confined in the cellblock": "be the Wardeness",
- "be a nanny": "be the Matron",
};
if (!facilityAssignments || !facilityAssignments.length)
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index d9e568b8481503651981c0fe8f761628d3e75f69..b95d070686bf1ec005e3546d98bd060463cba496 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -120,7 +120,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $
| <<print "[[Keep none of her children|Incubator][$reservedChildren -= $slaves[" + _u + "].reservedChildren, $slaves[" + _u + "].reservedChildren = 0]]">>
<</if>>
<</if>>
- <<elseif $reservedChildren < $freeTanks>>
+ <<elseif ($reservedChildren < $freeTanks)>>
You have <<if $freeTanks == 1>>an<</if>> @@.lime;available aging tank<<if $freeTanks > 1>>s<</if>>.@@
<br>
<<print "[[Keep "+ (($slaves[_u].pregType > 1) ? "a" : "the") +" child|Incubator][$slaves[" + _u + "].reservedChildren += 1, $reservedChildren += 1]]">>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index dfc86dd50d3723e9439e586c6117c89d46a08655..4fc88165965a66b3a8f79b85faefe68420c48a5f 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -917,12 +917,11 @@
<<set $notApplyDesc = "is a bit sad that $his role isn't part of $his name, since $he likes helping your girls and now wonders whether $he'll be allowed to keep doing so.">>
<<case "Matron">>
- <<set $nickname = either("'Matron'", "'Mother'", "'Babysitter'")>>
+ <<set $nickname = either("'Matron'", "'Mother'", "'Babysitter'", "'Nanny'", "'Caretaker'")>> /*feel free to add or change these*/
<<set $situationDesc = "has a very important role in ensuring the children in $arcologies[0].name grow up to be the perfect slaves for you.">>
<<set $applyDesc = "is excited and proud when $he learns that $his position in your arcology is a part of $his name now.">>
<<set $notApplyDesc = "is a bit sad that $his role isn't part of $his name, since $he likes taking care of the children and now wonders whether $he'll be allowed to keep doing so.">>
-
<<case "Madam">>
<<set $nickname = either("'Boss Bitch'", "'Brothel Queen'", "'Madam'", "'Miss Kitty'", "'Mother'", "'Pimp'", "'Pimp Hand'", "'Pimp Queen'", "'Pimparella'", "'Queen Bitch'", "'Whore Queen'")>>
<<set $situationDesc = "is in an unusually responsible and pragmatic position, for a slave. $He runs $his whores' lives with almost total control, overseeing the sale of their bodies day in, day out. Some resent $him, some love $him, but all depend on $him.">>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index a5aae645750bd98309da78aeb301a6c1b24030c2..078cba39d498399743e31dbb5f23a82eb7791857 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -312,24 +312,6 @@
<</if>>
<<case "be your Concubine">>
<<set $Concubine = $slaves[$i], $fuckSlaves++>>
-<<case "be the Matron">>
- <<set $Matron = $slaves[$i]>>
- <<if $Matron.fetish == "mindbroken">>
- ''__@@.pink;$Matron.slaveName@@__'' is mindbroken @@.yellow;and cannot serve as your Matron any more.@@<br>
- <<set $Matron = 0>>
- <<elseif $Matron.preg > 37 && $Matron.broodmother == 2>>
- ''__@@.pink;$Matron.slaveName@@__'' spends so much time giving birth and laboring that @@.yellow;she cannot effectively serve as your Matron any longer@@.
- <<set $Matron = 0>>
- <<elseif !canWalk($Matron)>>
- ''__@@.pink;$Matron.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your Matron any more.@@<br>
- <<set $Matron = 0>>
- <<elseif !canHear($Matron)>>
- ''__@@.pink;$Matron.slaveName@@__'' can no longer hear @@.yellow;and cannot serve as your Matron any more.@@<br>
- <<set $Matron = 0>>
- <</if>>
- <<if $Matron == 0>>
- <<= removeJob($slaves[$i], "be the Matron")>>
- <</if>>
<<case "serve in the master suite" "please you">>
<<set $fuckSlaves++>>
<</switch>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 5355f205bcb8e64649aad1fc46f8452504a71d07..f1516d19d4183020004a4e2bfb5a621c5d37677f 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -493,8 +493,6 @@
//$He is your concubine and is not available for other work//
<<case "be the Wardeness">>
//$He is the Wardeness and is not available for other work//
- <<case "be the Matron">>
- //$He is the Matron and is not available for other work//
<<default>>
/* CAN BE REASSIGNED */