From e0254c03c781133b76b2faf084d9d90c9db3f50e Mon Sep 17 00:00:00 2001 From: kopareigns <kopareigns@gmail.com> Date: Sat, 28 Jul 2018 02:13:08 -0400 Subject: [PATCH] Sanity check fixes --- src/uncategorized/saLongTermEffects.tw | 5 ----- src/uncategorized/saServeThePublic.tw | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 67587d15a0f..e7963ff7fe3 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -3049,13 +3049,8 @@ Allowing $him to indulge in $his fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@ <<FSChange "Hedonism" 2>> <</if>> -<<<<<<< HEAD <<elseif $slaves[$i].bellyPreg > 100 && $slaves[$i].pregKnown == 1 && $slaves[$i].pregSource == -1 && $slaves[$i].breedingMark == 1 && $slaves[$i].devotion > 75>> $He's been marked to be the bearer of your offspring and is growing larger by the day with your child. $He is to be nothing more than a vessel for your children, and as such @@.yellow;has become obsessed with carrying them.@@ -======= - <<elseif $slaves[$i].bellyPreg > 100 && $slaves[$i].pregKnown == 1 && $slaves[$i].pregSource == -1 && $slaves[$i].breedingMark == 1 && $propOutcome == 1 && $slaves[$i].devotion > 75>> - She's been marked to be the bearer of your offspring and is growing larger by the day with your child. She is to be nothing more than a vessel for your children, and as such @@.yellow;has become obsessed with carrying them.@@ ->>>>>>> 7c151cf7d5f947331cc64a6097fa3db9575ff5df <<set $slaves[$i].sexualFlaw = "breeder">> <<set $slaves[$i].fetishStrength = 100>> <<if $arcologies[0].FSHedonisticDecadence != "unset">> diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw index f3432bd5b0e..867ed764ec0 100644 --- a/src/uncategorized/saServeThePublic.tw +++ b/src/uncategorized/saServeThePublic.tw @@ -533,7 +533,7 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea <<elseif $slaves[$j].relationship > 4>> slave wife <</if>> - $slaves[$j].slaveName is also serving the public and they work well toget$him. + $slaves[$j].slaveName is also serving the public and they work well together. <</if>> <<elseif $slaves[$i].relationship == -1>> $He relies on citizens' desire to fuck $him for emotional support, making $him an excellent, if occasionally disturbing, slut. -- GitLab