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

932ff790

Commit 932ff790 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

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

parents bfc0d9b1 8f78a5be

No related branches found

No related tags found

Loading

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 3 additions, 0 deletions

.gitignore
js/003-data/slaveWearData.js 234 additions, 55 deletions

js/003-data/slaveWearData.js
src/endWeek/saChoosesOwnClothes.js 53 additions, 79 deletions

src/endWeek/saChoosesOwnClothes.js
src/endWeek/saRecruitGirls.js 3 additions, 2 deletions

src/endWeek/saRecruitGirls.js
src/endWeek/saSocialEffects.js 6 additions, 3 deletions

src/endWeek/saSocialEffects.js
src/interaction/siWardrobe.js 160 additions, 97 deletions

src/interaction/siWardrobe.js
src/js/itemAvailability.js 19 additions, 4 deletions

src/js/itemAvailability.js
src/npc/startingGirls/startingGirls.js 17 additions, 5 deletions

src/npc/startingGirls/startingGirls.js

with 495 additions and 245 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