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

53e48acb

Commit 53e48acb authored 4 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'move-SI-to-assume-AS-instead-of-activeSlave' into 'pregmod-master'

move SI to assume AS instead of activeSlave

Closes #2321

See merge request pregmodfan/fc-pregmod!7898

parents 0595cadf ccba07e9

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/facilities/nursery/nursery.tw 1 addition, 1 deletion

src/facilities/nursery/nursery.tw
src/interaction/main/mainLinks.js 1 addition, 1 deletion

src/interaction/main/mainLinks.js
src/interaction/slaveInteract.js 2 additions, 2 deletions

src/interaction/slaveInteract.js
src/js/slaveListing.js 1 addition, 1 deletion

src/js/slaveListing.js
src/npc/exportSlave.tw 6 additions, 2 deletions

src/npc/exportSlave.tw
src/npc/interaction/passage/fAnimalImpreg.tw 1 addition, 0 deletions

src/npc/interaction/passage/fAnimalImpreg.tw
src/npc/interaction/passage/matchmaking.tw 65 additions, 64 deletions

src/npc/interaction/passage/matchmaking.tw
src/pregmod/managePersonalAffairs.tw 9 additions, 1 deletion

src/pregmod/managePersonalAffairs.tw
src/uncategorized/costsReport.tw 1 addition, 1 deletion

src/uncategorized/costsReport.tw
src/uncategorized/costsReportSlaves.tw 1 addition, 1 deletion

src/uncategorized/costsReportSlaves.tw
src/uncategorized/slaveInteract.tw 0 additions, 1 deletion

src/uncategorized/slaveInteract.tw

with 88 additions and 75 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