Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

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

Snippets Groups Projects

a95788f4

Commit a95788f4 authored 5 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'nationality' into 'pregmod-master'

specNationality

Closes #1387

See merge request pregmodfan/fc-pregmod!6406

parents 0a5180b1 ecc12d11

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

js/003-data/gameVariableData.js 2 additions, 1 deletion

js/003-data/gameVariableData.js
src/Corporation/corporate.js 1 addition, 0 deletions

src/Corporation/corporate.js
src/Corporation/corporateMarket.tw 6 additions, 2 deletions

src/Corporation/corporateMarket.tw
src/Corporation/manageCorporation.tw 9 additions, 0 deletions

src/Corporation/manageCorporation.tw
src/init/storyInit.tw 1 addition, 1 deletion

src/init/storyInit.tw
src/js/generateMarketSlave.js 3 additions, 0 deletions

src/js/generateMarketSlave.js

with 22 additions and 4 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