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

589ce4fd

Commit 589ce4fd authored 4 years ago by Pregmodder

Downloads
- Plain Diff

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

parents f0282f90 47078de8

No related branches found

No related tags found

No related merge requests found

Changes 13

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/endWeek/saDrugs.js 9 additions, 9 deletions

src/endWeek/saDrugs.js
src/interaction/slaveInteract.js 2 additions, 2 deletions

src/interaction/slaveInteract.js
src/js/DefaultRules.js 2 additions, 2 deletions

src/js/DefaultRules.js
src/npc/interaction/fFeelings.tw 6 additions, 3 deletions

src/npc/interaction/fFeelings.tw
src/npc/interaction/passage/fMarry.tw 4 additions, 2 deletions

src/npc/interaction/passage/fMarry.tw
src/npc/startingGirls/startingGirls.tw 1 addition, 1 deletion

src/npc/startingGirls/startingGirls.tw
src/pregmod/pRaped.tw 61 additions, 61 deletions

src/pregmod/pRaped.tw
src/uncategorized/discardConfirm.tw 1 addition, 1 deletion

src/uncategorized/discardConfirm.tw
src/uncategorized/pHostageAcquisition.tw 1 addition, 1 deletion

src/uncategorized/pHostageAcquisition.tw
src/uncategorized/pRivalryActions.tw 1 addition, 1 deletion

src/uncategorized/pRivalryActions.tw
src/uncategorized/sellSlave.tw 495 additions, 495 deletions

src/uncategorized/sellSlave.tw
src/uncategorized/slaveSold.tw 144 additions, 145 deletions

src/uncategorized/slaveSold.tw
src/uncategorized/surgeryDegradation.tw 1 addition, 1 deletion

src/uncategorized/surgeryDegradation.tw

with 728 additions and 724 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