Merge branch 'upgrade' into 'pregmod-master'

devTools/types/FC/facilities.d.ts

src/004-base/facilityFramework.js

src/facilities/arcade/arcade.js

src/facilities/brothel/brothel.js

src/facilities/cellblock/cellblock.js

src/facilities/clinic/clinic.js

src/facilities/club/club.js

src/facilities/farmyard/farmyard.js

src/facilities/masterSuite/masterSuite.js

src/facilities/schoolroom/schoolroom.js

src/facilities/servantsQuarters/servantsQuarters.js

src/facilities/spa/spa.js

src/js/upgrade.js