Skip to content
Snippets Groups Projects
Commit 1d4760c4 authored by Pregmodder's avatar Pregmodder
Browse files

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

Pregmod v1019-75

See merge request !739
parents b7e74271 86b67659
No related branches found
No related tags found
2 merge requests!843Delete Please.,!739Pregmod v1019-75
...@@ -2578,8 +2578,9 @@ __I do not give credit without explicit permission to do so.__ If you have contr ...@@ -2578,8 +2578,9 @@ __I do not give credit without explicit permission to do so.__ If you have contr
<br>''anon'' for Physical Idealist's beauty standard. <br>''anon'' for Physical Idealist's beauty standard.
<br>''anon'' for Gender Radicalist's trap preference. <br>''anon'' for Gender Radicalist's trap preference.
<br>''anon'' for the slave mutiny event. <br>''anon'' for the slave mutiny event.
<br>''onithyr'' for various little tweaks and additions.
<br>''anonNeo'' for spellchecking. <br>''anonNeo'' for spellchecking.
<br>''Utopia'' for dirty dealings gang leader focus. <br>''Utopia'' for dirty dealings gang leader focus and updates to it.
<br>''Bane70'' optimized huge swaths of code with notable professionalism. <br>''Bane70'' optimized huge swaths of code with notable professionalism.
<br>''Circle Tritagonist'' provided several new collars and outfits. <br>''Circle Tritagonist'' provided several new collars and outfits.
<br>''Qotsafan'' submitted bugfixes. <br>''Qotsafan'' submitted bugfixes.
......
...@@ -613,7 +613,7 @@ ...@@ -613,7 +613,7 @@
<<for _recruiterSlaves.length > 0>> <<for _recruiterSlaves.length > 0>>
<<set $recruiterSlave = _recruiterSlaves.pluck()>> <<set $recruiterSlave = _recruiterSlaves.pluck()>>
<<if random(1,100) > 90+(totalRelatives($recruiterSlave)*2)>> <<if random(1,100) > 90+(totalRelatives($recruiterSlave)*2)>>
<<set $j = $genePool.findIndex(function(o) { return o.ID == $slaves[$i].ID; })>> <<set $j = $genePool.findIndex(function(o) { return o.ID == $recruiterSlave.ID; })>>
<<if $j != -1>> <<if $j != -1>>
<<set $events.push("RE relative recruiter")>> <<set $events.push("RE relative recruiter")>>
<<break>> <<break>>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment