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

4067f1d3

Commit 4067f1d3 authored 5 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'pregmod-dev' into 'pregmod-master'

fixes + fs work

See merge request !4926

parents 4b4cd1c9 cb4b3d46

No related branches found

No related tags found

1 merge request!4926fixes + fs work

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

src/js/DefaultRules.js 1 addition, 1 deletion

src/js/DefaultRules.js
src/js/rulesAutosurgery.js 3 additions, 3 deletions

src/js/rulesAutosurgery.js
src/js/slaveStatsChecker.js 11 additions, 0 deletions

src/js/slaveStatsChecker.js
src/uncategorized/barracks.tw 8 additions, 0 deletions

src/uncategorized/barracks.tw
src/uncategorized/brothel.tw 8 additions, 0 deletions

src/uncategorized/brothel.tw
src/uncategorized/brothelAdvertisement.tw 8 additions, 0 deletions

src/uncategorized/brothelAdvertisement.tw
src/uncategorized/club.tw 16 additions, 0 deletions

src/uncategorized/club.tw
src/uncategorized/clubAdvertisement.tw 8 additions, 0 deletions

src/uncategorized/clubAdvertisement.tw
src/uncategorized/dairy.tw 3 additions, 0 deletions

src/uncategorized/dairy.tw
src/uncategorized/pCitizensAndCivilians.tw 44 additions, 0 deletions

src/uncategorized/pCitizensAndCivilians.tw
src/uncategorized/pPeacekeepersInfluence.tw 3 additions, 0 deletions

src/uncategorized/pPeacekeepersInfluence.tw
src/uncategorized/peConcubineInterview.tw 10 additions, 0 deletions

src/uncategorized/peConcubineInterview.tw

with 123 additions and 4 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