From cc3e40fef49b8a3eb34f9ab02a74f2f909789dbc Mon Sep 17 00:00:00 2001
From: ikarrus <ericgfwong@hotmail.com>
Date: Mon, 11 Aug 2014 08:48:37 -0600
Subject: [PATCH] Changed the area check to check for areas that can never be
 powered (Space, asteroid) instead of just checking the name

---
 code/game/area/areas.dm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 393e0217732..7dcdf0761b0 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -96,7 +96,7 @@
 	return 0
 
 /area/proc/firealert()
-	if(src.name == "Space") //no fire alarms in space
+	if(always_unpowered == 1) //no fire alarms in space/asteroid
 		return
 	if (!( src.fire ))
 		src.fire = 1
@@ -137,30 +137,26 @@
 	return
 
 /area/proc/burglaralert(var/obj/trigger)
-	if(src.name == "Space") //no burglar alarms in space
+	if(always_unpowered == 1) //no burglar alarms in space/asteroid
 		return
-
 	//Trigger alarm effect
 	var/RAcontents = area_contents(src)
 	for(var/area/related_areas in related)
 		related_areas.fire = 1
 		related_areas.updateicon()
 		related_areas.mouse_opacity = 0
-
 		//Lockdown airlocks
 		for(var/obj/machinery/door/airlock/DOOR in RAcontents)
 			DOOR.close()
 			if(DOOR.density)
 				DOOR.locked = 1
 				DOOR.update_icon()
-
 	//Alert silicons
 	var/list/cameras = list()
 	for (var/obj/machinery/camera/C in RAcontents)
 		cameras += C
 	for (var/mob/living/silicon/SILICON in player_list)
 		SILICON.triggerAlarm("Burglar", src, cameras, trigger)
-
 	//Cancel silicon alert after 1 minute
 	spawn(600)
 		for (var/mob/living/silicon/SILICON in player_list)