Stacks update.
Airlock construction update.
Quickfix and changelog.
Typo fix.
Conflict fix. I hope.
Punctuation fix.
Merge pull request #3143 from Segrain/bleeding-edge-freeze

Construction update.
Merged airlock assembly changes and ZAS changes, hopefully.
Merge branch 'feature' of https://github.com/Zuhayr/Baystation12