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

0e5ff895

Commit 0e5ff895 authored 6 years ago by Pregmodder

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-master

parents 9b6263e8 2765371b

No related branches found

No related tags found

Loading

Changes 13

Expand all Hide whitespace changes

Inline Side-by-side

Showing

devNotes/twine JS.txt 23 additions, 14 deletions

devNotes/twine JS.txt
src/init/storyInit.tw 1 addition, 1 deletion

src/init/storyInit.tw
src/js/DefaultRules.tw 9 additions, 14 deletions

src/js/DefaultRules.tw
src/js/rulesAssistantOptions.tw 14 additions, 0 deletions

src/js/rulesAssistantOptions.tw
src/npc/newSlaveIncestSex.tw 36 additions, 36 deletions

src/npc/newSlaveIncestSex.tw
src/pregmod/csec.tw 4 additions, 4 deletions

src/pregmod/csec.tw
src/pregmod/widgets/seBirthWidgets.tw 3 additions, 3 deletions

src/pregmod/widgets/seBirthWidgets.tw
src/uncategorized/BackwardsCompatibility.tw 10 additions, 2 deletions

src/uncategorized/BackwardsCompatibility.tw
src/uncategorized/nextWeek.tw 1 addition, 1 deletion

src/uncategorized/nextWeek.tw
src/uncategorized/recETS.tw 1035 additions, 308 deletions

src/uncategorized/recETS.tw
src/uncategorized/recETSWorkaround.tw 0 additions, 720 deletions

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

src/uncategorized/seBirth.tw
src/uncategorized/universalRules.tw 9 additions, 6 deletions

src/uncategorized/universalRules.tw

with 1147 additions and 1111 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