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

.eslintrc.json

js/003-data/gameVariableData.js

src/003-assets/CSS/tabs.css

src/004-base/facility.js

src/004-base/proxies.js

src/004-base/specialSlavesProxy.js

src/data/backwardsCompatibility/backwardsCompatibility.js

src/endWeek/endWeek.js

src/endWeek/saPorn.js

src/facilities/farmyard/farmyard.tw

src/facilities/farmyard/farmyardLab.tw

src/facilities/penthouse/penthouseFramework.js

src/facilities/pit/pitFramework.js

src/gui/css/mainStyleSheet.css

src/interaction/slaveInteract.js

src/js/assignJS.js

src/js/slaveListing.js

src/js/utilsFC.js

src/npc/interaction/passage/matchmaking.tw

src/pregmod/fatGraftingWorkaround.tw