diff --git a/devNotes/Extended Family Mode Explained.txt b/devNotes/Extended Family Mode Explained.txt index 235e9ffb9ebbf0e4efb5e1985e7fff6e4a24ab56..6e888e909c3cd5e091c850382c4c9e346714a1a4 100644 --- a/devNotes/Extended Family Mode Explained.txt +++ b/devNotes/Extended Family Mode Explained.txt @@ -37,8 +37,8 @@ The utility JS, courtesy of FCGudder. This JS should only be called if you know randomRelatedSlave(slave, filterFunction) - returns a random related slave to the slave passed into it. filterFunction is called in the following JS but not needed if you just want a random relative. randomRelatedAvailableSlave(slave) - returns a random available related slave. randomSister(slave) - returns a random sister. -randomTwinSister(slave) - returns a random twin. randomAvailableSister(slave) - returns a random available sister. +randomTwinSister(slave) - returns a random twin. randomAvailableTwinSister(slave) - returns a random available twin. randomDaughter(slave) - returns a random daughter. randomAvailableDaughter(slave) - returns a random available daughter. diff --git a/src/SpecialForce/Firebase.tw b/src/SpecialForce/Firebase.tw index 3eac4577a335c36c6820a2eadd6a6ed317a7f2e3..fa6010bae88c1d6b5d5c28d61553c3ca92868b79 100644 --- a/src/SpecialForce/Firebase.tw +++ b/src/SpecialForce/Firebase.tw @@ -90,15 +90,15 @@ <br><<switch $SF.UC.Assign>> <<case 0>> - <br>No soldiers are working undercover. [[Full time assignement|Firebase][$SF.UC.Lock = 1]] + <br>No soldiers are working undercover. [[Full time assignment|Firebase][$SF.UC.Lock = 1]] <br>[[Reassign soldiers|Firebase][$SF.UC.Assign = -1]] <<case 1>> - <br>A small section of soldiers are working undercover. [[Full time assignement|Firebase][$SF.UC.Lock = 1]] + <br>A small section of soldiers are working undercover. [[Full time assignment|Firebase][$SF.UC.Lock = 1]] <br>[[Reassign soldiers|Firebase][$SF.UC.Assign = -1]] <<case 2>> - <br>A large section of soldiers are working undercover. [[Full time assignement|Firebase][$SF.UC.Lock = 1]] + <br>A large section of soldiers are working undercover. [[Full time assignment|Firebase][$SF.UC.Lock = 1]] <br>[[Reassign soldiers|Firebase][$SF.UC.Assign = -1]] <<default>> @@ -113,7 +113,7 @@ <</switch>> <<else>> - <br> <<if $SF.UC.Assign < 1>>''Zero''<<elseif $SF.UC.Assign < 2>>A ''small'' section<<else>>A ''large'' section<</if>> of the special force is assigned to undercover work. [[Re-alloclate the units|Firebase][$SF.UC.Lock = 0]] + <br> <<if $SF.UC.Assign < 1>>''Zero''<<elseif $SF.UC.Assign < 2>>A ''small'' section<<else>>A ''large'' section<</if>> of the special force is assigned to undercover work. [[Re-allocate the units|Firebase][$SF.UC.Lock = 0]] <</if>> <<if $SF.Squad.Firebase > 5 && $secExp > 0 && $SFSupportLevel >= 4 && $maxUnits === 16 && $readiness <= 10>> diff --git a/src/facilities/farmyard/farmerSelectWorkaround.tw b/src/facilities/farmyard/farmerSelectWorkaround.tw index 9e3257bed6910660bdd97cf81f189cc21ce563a9..65fc5da28a5ddd2df600db9e782c7017fb75c21f 100644 --- a/src/facilities/farmyard/farmerSelectWorkaround.tw +++ b/src/facilities/farmyard/farmerSelectWorkaround.tw @@ -10,4 +10,3 @@ <</if>> <<goto "Farmyard">> - diff --git a/src/npc/descriptions/fAnus.tw b/src/npc/descriptions/fAnus.tw index ed3a21ae9ea67a9fdecc7ea36410c8e485cace28..a8a4627f63f0e178f1b6d753e32bce13d45dc3b4 100644 --- a/src/npc/descriptions/fAnus.tw +++ b/src/npc/descriptions/fAnus.tw @@ -225,4 +225,3 @@ $His anus is invitingly bleached, <<if passage() != "Slave Interact">> <<set $slaves[$slaveIndices[$activeSlave.ID]] = $activeSlave>> <</if>> - diff --git a/src/player/actions/fondleButt.tw b/src/player/actions/fondleButt.tw index 28004ac5dae48c75df8110043ca4ca9c1e039873..b6c4f88146bfbd8db058db1bb7698c462810c6d8 100644 --- a/src/player/actions/fondleButt.tw +++ b/src/player/actions/fondleButt.tw @@ -36,7 +36,7 @@ as well as $his <</if>> <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.devotion >= -20)>> - $He's pleased at the prospect of you touching $his favorite bodypart. + $He's pleased at the prospect of you touching $his favorite body part. <</if>> <<if ($activeSlave.fetish == "masochist") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && ($activeSlave.anus == 0) && ($activeSlave.devotion >= -20)>> diff --git a/src/pregmod/eliteTakeOver.tw b/src/pregmod/eliteTakeOver.tw index aecc71cd684dc0bd452f70f99e83f6fd87100945..93a70b4a20e45fe404c0e7c65bf41f2ec2b56fcb 100644 --- a/src/pregmod/eliteTakeOver.tw +++ b/src/pregmod/eliteTakeOver.tw @@ -31,7 +31,8 @@ You look up from your desk as the locked door to your office unseals, and a doze What was that last thing he said? It's getting hard to think right. The $PC.refreshment... Drugged... You collapse onto your desk, unconscious. <br> <<if $Bodyguard != 0>> - A sharp pain and a rush of adrenaline drags you back to your senses. Sneaking a peak, you witness $Bodyguard.slaveName valiantly trying to protect you, despite <<if $Bodyguard.amp < 0>>her cybernetics being locked down<<else>>the overwhelming odds<</if>>. As she and their leader struggle closer to your desk, his revolver and a syringe are dislodged onto your desk. It seems drugging you wasn't their first thought. With $Bodyguard.slaveName's risky gamble, your fate has fallen back into your hands. + <<setLocalPronouns $Bodyguard>> + A sharp pain and a rush of adrenaline drags you back to your senses. Sneaking a peak, you witness $Bodyguard.slaveName valiantly trying to protect you, despite <<if $Bodyguard.amp < 0>>$his cybernetics being locked down<<else>>the overwhelming odds<</if>>. As $he and their leader struggle closer to your desk, his revolver and a syringe are dislodged onto your desk. It seems drugging you wasn't their first thought. With $Bodyguard.slaveName's risky gamble, your fate has fallen back into your hands. <<else>> You'll spend the rest of your life a breeder to the Societal Elite; blinded and muted. More than a slave, but still less than your master. Life isn't so bad, your two most devoted slaves were taken along to keep you happy, and you are treated quite well, possibilities considered. Though once your eggs dry up, odds are your little remaining usefulness will be at an end. Best not to think too much into it. <<set _pregSurrender = 1>> @@ -55,7 +56,7 @@ You look up from your desk as the locked door to your office unseals, and a doze <<if $Bodyguard != 0>> <br> <<if $PC.pregSource == -1 || $PC.pregSource == -6>> - $Bodyguard.slaveName is already doing everything in her power to save you. + $Bodyguard.slaveName is already doing everything in $his power to save you. <<else>> <<link "Attempt to signal $Bodyguard.slaveName, your bodyguard">> <<set $finalChoice = "bodyguard">> diff --git a/src/pregmod/fFeet.tw b/src/pregmod/fFeet.tw index 57858cbbd98aeb243ad4945a7d00de985374b4f4..0ba74e53fd18880dbb634e1f810ef58b6db4659b 100644 --- a/src/pregmod/fFeet.tw +++ b/src/pregmod/fFeet.tw @@ -391,7 +391,7 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to The hard angles of $his metal feet provide extra stimulation. <</if>> -/*Extra 2: if not mindbroken/immobi, tease with a flash.*/ +/*Extra 2: if not mindbroken/immobile, tease with a flash.*/ <<if $activeSlave.fetish != "mindbroken" && canWalk($activeSlave) && $activeSlave.sexualQuirk == "tease" && $activeSlave.devotion >= 60>> <<if canSee($activeSlave)>>Seeing <<else>>Feeling <</if>>you near your orgasm, $he <<if _footSeed < 40>> diff --git a/src/pregmod/fLickPussy.tw b/src/pregmod/fLickPussy.tw index d9eb207f270f607bd6ce381047ee1d21ced40b0b..a9463030c749965be3b98c0e4e335508bdacae6d 100644 --- a/src/pregmod/fLickPussy.tw +++ b/src/pregmod/fLickPussy.tw @@ -20,6 +20,6 @@ You have $activeSlave.slaveName brought into your office and placed on your couch. <</if>> -After $he is situated, you go over to $him<<if $activeSlave.clothes != "no clothing">> and take off $his clothing, causing $him to <<if _devotion > 50>>give you a soft smile<<else>>give you an angry glare<</if>><</if>>. You suddenly grab $his hips and pull $his crotch to your face, causing $him to give a shriek of surprise. Looking at $him directly in the eyes, you begin to run your tongue along $his labia, drawing a soft moan from $him. The combination of the pleasure and the intense look from the <<if $PC.title == 0>>wo<</if>>man $he<<if _devotion > 95>> loves <<elseif _devotion > 50>>'s accepted as $his <<= WrittenMaster($activeSlave)>><<else>> hates/*not sure what to use for "reluctant"*/<</if>> makes $him blush, but you don't let up. You give $his clit a few expiremental tweaks, causing $his moans to intensify<<if canWalk($activeSlave)>> and $his legs to tighten around your head<</if>>. Before $he cums, though, you pull back, causing $him to whine in frustration. You begin again, then pull back again just before $he orgasms. You repeat this several more times, each time causing $him to become more and more frustrated. Finally, one last stroke of your tongue causes $him to go over the edge, making $him scream out <<if _devotion > 50>>your name<</if>> in ecstasy. You send $him back to $his assignment before calling in another slave to clean up the mess. +After $he is situated, you go over to $him<<if $activeSlave.clothes != "no clothing">> and take off $his clothing, causing $him to <<if _devotion > 50>>give you a soft smile<<else>>give you an angry glare<</if>><</if>>. You suddenly grab $his hips and pull $his crotch to your face, causing $him to give a shriek of surprise. Looking at $him directly in the eyes, you begin to run your tongue along $his labia, drawing a soft moan from $him. The combination of the pleasure and the intense look from the <<if $PC.title == 0>>wo<</if>>man $he<<if _devotion > 95>> loves <<elseif _devotion > 50>>'s accepted as $his <<= WrittenMaster($activeSlave)>><<else>> hates/*not sure what to use for "reluctant"*/<</if>> makes $him blush, but you don't let up. You give $his clit a few experimental tweaks, causing $his moans to intensify<<if canWalk($activeSlave)>> and $his legs to tighten around your head<</if>>. Before $he cums, though, you pull back, causing $him to whine in frustration. You begin again, then pull back again just before $he orgasms. You repeat this several more times, each time causing $him to become more and more frustrated. Finally, one last stroke of your tongue causes $him to go over the edge, making $him scream out <<if _devotion > 50>>your name<</if>> in ecstasy. You send $him back to $his assignment before calling in another slave to clean up the mess. <<set $activeSlave.vaginalCount++, $vaginalTotal++>> \ No newline at end of file diff --git a/src/pregmod/fillUpButt.tw b/src/pregmod/fillUpButt.tw index 0f83245decc6d50d0c672067a15ce0335afea1df..c4bfcec000f880b00db68823f657704927843264 100644 --- a/src/pregmod/fillUpButt.tw +++ b/src/pregmod/fillUpButt.tw @@ -55,7 +55,7 @@ before shoving the equipment into $his <<set _pregDiscovery = 1>> <<else>> <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.devotion >= -20)>> - $He's pleased at the prospect of you touching $his favorite bodypart. + $He's pleased at the prospect of you touching $his favorite body part. <<elseif ($activeSlave.fetish == "cumslut") && ($activeSlave.devotion >= -20) && ($activeSlave.inflationType == "cum")>> $He's pleased at the idea of turning into a cum balloon. <</if>> diff --git a/src/uncategorized/djWorkaround.tw b/src/uncategorized/djWorkaround.tw index 90f00e21c8170382b041d39d7d867e7250205126..b5b918514dc47b39c40a120418e99a5e928aa0e2 100644 --- a/src/uncategorized/djWorkaround.tw +++ b/src/uncategorized/djWorkaround.tw @@ -10,4 +10,3 @@ <</if>> <<goto "Club">> -