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

533a6dbf

Commit 533a6dbf authored 4 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'activeSlave-marry-fixes' into 'pregmod-master'

remove more activeSlave

Closes #2324

See merge request pregmodfan/fc-pregmod!7902

parents c60f8e70 bf528710

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/npc/agent/agentCompany.tw 10 additions, 10 deletions

src/npc/agent/agentCompany.tw
src/npc/interaction/passage/fMarry.tw 1 addition, 2 deletions

src/npc/interaction/passage/fMarry.tw
src/npc/interaction/passage/matchmaking.tw 0 additions, 1 deletion

src/npc/interaction/passage/matchmaking.tw
src/societies/aztec/slaveSacrifice.tw 175 additions, 175 deletions

src/societies/aztec/slaveSacrifice.tw

with 186 additions and 188 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