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

css/events/events.css

css/facilities/farmyard.css

css/general/formatting.css

css/manage/budget.css

devTools/types/FC/facilities.d.ts

js/003-data/clothes/001-slaveWearData.js

js/003-data/gameVariableData.js

src/004-base/facilityFramework.js

src/005-passages/eventsPassages.js

src/005-passages/facilitiesPassages.js

src/Mods/SecExp/buildings/riotControlCenter.tw

src/Mods/SecExp/buildings/secBarracks.tw

src/Mods/SecExp/edicts.tw

src/Mods/SecExp/events/attackHandler.tw

src/Mods/SecExp/events/attackOptions.js

src/Mods/SecExp/events/attackReport.js

src/Mods/SecExp/events/conflictHandler.js

src/Mods/SecExp/events/rebellionHandler.tw

src/Mods/SecExp/events/rebellionOptions.tw

src/Mods/SecExp/events/rebellionReport.js