Skip to content
Snippets Groups Projects
Commit 3b69da8d authored by Pregmodder's avatar Pregmodder
Browse files

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

Pregmod v1021-177

See merge request pregmodfan/fc-pregmod!1078
parents f4adab5d 13eb865e
No related branches found
No related tags found
No related merge requests found
...@@ -4779,4 +4779,7 @@ Pregmod 0.10.3.0 ...@@ -4779,4 +4779,7 @@ Pregmod 0.10.3.0
-added tracking to ng+ slaves to keep them from stealing the spotlight in certain current game events -added tracking to ng+ slaves to keep them from stealing the spotlight in certain current game events
176 176
-fixed bugs -fixed bugs
\ No newline at end of file
177
-fixes
\ No newline at end of file
...@@ -188,7 +188,7 @@ You repeat this ritual throughout the week, ensuring that $activeSlave.slaveName ...@@ -188,7 +188,7 @@ You repeat this ritual throughout the week, ensuring that $activeSlave.slaveName
<</if>> <</if>>
<<if _delt > 0>> <<if _delt > 0>>
Society is @@.green;pleased@@ by the addition of a new slave, no matter the means by which it was produced. Society is @@.green;pleased@@ by the addition of a new slave, no matter the means by which it was produced.
<<set $rep += $FSSingleSlaveRep*($arcologies[0]._delt/$FSLockinLevel)>> <<set $rep += $FSSingleSlaveRep*($arcologies[0].FSRepopulationFocus/$FSLockinLevel)>>
<<else>> <<else>>
The traditional elements of your society disapprove of this degenerate form of reproduction, but their complaints are countered by those who believe producing more slaves by any means necessary. The traditional elements of your society disapprove of this degenerate form of reproduction, but their complaints are countered by those who believe producing more slaves by any means necessary.
<</if>> <</if>>
......
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<<else>> <<else>>
<<goto "P rivalry actions">> <<goto "P rivalry actions">>
<</if>> <</if>>
<<elseif ($arcologies[0].FSPaternalistDecoration = 100) && ($swanSong == 2) && ($week-$swanSongWeek >= 3)>> <<elseif ($arcologies[0].FSPaternalistDecoration == 100) && ($swanSong == 2) && ($week-$swanSongWeek >= 3)>>
<<goto "RE The Siren Strikes Back">> <<goto "RE The Siren Strikes Back">>
<<elseif ($PShoot == 1)>> <<elseif ($PShoot == 1)>>
<<set $Event = "shoot result">> <<set $Event = "shoot result">>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment