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

fixes

See merge request !4805

src/uncategorized/RESS.tw

@@ -76,7 +76,7 @@
 		<</if>>
 		<<set $fixedNationality = "American">>
 		<<set _meanGirl = GenerateNewSlave("XX")>>
-		<<set _meanGirl.origin = "You enslaved $him for abusing " + $eventSlave.slaveName + " while " + $eventSlave.pronoun + " was serving the public.">>
+		<<set _meanGirl.origin = "You enslaved $him for abusing " + $eventSlave.slaveName + " while " + getPronouns($eventSlave).pronoun + " was serving the public.">>
 		<<set _meanGirl.career = "a student">>
 		<<set _meanGirl.markings = "none", _meanGirl.weight = -20>>
 		<<set _meanGirl.devotion = random(-80,-60)>>

src/uncategorized/storyCaption.tw

@@ -682,7 +682,7 @@
 
 			<<if $secExp == 1>>
 				<span id="edictButton"> <br>
-					<<link [[edicts][$nextButton = "Back", $nextLink = "Manage Arcology"]]>><</link>>
+					<<link [[Edicts|edicts][$nextButton = "Back", $nextLink = "Manage Arcology"]]>><</link>>
 				</span>
 				@@.cyan;[D]@@
 			<</if>>