Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

fc-pregmod
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

5ddd6d64

Commit 5ddd6d64 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'small-fixes' into 'pregmod-master'

Fix phyiscal regimen, small fixes

Closes #2414

See merge request !8071

parents f00c8cd9 1e883bdf

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/interaction/siPhysicalRegimen.js 19 additions, 18 deletions

src/interaction/siPhysicalRegimen.js
src/markets/specificMarkets/schoolFutanari.js 7 additions, 7 deletions

src/markets/specificMarkets/schoolFutanari.js
src/npc/databases/dfSlavesDatabase.js 1 addition, 1 deletion

src/npc/databases/dfSlavesDatabase.js
src/npc/generate/newSlaveIntro.js 2 additions, 2 deletions

src/npc/generate/newSlaveIntro.js

with 29 additions and 28 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