Lisp sh and x, fix conflict

src/npc/fFeelings.tw

@@ -595,8 +595,8 @@ My favorite part of my body i<<s>>
 
 <<if $activeSlave.inflation > 0>>
 	<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
-		<<set _fluid = $activeSlave.inflationType, _fluid = _fluid.replace("ss", "th"), _fluid = _fluid.replace("S", "Th"), _fluid = _fluid.replace("s", "th")>>
-		<<set _slavename = $activeSlave.slaveName, _slavename = _slavename.replace("ss", "th"), _slavename = _slavename.replace("S", "Th"), _slavename = _slavename.replace("s", "th")>>
+		<<set _fluid = $activeSlave.inflationType, _fluid = nameReplace(_fluid)>>
+		<<set _slavename = $activeSlave.slaveName, _slavename = nameReplace(_slavename)>>
 	<<else>>
 		<<set _fluid = $activeSlave.inflationType>>
 	<</if>>
@@ -940,14 +940,18 @@ My favorite part of my body i<<s>>
 
 <<if ($activeSlave.relationship > 0)>>
 	<<set $partner = $slaves.findIndex(function(s) { return s.ID == $activeSlave.relationshipTarget; })>>
+	<<set _partnerName = $slaves[$partner].slaveName>>
+	<<if _lisping == 1>>
+	    <<set _partnerName = nameReplace(_partnerName)>>
+	<</if>>
 	<<if $activeSlave.relationship <= 2>>
-		I really like <<s>>eeing $slaves[$partner].slaveName every day, she'<<s>> a good friend." She blushes. "<<Sh>>e'<<s>> kind of hot, too.
+		I really like <<s>>eeing _partnerName every day, she'<<s>> a good friend." She blushes. "<<Sh>>e'<<s>> kind of hot, too.
 	<<elseif $activeSlave.relationship <= 3>>
-		I really like <<s>>eeing $slaves[$partner].slaveName every day, she's a good friend -" She blushes. "- even when we're not fucking.
+		I really like <<s>>eeing _partnerName every day, she's a good friend -" She blushes. "- even when we're not fucking.
 	<<elseif $activeSlave.relationship <= 4>>
-		I really love $slaves[$partner].slaveName." She blushes. "Thank you for letting u<<s>> be together, <<Master>>.
+		I really love _partnerName." She blushes. "Thank you for letting u<<s>> be together, <<Master>>.
 	<<else>>
-		I'm <<s>>o happy with $slaves[$partner].slaveName." She blushes. "Thank you for her, <<Master>>.
+		I'm <<s>>o happy with _partnerName." She blushes. "Thank you for her, <<Master>>.
 	<</if>>
 	<<if $activeSlave.relationship >= 3>>
 		<<if $activeSlave.mother == $slaves[$partner].ID>>