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

b62bac83

Commit b62bac83 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

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

parents 57b271fc 1911b6f2

No related branches found

No related tags found

Loading

Changes 14

Expand all Hide whitespace changes

Inline Side-by-side

Showing

docker/Dockerfile 29 additions, 0 deletions

docker/Dockerfile
src/Corporation/manageCorporation.tw 1 addition, 1 deletion

src/Corporation/manageCorporation.tw
src/endWeek/saDrugs.js 1 addition, 1 deletion

src/endWeek/saDrugs.js
src/endWeek/saServeYourOtherSlaves.js 9 additions, 1 deletion

src/endWeek/saServeYourOtherSlaves.js
src/events/RECI/milf.js 3 additions, 3 deletions

src/events/RECI/milf.js
src/events/RESS/cockfeederResistance.js 140 additions, 0 deletions

src/events/RESS/cockfeederResistance.js
src/events/RESS/suppositoryResistance.js 162 additions, 0 deletions

src/events/RESS/suppositoryResistance.js
src/events/randomEvent.js 10 additions, 6 deletions

src/events/randomEvent.js
src/interaction/slaveInteract.js 17 additions, 27 deletions

src/interaction/slaveInteract.js
src/js/eventSelectionJS.js 0 additions, 34 deletions

src/js/eventSelectionJS.js
src/npc/generate/generateNewSlaveJS.js 16 additions, 19 deletions

src/npc/generate/generateNewSlaveJS.js
src/uncategorized/RESS.tw 1 addition, 103 deletions

src/uncategorized/RESS.tw
src/uncategorized/recETS.tw 4 additions, 3 deletions

src/uncategorized/recETS.tw
src/uncategorized/saRecruitGirls.tw 1 addition, 1 deletion

src/uncategorized/saRecruitGirls.tw

with 394 additions and 199 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