Merge branch 'pregmod-master' into 'pregmod-master'

fixes

See merge request pregmodfan/fc-pregmod!2650

src/npc/databases/ddSlavesDatabase.tw

@@ -7,7 +7,7 @@
 /*Increased areolae, added origin and customdesc -BoneyM*/
 
 <<set _HS = {}>>
-<<set _HS.slaveName = "Alyssa", _HS.birthName = "Alyssa", _HS.genes = "XY", _HS.ID = _i++, _HS.assignment = "be a servant", _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = -30, _HS.devotion = 60, _HS.race = "white", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "pale", _HS.hLength = 10, _HS.hStyle = "short", _HS.boobs = 300, _HS.butt = 1, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 2, _HS.anus = 1, _HS.prostate = 1, _HS.balls = 1, _HS.scrotum = 1, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.faceShape = "feminine">>
+<<set _HS.slaveName = "Alyssa", _HS.birthName = "Alyssa", _HS.genes = "XY", _HS.ID = _i++, _HS.assignment = "be a servant", _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = -30, _HS.devotion = 60, _HS.race = "white", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "pale", _HS.hLength = 10, _HS.hStyle = "short", _HS.boobs = 300, _HS.butt = 1, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 2, _HS.anus = 1, _HS.prostate = 1, _HS.balls = 1, _HS.scrotum = 1, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.faceShape = "androgynous">>
 <<set $heroSlaves.push(_HS)>>
 /*Changed assignment -BoneyM*/
 

src/pregmod/fNippleFuck.tw

@@ -67,6 +67,6 @@ As your orgasm begins to build, you roughly grasp $his shoulders and begin to pi
 	As $he reaches $his climax, $his body seems to tense and $he bites $his lip.
 <</if>>
 
-It only takes few more thrusts before you bottom out inside $his breast and release your load deep inside $him. You pull yourself free with a lewd sound and proudly survey what you’ve wrought. Cum<<if $activeSlave.lactation > 0>> and milk dribble<<else>> dribbling <</if>> from $his gaping nipple. Enjoying the sight, you begin to feel yourself harding and line up your dick at $his left nipple for a repeat performance.
+It only takes few more thrusts before you bottom out inside $his breast and release your load deep inside $him. You pull yourself free with a lewd sound and proudly survey what you’ve wrought. Cum<<if $activeSlave.lactation > 0>> and milk dribble<<else>> dribbling <</if>> from $his gaping nipple. Enjoying the sight, you begin to feel yourself hardening and line up your dick at $his left nipple for a repeat performance.
 
 Once both $his breasts have been thoroughly fucked, you send $him away to clean $himself up.

src/pregmod/widgets/assignmentFilterWidget.tw

@@ -108,7 +108,7 @@
 	<<link Penthouse>><<penthouseAssignmentFilter>><<replace $args.full>><<include 'Slave Summary'>><</replace>><</link>><<print " | ">>
 	<<link Schoolroom>><<schoolAssignmentFilter>><<replace $args.full>><<include 'Slave Summary'>><</replace>><</link>><<print " | ">> 
 	<<link Spa>><<spaAssignmentFilter>><<replace $args.full>><<include 'Slave Summary'>><</replace>><</link>><<print " | ">>
-	<<link Nursery>><<nurseryAssignmentFilter>><<replace $args.full>><<include 'Slave Summary'>><<replace>><</link>><<print " | ">>
+	<<link Nursery>><<nurseryAssignmentFilter>><<replace $args.full>><<include 'Slave Summary'>><</replace>><</link>><<print " | ">>
 	<<link Suite>><<suiteAssignmentFilter>><<replace $args.full>><<include 'Slave Summary'>><</replace>><</link>><<print " | ">>
 	<<link Quarters>><<spaAssignmentFilter>><<replace $args.full>><<include 'Slave Summary'>><</replace>><</link>>
 	<<resetAssignmentFilter>>

src/uncategorized/REFI.tw

@@ -907,6 +907,8 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
 	<</link>>
 <<elseif $PC.belly >= 5000>>
 	<<link "Temper $his interest into an pregnancy obsession">>
+		<<EventNameDelink $activeSlave>>
+		<<replace "#result">>
 		<<if !canTalk($activeSlave)>>
 			<<if $activeSlave.accent >= 3>>
 				<<if $activeSlave.amp == 1>>
@@ -968,9 +970,12 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
 		@@.hotpink;$He has become more devoted to you,@@ and @@.lightcoral;$he has developed a pregnancy fetish.@@
 		<<set $activeSlave.devotion += 4>>
 		<<set $activeSlave.fetish = "pregnancy", $activeSlave.fetishKnown = 1, $activeSlave.fetishStrength = 65>>
+		<</replace>>
 	<</link>>
 <<elseif canAchieveErection($activeSlave)>>
 	<<link "Temper $his interest into an impregnation obsession">>
+		<<EventNameDelink $activeSlave>>
+		<<replace "#result">>
 		<<if !canTalk($activeSlave)>>
 			<<if $activeSlave.accent >= 3>>
 				<<if $activeSlave.amp == 1>>
@@ -1024,6 +1029,7 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
 		@@.hotpink;$He has become more devoted to you,@@ and @@.lightcoral;$he has developed a pregnancy fetish.@@
 		<<set $activeSlave.devotion += 4>>
 		<<set $activeSlave.fetish = "pregnancy", $activeSlave.fetishKnown = 1, $activeSlave.fetishStrength = 65>>
+		<</replace>>
 	<</link>><<if $activeSlave.toyHole == "dick" && canImpreg($PC, $activeSlave)>>//This option may result in you getting knocked up.<</if>>
 <<else>>
 	<<link "Turn $him into another fertility whore despite $his barrenness">>

src/uncategorized/saLiveWithHG.tw

@@ -389,7 +389,7 @@
 <<set _cervixPump = 0>>
 <<if ($HeadGirl.fetishKnown == 1)>>
 	<<if ($HeadGirl.energy > 95)>>
-		$slaves[$i].slaveName spends a lot of time getting fucked in whichever hole $HeadGirl.slaveName decides to shove _his2 <<if canPenetrate($HeadGirl)>>dick<<else>>strap-on<</if>> into next.
+		$slaves[$i].slaveName spends a lot of time getting fucked in whichever hole or cranny $HeadGirl.slaveName decides to shove _his2 <<if canPenetrate($HeadGirl)>>dick<<else>>strap-on<</if>> into next.
 		<<set _oralUse += 5>>
 		<<if canDoAnal($slaves[$i])>>
 			<<set _analUse += 5>>