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

2c082592

Commit 2c082592 authored 5 years ago by Pregmodder

Downloads
- Plain Diff

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

Tiredness tweaks + farmyard tiredness

Closes #1651

See merge request !6509

parents bdbbab12 c1b076f4

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/endWeek/healthFunctions.js 10 additions, 14 deletions

src/endWeek/healthFunctions.js
src/endWeek/saWorkAGloryHole.js 1 addition, 1 deletion

src/endWeek/saWorkAGloryHole.js
src/endWeek/saWorkTheFarm.js 19 additions, 1 deletion

src/endWeek/saWorkTheFarm.js
src/js/food.js 1 addition, 1 deletion

src/js/food.js
src/js/health.js 22 additions, 9 deletions

src/js/health.js
src/uncategorized/slaveInteract.tw 8 additions, 6 deletions

src/uncategorized/slaveInteract.tw

with 61 additions and 32 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