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

e4f85d91

Commit e4f85d91 authored 6 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'ServantAndTrainingUpdate' into 'pregmod-master'

Skill System Expansion

See merge request pregmodfan/fc-pregmod!2131

parents 9d800fce 3a9df111

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/gui/Encyclopedia/encyclopedia.tw 25 additions, 23 deletions

src/gui/Encyclopedia/encyclopedia.tw
src/js/economyJS.tw 24 additions, 24 deletions

src/js/economyJS.tw
src/pregmod/widgets/pregmodWidgets.tw 11 additions, 2 deletions

src/pregmod/widgets/pregmodWidgets.tw
src/uncategorized/costs.tw 5 additions, 5 deletions

src/uncategorized/costs.tw
src/uncategorized/longSlaveDescription.tw 25 additions, 16 deletions

src/uncategorized/longSlaveDescription.tw
src/uncategorized/saServant.tw 9 additions, 0 deletions

src/uncategorized/saServant.tw
src/uncategorized/saServeThePublic.tw 12 additions, 4 deletions

src/uncategorized/saServeThePublic.tw
src/uncategorized/saWhore.tw 9 additions, 0 deletions

src/uncategorized/saWhore.tw
src/uncategorized/sellSlave.tw 61 additions, 1 deletion

src/uncategorized/sellSlave.tw
src/utility/assayWidgets.tw 40 additions, 0 deletions

src/utility/assayWidgets.tw
src/utility/slaveCreationWidgets.tw 3 additions, 3 deletions

src/utility/slaveCreationWidgets.tw

with 224 additions and 78 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