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

8a60c844

Commit 8a60c844 authored 7 years ago by Pregmodder

Downloads
- Plain Diff

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

Pregmod v1017-18

See merge request !447

parents 1c0ab4ea d2e57063

No related branches found

No related tags found

Loading

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/npc/takeoverTarget.tw 3 additions, 3 deletions

src/npc/takeoverTarget.tw
src/pregmod/generateChild.tw 2 additions, 2 deletions

src/pregmod/generateChild.tw
src/uncategorized/futureSocities.tw 3 additions, 109 deletions

src/uncategorized/futureSocities.tw
src/uncategorized/nextWeek.tw 1 addition, 1 deletion

src/uncategorized/nextWeek.tw
src/uncategorized/pHostageAcquisition.tw 59 additions, 7 deletions

src/uncategorized/pHostageAcquisition.tw
src/uncategorized/pRivalryActions.tw 662 additions, 37 deletions

src/uncategorized/pRivalryActions.tw
src/uncategorized/pRivalryHostage.tw 33 additions, 20 deletions

src/uncategorized/pRivalryHostage.tw
src/uncategorized/pRivalryVictory.tw 1 addition, 1 deletion

src/uncategorized/pRivalryVictory.tw
src/uncategorized/wardrobe.tw 8 additions, 1 deletion

src/uncategorized/wardrobe.tw
src/utility/descriptionWidgets.tw 18 additions, 0 deletions

src/utility/descriptionWidgets.tw

with 790 additions and 181 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