Merge branch 'finish-generic' into 'pregmod-master'

src/events/nonRandom/arcologyNaming.js

src/events/nonRandom/militia.js

src/events/nonRandom/shootInvitation.js

src/events/nonRandom/shootResult.js

src/events/nonRandom/slaveFood.js

src/events/nonRandom/stripClubAftermath.js

src/events/nonRandom/stripClubClosing.js

src/events/nonRandomEvent.js

src/uncategorized/genericPlotEvents.tw