Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

fc-pregmod
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

d989f061

Commit d989f061 authored 6 years ago by Pregmodder

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-dev

parents e581f173 3804806f

No related branches found

No related tags found

1 merge request!3612Fixed misused canGetPregnant() check + added ability to remove "well hung" trait

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/002-config/fc-js-init.js 2 additions, 0 deletions

src/002-config/fc-js-init.js
src/art/artWidgets.tw 5 additions, 0 deletions

src/art/artWidgets.tw
src/events/intro/initNationalities.tw 2 additions, 2 deletions

src/events/intro/initNationalities.tw
src/init/setupVars.tw 1 addition, 0 deletions

src/init/setupVars.tw
src/init/storyInit.tw 2 additions, 1 deletion

src/init/storyInit.tw
src/js/economyJS.js 12 additions, 9 deletions

src/js/economyJS.js
src/js/slaveSummaryWidgets.js 1178 additions, 2 deletions

src/js/slaveSummaryWidgets.js
src/js/utilJS.js 30 additions, 3 deletions

src/js/utilJS.js
src/npc/takeoverTarget.tw 8 additions, 1 deletion

src/npc/takeoverTarget.tw
src/uncategorized/neighborsDevelopment.tw 7 additions, 1 deletion

src/uncategorized/neighborsDevelopment.tw
src/uncategorized/slaveSummary.tw 10 additions, 1008 deletions

src/uncategorized/slaveSummary.tw

with 1257 additions and 1027 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment