Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fc-pregmod
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pregmodfan
fc-pregmod
Commits
1d4760c4
Commit
1d4760c4
authored
7 years ago
by
Pregmodder
Browse files
Options
Downloads
Plain Diff
Merge branch 'pregmod-master' into 'pregmod-master'
Pregmod v1019-75 See merge request
!739
parents
b7e74271
86b67659
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!843
Delete Please.
,
!739
Pregmod v1019-75
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/gui/Encyclopedia/encyclopedia.tw
+2
-1
2 additions, 1 deletion
src/gui/Encyclopedia/encyclopedia.tw
src/uncategorized/randomNonindividualEvent.tw
+1
-1
1 addition, 1 deletion
src/uncategorized/randomNonindividualEvent.tw
with
3 additions
and
2 deletions
src/gui/Encyclopedia/encyclopedia.tw
+
2
−
1
View file @
1d4760c4
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
src/uncategorized/randomNonindividualEvent.tw
+
1
−
1
View file @
1d4760c4
...
@@ -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>>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment