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

41ac3b14

Commit 41ac3b14 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-dev

parents 7b97a99c a10f11b5

No related branches found

No related tags found

Loading

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/arcologyBuilding/shops.js 40 additions, 35 deletions

src/arcologyBuilding/shops.js
src/events/RESS/devotedEducated.js 150 additions, 0 deletions

src/events/RESS/devotedEducated.js
src/events/RESS/kitchenMolestation.js 215 additions, 0 deletions

src/events/RESS/kitchenMolestation.js
src/events/randomEvent.js 2 additions, 0 deletions

src/events/randomEvent.js
src/js/eventSelectionJS.js 0 additions, 20 deletions

src/js/eventSelectionJS.js
src/js/slaveSummaryHelpers.js 2 additions, 0 deletions

src/js/slaveSummaryHelpers.js
src/uncategorized/RESS.tw 1 addition, 245 deletions

src/uncategorized/RESS.tw

with 410 additions and 300 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