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

20fd8ba3

Commit 20fd8ba3 authored 7 years ago by fcanon

Downloads
- Plain Diff

Merge branch 'pm-master' into pm-contrib

# Conflicts:
#	src/uncategorized/slaveInteract.tw
#	src/uncategorized/slaveSummary.tw

parents 06dc20f0 c88c069c

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

sanityCheck 4 additions, 0 deletions

sanityCheck
src/init/storyInit.tw 0 additions, 5 deletions

src/init/storyInit.tw
src/npc/databases/dSlavesDatabase.tw 1 addition, 1 deletion

src/npc/databases/dSlavesDatabase.tw
src/uncategorized/buySlaves.tw 3 additions, 3 deletions

src/uncategorized/buySlaves.tw
src/uncategorized/endWeek.tw 1 addition, 1 deletion

src/uncategorized/endWeek.tw
src/uncategorized/nextWeek.tw 4 additions, 4 deletions

src/uncategorized/nextWeek.tw
src/uncategorized/resMove.tw 5 additions, 5 deletions

src/uncategorized/resMove.tw
src/uncategorized/resSale.tw 2 additions, 2 deletions

src/uncategorized/resSale.tw
src/uncategorized/saLongTermEffects.tw 1 addition, 1 deletion

src/uncategorized/saLongTermEffects.tw
src/uncategorized/seBirth.tw 2 additions, 2 deletions

src/uncategorized/seBirth.tw
src/uncategorized/slaveInteract.tw 1 addition, 1 deletion

src/uncategorized/slaveInteract.tw
src/uncategorized/slaveSummary.tw 1 addition, 1 deletion

src/uncategorized/slaveSummary.tw
src/utility/assayWidgets.tw 1 addition, 1 deletion

src/utility/assayWidgets.tw
src/utility/descriptionWidgets.tw 2 additions, 2 deletions

src/utility/descriptionWidgets.tw

with 28 additions and 29 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