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

cd4d1306

Commit cd4d1306 authored 4 years ago by svornost

Downloads
- Plain Diff

Merge branch 'pregmod-master' of gitgud.io:svornost/fc-pregmod into fs-decoration

parents 40dfc5bc e52ef256

No related branches found

No related tags found

1 merge request!8409Normalize FS decoration strings

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/endWeek/economics/arcmgmt.js 4 additions, 4 deletions

src/endWeek/economics/arcmgmt.js
src/endWeek/economics/fsDevelopments.js 1 addition, 1 deletion

src/endWeek/economics/fsDevelopments.js
src/endWeek/economics/neighborsDevelopment.js 56 additions, 487 deletions

src/endWeek/economics/neighborsDevelopment.js
src/js/futureSocietyJS.js 23 additions, 24 deletions

src/js/futureSocietyJS.js
src/markets/bulkSlave/bulkSlaveIntro.js 1 addition, 1 deletion

src/markets/bulkSlave/bulkSlaveIntro.js
src/markets/specificMarkets/slaveMarkets.js 9 additions, 8 deletions

src/markets/specificMarkets/slaveMarkets.js
src/neighbor/arcologyDiplomacy.js 17 additions, 18 deletions

src/neighbor/arcologyDiplomacy.js
src/neighbor/neighborDisplay.js 2 additions, 3 deletions

src/neighbor/neighborDisplay.js
src/neighbor/neighborInteract.js 12 additions, 11 deletions

src/neighbor/neighborInteract.js
src/npc/descriptions/sceneIntro.js 4 additions, 16 deletions

src/npc/descriptions/sceneIntro.js
src/npc/generate/generateMarketSlave.js 1 addition, 1 deletion

src/npc/generate/generateMarketSlave.js

with 130 additions and 574 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