Fixes #6355

Not sure why it was commented it out, but it seems to be the cause of
the layer issues.
Fixes #6925

Fixes misnamed icon states in the dmi.
Fix emergency shields activating without being turned on
Merge pull request #6936 from GinjaNinja32/shieldfix

Fix emergency shields activating without being turned on
Merge pull request #6926 from mwerezak/pipe-layer

Fixes #6355
Merge pull request #6930 from mwerezak/robot-eyes

Fixes #6925
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Merge pull request #117 from Ishap/master

They see me mergin