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

8422365f

Commit 8422365f authored 6 years ago by deepmurk

Downloads
- Plain Diff

Merge remote-tracking branch 'MEGAMASTER/Pregmodder-pregmod-master-patch-12152' into pregmod-master

parents d54dc688 48ef1c7e

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

devNotes/VersionChangeLog-Premod+LoliMod.txt 12 additions, 0 deletions

devNotes/VersionChangeLog-Premod+LoliMod.txt
devNotes/twine JS.txt 1 addition, 1 deletion

devNotes/twine JS.txt
src/config/start.tw 6 additions, 0 deletions

src/config/start.tw
src/js/rulesAssistantOptions.tw 1 addition, 1 deletion

src/js/rulesAssistantOptions.tw
src/player/actions/fEmbrace.tw 2 additions, 4 deletions

src/player/actions/fEmbrace.tw
src/pregmod/fMarry.tw 16 additions, 10 deletions

src/pregmod/fMarry.tw
src/pregmod/fPat.tw 1 addition, 1 deletion

src/pregmod/fPat.tw
src/uncategorized/newSlaveIntro.tw 2 additions, 2 deletions

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

src/uncategorized/saLongTermEffects.tw
src/uncategorized/seExpiration.tw 108 additions, 121 deletions

src/uncategorized/seExpiration.tw

with 150 additions and 141 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