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

bfaaa9ec

Commit bfaaa9ec authored 7 years ago by Pregmodder

Downloads
- Plain Diff

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

Pregmod v1017-36

See merge request !478

parents 0457ff06 6457949d

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/pregmod/fSlaveFeed.tw 151 additions, 37 deletions

src/pregmod/fSlaveFeed.tw
src/pregmod/seFCTVshows.tw 4 additions, 4 deletions

src/pregmod/seFCTVshows.tw
src/pregmod/widgets/pregmodWidgets.tw 21 additions, 0 deletions

src/pregmod/widgets/pregmodWidgets.tw
src/uncategorized/dispensary.tw 66 additions, 38 deletions

src/uncategorized/dispensary.tw
src/uncategorized/futureSocities.tw 2 additions, 2 deletions

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

src/uncategorized/randomIndividualEvent.tw
src/uncategorized/saLongTermEffects.tw 17 additions, 0 deletions

src/uncategorized/saLongTermEffects.tw
src/uncategorized/saRules.tw 43 additions, 19 deletions

src/uncategorized/saRules.tw
src/uncategorized/slaveInteract.tw 6 additions, 0 deletions

src/uncategorized/slaveInteract.tw
src/utility/miscWidgets.tw 61 additions, 17 deletions

src/utility/miscWidgets.tw

with 372 additions and 118 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