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

clarifying that origin override applies to tattoos too.

See merge request pregmodfan/fc-pregmod!3267

src/npc/startingGirls/moreCustomOptions.tw

@@ -27,9 +27,9 @@
 <br>Custom origin story: <<textbox "$activeSlave.origin" $activeSlave.origin "More customization options">> //Use complete, capitalized and punctuated sentences.//
 <br>
 <<if $originOveride == 0>>
-	[[Origin Override|More customization options][$originOveride = 1]] //Will keep your custom origin from being overwritten.//
+	[[Origin Override|More customization options][$originOveride = 1]] //Will keep your custom origin and tattoo from being overwritten.//
 <<else>>
-	[[Disable Override|More customization options][$originOveride = 0]] //Will unlock origin and allow slavegen to overwrite it.//
+	[[Disable Override|More customization options][$originOveride = 0]] //Will unlock origin and allow slavegen to overwrite it and its related tattoo.//
 <</if>>
 <<if $activeSlave.prestige>>
 	<br>Reason for prestigiousness: <<textbox "$activeSlave.prestigeDesc" $activeSlave.prestigeDesc>> //Use complete, capitalized and punctuated sentences.//

src/npc/startingGirls/startingGirls.tw

@@ -353,14 +353,15 @@ __You are customizing this slave:__
 		<<set $activeSlave.origin = "You won her at cards, a memento from your life as one of the idle rich before you became an arcology owner.">>
 		<<set $activeSlave.customTat = "She has the silhouette of an arcology tattooed on the nape of her neck.">>
 	<</if>>
-<</if>>
 	<<if $activeSlave.fetish == "mindbroken">>
-	<<if $activeSlave.amp != 1>>
-		<<set $activeSlave.origin = "You brought her into the arcology mindbroken, little more than a walking collection of fuckable holes.">>
-	<<else>>
-		<<set $activeSlave.origin = "You brought her into the arcology mindbroken, little more than a human onahole.">>
-	<</if>>
+		<<if $activeSlave.amp != 1>>
+			<<set $activeSlave.origin = "You brought her into the arcology mindbroken, little more than a walking collection of fuckable holes.">>
+		<<else>>
+			<<set $activeSlave.origin = "You brought her into the arcology mindbroken, little more than a human onahole.">>
+		<</if>>
 	<</if>>
+<</if>>
+
 <<set $activeSlave.father = Number($activeSlave.father) || 0>>
 <<set $activeSlave.mother = Number($activeSlave.mother) || 0>>
 <<if ($activeSlave.anus > 2 && $activeSlave.analSkill <= 10) || ($activeSlave.anus == 0 && $activeSlave.analSkill > 30)>>