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

d0df904b

Commit d0df904b authored 7 years ago by Pregmodder

Downloads
- Plain Diff

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

Pregmod v1009-30

See merge request !244

parents 5c993463 037429ab

No related branches found

No related tags found

4 merge requests!843Delete Please.,!833Pregmod master,!758Pregmod master,!244Pregmod v1009-30

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/gui/Encyclopedia/encyclopedia.tw 1 addition, 0 deletions

src/gui/Encyclopedia/encyclopedia.tw
src/init/storyInit.tw 89 additions, 89 deletions

src/init/storyInit.tw
src/pregmod/assistantAppearancePackTwo.tw 67 additions, 0 deletions

src/pregmod/assistantAppearancePackTwo.tw
src/pregmod/widgets/pregmodWidgets.tw 5 additions, 1 deletion

src/pregmod/widgets/pregmodWidgets.tw
src/uncategorized/assistantEvents.tw 0 additions, 64 deletions

src/uncategorized/assistantEvents.tw
src/uncategorized/personalAssistantAppearance.tw 51 additions, 62 deletions

src/uncategorized/personalAssistantAppearance.tw
src/uncategorized/personalAssistantOptions.tw 15 additions, 14 deletions

src/uncategorized/personalAssistantOptions.tw
src/uncategorized/randomNonindividualEvent.tw 2 additions, 0 deletions

src/uncategorized/randomNonindividualEvent.tw
src/uncategorized/saChoosesOwnJob.tw 1 addition, 1 deletion

src/uncategorized/saChoosesOwnJob.tw
src/uncategorized/saRelationships.tw 12 additions, 12 deletions

src/uncategorized/saRelationships.tw
src/utility/raWidgets.tw 10 additions, 9 deletions

src/utility/raWidgets.tw

with 253 additions and 252 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