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

72144069

Commit 72144069 authored 7 years ago by Pregmodder

Downloads
- Plain Diff

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

Pregmod v1018-74

See merge request !644

parents 01ebfbb3 c9fb2c9b

No related branches found

No related tags found

4 merge requests!843Delete Please.,!833Pregmod master,!758Pregmod master,!644Pregmod v1018-74

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/npc/databases/ddSlavesDatabase.tw 5 additions, 0 deletions

src/npc/databases/ddSlavesDatabase.tw
src/uncategorized/longSlaveDescription.tw 78 additions, 788 deletions

src/uncategorized/longSlaveDescription.tw
src/uncategorized/pRivalryActions.tw 2 additions, 2 deletions

src/uncategorized/pRivalryActions.tw
src/uncategorized/randomEventSelect.tw 5 additions, 0 deletions

src/uncategorized/randomEventSelect.tw
src/uncategorized/walkPast.tw 6 additions, 5 deletions

src/uncategorized/walkPast.tw
src/uncategorized/wardrobeUse.tw 11 additions, 6 deletions

src/uncategorized/wardrobeUse.tw
src/utility/descriptionWidgetsFlesh.tw 1328 additions, 551 deletions

src/utility/descriptionWidgetsFlesh.tw

with 1435 additions and 1352 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