Merge branch 'arcocc' into 'pregmod-master'

src/004-base/facility.js

src/arcologyBuilding/base.js

src/arcologyBuilding/manufacturing.js

src/arcologyBuilding/markets.js

src/arcologyBuilding/penthouse.js

src/facilities/armory/armoryFramework.js