Merge branch 'master' of https://github.com/Baystation12/Baystation12
Merge branch 'master' of https://github.com/aztectornado/NSS-Phoenix
Removed emergency shuttle overlay thing
Reduced brightness on emergency lighting
Merge pull request #138 from Ishap/master

Modifications!