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

65f488d3

Commit 65f488d3 authored 7 years ago by Pregmodder

Downloads
- Plain Diff

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

Pregmod v1010-7

See merge request !255

parents 99f696c1 0af10740

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 1 addition, 0 deletions

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

src/init/storyInit.tw
src/npc/acquisition.tw 61 additions, 2 deletions

src/npc/acquisition.tw
src/uncategorized/generateXXSlave.tw 2 additions, 2 deletions

src/uncategorized/generateXXSlave.tw
src/uncategorized/generateXYSlave.tw 2 additions, 2 deletions

src/uncategorized/generateXYSlave.tw
src/uncategorized/newSlaveIntro.tw 2 additions, 0 deletions

src/uncategorized/newSlaveIntro.tw
src/uncategorized/randomNonindividualEvent.tw 3 additions, 0 deletions

src/uncategorized/randomNonindividualEvent.tw
src/uncategorized/reRecruit.tw 43 additions, 1 deletion

src/uncategorized/reRecruit.tw
src/uncategorized/shops.tw 4 additions, 4 deletions

src/uncategorized/shops.tw
src/uncategorized/slaveAssignmentsReport.tw 1 addition, 0 deletions

src/uncategorized/slaveAssignmentsReport.tw
src/utility/artWidgets.tw 1 addition, 1 deletion

src/utility/artWidgets.tw

with 122 additions and 14 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