Merge branch 'fix2' into 'pregmod-master'

README.md

devTools/types/FC/gameState.d.ts

js/rulesAssistant/conditionEditorSimple.js

src/facilities/salon/salonPassage.js

src/facilities/surgery/geneticQuirks.js

src/futureSocieties/fsDecoration.js

src/gui/Encyclopedia/encyclopedia.js

src/gui/Encyclopedia/encyclopediaFacilites.js

src/gui/Encyclopedia/encyclopediaFutureSocities.js

src/gui/Encyclopedia/encyclopediaParaphilias.js

src/gui/options/options.js

src/gui/options/optionsGroup.js