Baystation12/Baystation12 — pull request #6936 by GinjaNinja32 (2014-11-03 18:49:43+00:00)
Title: Fix emergency shields activating without being turned on

As in title.

Fixes #6935.