From 6c874842e1f91102af52dbc59d26b7d3e4849639 Mon Sep 17 00:00:00 2001
From: GinjaNinja32 <ginjaninja32@gmail.com>
Date: Mon, 3 Nov 2014 18:48:03 +0000
Subject: [PATCH] Fix emergency shields activating without being turned on

---
 code/modules/shieldgen/emergency_shield.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm
index ee97416a13d..6eb33e7124e 100644
--- a/code/modules/shieldgen/emergency_shield.dm
+++ b/code/modules/shieldgen/emergency_shield.dm
@@ -201,6 +201,7 @@
 
 /obj/machinery/shieldgen/power_change()
 	..()
+	if(!active) return
 	if (stat & NOPOWER)
 		collapse_shields()
 	else