Merge branch 'master' into RESS-events-to-js-diet-block

devNotes/Extended Family Mode Explained.txt

js/003-data/careers.js

js/003-data/gameVariableData.js

src/005-passages/managePassages.js

src/005-passages/optionsPassages.js

src/Mods/Catmod/events/CMRESS/lazyCat.js

src/Mods/SecExp/buildings/secBarracks.tw

src/Mods/SecExp/js/authorityReport.js

src/Mods/SpecialForce/FirebaseTour.js

src/Mods/SpecialForce/Proposal.js

src/descriptions/arcologyDescription.js

src/endWeek/economics/corporationDevelopments.js

src/endWeek/saBeYourHeadGirl.js

src/endWeek/saLongTermMentalEffects.js

src/endWeek/saLongTermPhysicalEffects.js

src/endWeek/saNanny.js

src/endWeek/saServant.js

src/endWeek/saServeThePublic.js

src/endWeek/saWhore.js

src/events/PESS/pessMadamStrategy.js