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

9c833044

Commit 9c833044 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

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

Neighbor FS development improvements

See merge request !6882

parents 3b0d9454 f9bb75eb

No related branches found

No related tags found

Loading

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/js/futureSocietyJS.js 209 additions, 12 deletions

src/js/futureSocietyJS.js
src/js/generateMarketSlave.js 1 addition, 1 deletion

src/js/generateMarketSlave.js
src/neighbor/arcologyDiplomacy.js 171 additions, 0 deletions

src/neighbor/arcologyDiplomacy.js
src/neighbor/arcologyOpinion.js 0 additions, 367 deletions

src/neighbor/arcologyOpinion.js
src/uncategorized/arcmgmt.tw 1 addition, 1 deletion

src/uncategorized/arcmgmt.tw
src/uncategorized/bulkSlaveGenerate.tw 2 additions, 3 deletions

src/uncategorized/bulkSlaveGenerate.tw
src/uncategorized/neighborInteract.tw 1 addition, 1 deletion

src/uncategorized/neighborInteract.tw
src/uncategorized/neighborsDevelopment.tw 42 additions, 1053 deletions

src/uncategorized/neighborsDevelopment.tw
src/uncategorized/neighborsFSAdoption.tw 1 addition, 1 deletion

src/uncategorized/neighborsFSAdoption.tw
src/uncategorized/slaveMarkets.tw 1 addition, 1 deletion

src/uncategorized/slaveMarkets.tw

with 429 additions and 1440 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