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

Small Fixes

See merge request pregmodfan/fc-pregmod!1778

src/pregmod/eliteTakeOverFight.tw

@@ -5,25 +5,25 @@
 <<case "bodyguard">>
 	<<set _roll = random(0,100)>>
 	<<if $career == "mercenary">>
-		As a result of your prior experience as a mercenary you were able to successfully signal $Bodyguard.slaveName without the elite's noticing.
+		As a result of your prior experience as a mercenary you were able to successfully signal $Bodyguard.slaveName without the elites noticing.
 		<<set $BodyguardHasSucessfullyRecivedSignal = 1>>
 	<<elseif $PC.warfare >= 100 && _roll > 20>>
-		As a result of your mastery of warfare you were able to successfully signal $Bodyguard.slaveName without the elite's noticing.
+		As a result of your mastery of warfare you were able to successfully signal $Bodyguard.slaveName without the elites noticing.
 		<<set $BodyguardHasSucessfullyRecivedSignal = 1>>
 	<<elseif $PC.warfare >= 60 && _roll > 30>>
-		As a result of your expertness of warfare you were able to successfully signal $Bodyguard.slaveName without the elite's noticing.
+		As a result of your expertness of warfare you were able to successfully signal $Bodyguard.slaveName without the elites noticing.
 		<<set $BodyguardHasSucessfullyRecivedSignal = 1>>
 	<<elseif $PC.warfare >= 30 && _roll > 40>>
-		As a result of having some skill in warfare you were able to successfully signal $Bodyguard.slaveName without the elite's noticing.
+		As a result of having some skill in warfare you were able to successfully signal $Bodyguard.slaveName without the elites noticing.
 		<<set $BodyguardHasSucessfullyRecivedSignal = 1>>
 	<<elseif $PC.warfare >= 10 && _roll > 50>>
 		As a result of having a small amount of skill in warfare you were able to successfully signal $Bodyguard.slaveName without the elite's noticing.
 		<<set $BodyguardHasSucessfullyRecivedSignal = 1>>
 	<<elseif $PC.warfare < 10 && _roll > 60>>
-		By blind luck and what little you remember of your lessons in warfare are were able to successfully signal $Bodyguard.slaveName without the elite's noticing.
+		By blind luck and what little you remember of your lessons in warfare are were able to successfully signal $Bodyguard.slaveName without the elites noticing.
 		<<set $BodyguardHasSucessfullyRecivedSignal = 1>>
 	<<else>>
-		One of the elite's shouts "What the fuck were you trying to do?". Well there goes that option.
+		One of the elites shouts "What the fuck were you trying to do?" Well, there goes that option.
 		<<set $BodyguardHasSucessfullyRecivedSignal = 0>>
 	<</if>>
 	<br>You then pick up the revolver and quickly take aim.
@@ -31,7 +31,7 @@
 	<br>You send a quick message to the leader of your $mercenariesTitle, about your situation, then you pick up the revolver and quickly take aim.
 	<<set $MercenariesMessageSent = 1>>
 <<case "colonel">>
-	<br>You send a quick message to The Colonel, about your situation, then you pick up the revolver and quickly take aim.
+	<br>You send a quick message to The Colonel about your situation, then you pick up the revolver and quickly take aim.
 	<<set $SpecialForcesMessageSent = 1>>
 <<case "enrage">>
 	<<if $PC.career != "wealth" && $PC.career != "engineer" && $PC.career != "medicine">>
@@ -97,7 +97,7 @@
 	<</for>>
 	
 	<<if $eliteDead >= 1>>
-		<br>You managed to kill several elite in rapid succession, leaving the rest in shock and fear.
+		<br>You managed to kill several elites in rapid succession, leaving the rest in shock and fear.
 	<<elseif $eliteDead == 1>>
 		<br>You managed to kill one elite, leaving the rest in shock and fear.
 	<<else>>
@@ -153,7 +153,7 @@
 			Your small amount of skill assisted you in making the throw.
 			<<set _SpentRevolverHitSyringePlunger = 1>>
 		<<elseif $PC.warfare < 10 && random(0,100) > 90>>
-			By blind luck you successfully made the throw 
+			By blind luck you successfully made the throw.
 			<<set _SpentRevolverHitSyringePlunger = 1>>
 		<<else>>
 			Unfortunately you miss the shot.
@@ -175,7 +175,7 @@
 <<set $eliteLeft = $eliteTotal - $eliteDead - $eliteVegetable>>
 
 /* if the player has managed to make enough damage to the elite and the rep is high enough the citizens will come to save the PC */
-/* this is to give reaso to exist for the "enrage" and "last stand" option */
+/* this is to give reason to exist for the "enrage" and "last stand" option */
 /* result 							*/
 /* $eliteFate:						*/
 /* 		killed = 0 					*/

src/uncategorized/REFI.tw

@@ -136,7 +136,7 @@ $subSlave.slaveName gets inspected more regularly than your other slaves, since
 <</if>>
 /* 000-250-006 */
 
-$subSlave.slaveName is on lunch duty today. That means that as you eat your working lunch, she sits on the edge of your desk right next to you, so that her nipples are conveniently at mouth height. Whenever you feel thirsty, you lean over and take some of her creamy, slightly vanilla-toned milk straight from the source. Every time you do, she shudders convulsively, <<if $subSlave.voice != 0>>giving little mewling whimpers.<<else>>harsh gasping noises that are all she can manage, as a mute.<</if>> Though you never touch anything but her nipples, she climaxes twice. After you finish and she leaves, you notice $activeSlave.slaveName at the door to your office. You call her in.
+$subSlave.slaveName is on lunch duty today. That means that as you eat your working lunch, she sits on the edge of your desk right next to you, so that her nipples are conveniently at mouth height. Whenever you feel thirsty, you lean over and take some of her creamy, slightly vanilla-toned milk straight from the source. Every time you do, she shudders convulsively, <<if $subSlave.voice != 0>>giving little mewling whimpers.<<else>>making the harsh gasping noises that are all she can manage, as a mute.<</if>> Though you never touch anything but her nipples, she climaxes twice. After you finish and she leaves, you notice $activeSlave.slaveName at the door to your office. You call her in.
 <br><br>
 <<EventNameLink $activeSlave>> hesitates before explaining herself, and the $desc is obviously aroused: <<if ($activeSlave.dick > 0) && ($activeSlave.dickAccessory == "chastity")>>she's got a string of precum leaking out of her chastity cage<<elseif ($activeSlave.dick > 0) && ($activeSlave.hormoneBalance >= 100)>>though her hormone-filled body can't get her dick hard any more, she's got a string of precum coming off her member<<elseif ($activeSlave.dick > 0) && ($activeSlave.balls == 0)>>though her gelded body can't get her dick hard any more, she's got a string of precum coming off her limp member<<elseif $activeSlave.dick > 4>>her gigantic cock is standing out like a mast<<elseif $activeSlave.dick > 2>>she's sporting an impressive erection<<elseif $activeSlave.dick > 0>>her little penis is rock hard<<elseif $activeSlave.clit > 0>>her large clit is visibly engorged<<else>>her nipples are hard and there's a sheen on her pussylips<</if>>. It seems she passed by while you were drinking from $subSlave.slaveName and found the sight rather compelling. It should be possible to either encourage this fascination or steer her away from it for now.
 

src/uncategorized/generateXYSlave.tw

@@ -486,6 +486,8 @@
 		<<set $activeSlave.foreskin = 34>>
 	<<case "a New Zealander">>
 		<<set $activeSlave.foreskin = 33>>
+	<<case "Canadian">>
+		<<set $activeSlave.foreskin = 32>>
 	<<case "Scottish">>
 		<<set $activeSlave.foreskin = 28>>
 	<<case "Australian" "Ugandan">>
@@ -536,7 +538,7 @@
 		<<set $activeSlave.foreskin = 2>>
 	<<case "Andorran" "Barbadian" "Bermudian" "Bhutanese" "Brazilian" "Croatian" "Finnish" "Hungarian" "Irish" "Moldovan" "Monégasque" "Panamanian" "Portuguese" "Seychellois" "Uruguayan">>
 			<<set $activeSlave.foreskin = 1>>
-	<<case 	"Antiguan" "Armenian" "Bahamian" "Belizean" "Bolivian" "Cape Verdean" "Chilean" "Colombian" "Costa Rican" "Cuban" "Czech" "Dominiquais" "Ecuadorian" "Estonian" "Greenlandic" "Grenadian" "Guatemalan" "Honduran" "I-Kiribati" "Icelandic" "Kittitian" "Laotian" "Latvian" "Lithuanian" "Maltese" "Marshallese" "Micronesian" "Nicaraguan" "Paraguayan" "Polish" "Romanian" "Saint Lucian" "Salvadoran" "Sammarinese" "São Toméan" "Slovak" "Vatican" "Venezuelan" "Vietnamese">>
+	<<case "Antiguan" "Armenian" "Bahamian" "Belizean" "Bolivian" "Cape Verdean" "Chilean" "Colombian" "Costa Rican" "Cuban" "Czech" "Dominiquais" "Ecuadorian" "Estonian" "Greenlandic" "Grenadian" "Guatemalan" "Honduran" "I-Kiribati" "Icelandic" "Kittitian" "Laotian" "Latvian" "Lithuanian" "Maltese" "Marshallese" "Micronesian" "Nicaraguan" "Paraguayan" "Polish" "Romanian" "Saint Lucian" "Salvadoran" "Sammarinese" "São Toméan" "Slovak" "Vatican" "Venezuelan" "Vietnamese">>
 		<<set $activeSlave.foreskin = 0>>
 	<<default>>
 		/% Some overlooked country, or possibly stateless. Use global average. %/