From 6835cbe9863f9286c8bc7695d43a97a19e700881 Mon Sep 17 00:00:00 2001
From: Menshin <overmenshin@yahoo.co.uk>
Date: Thu, 7 Mar 2019 13:35:41 +0100
Subject: [PATCH] Aligned grid_check event code with the power_failure one.
 Some code cleaning.

---
 code/__HELPERS/areas.dm           |  5 ++++
 code/game/gamemodes/events.dm     | 40 ++++++++++---------------------
 code/modules/events/grid_check.dm |  4 ++++
 3 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm
index 1f5b82f7bf1..ec669a49dd5 100644
--- a/code/__HELPERS/areas.dm
+++ b/code/__HELPERS/areas.dm
@@ -1,5 +1,10 @@
 #define BP_MAX_ROOM_SIZE 300
 
+GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/engineering, \
+															    /area/engine/supermatter, \
+															    /area/engine/atmospherics_engine, \
+															    /area/ai_monitored/turret_protected/ai))
+
 // Gets an atmos isolated contained space
 // Returns an associative list of turf|dirs pairs
 // The dirs are connected turfs in the same space
diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index cdc0ac89fbc..ef781c5ee36 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -5,28 +5,16 @@
 			continue
 		S.charge = 0
 		S.output_level = 0
-		S.output_attempt = 0
+		S.output_attempt = FALSE
 		S.update_icon()
 		S.power_change()
 
-	var/list/skipped_areas = list(/area/engine/engineering, /area/engine/supermatter, /area/engine/atmospherics_engine, /area/ai_monitored/turret_protected/ai)
-
-	for(var/area/A in world)
-		if( !A.requires_power || A.always_unpowered )
+	for(var/area/A in GLOB.the_station_areas)
+		if(!A.requires_power || A.always_unpowered )
+			continue
+		if(GLOB.typecache_powerfailure_safe_areas[A.type])
 			continue
 
-		var/skip = 0
-		for(var/area_type in skipped_areas)
-			if(istype(A,area_type))
-				skip = 1
-				break
-		if(A.contents)
-			for(var/atom/AT in A.contents)
-				if(!is_station_level(AT.z)) //Only check one, it's enough.
-					skip = 1
-				break
-		if(skip)
-			continue
 		A.power_light = FALSE
 		A.power_equip = FALSE
 		A.power_environ = FALSE
@@ -35,13 +23,7 @@
 	for(var/obj/machinery/power/apc/C in GLOB.apcs_list)
 		if(C.cell && is_station_level(C.z))
 			var/area/A = C.area
-
-			var/skip = 0
-			for(var/area_type in skipped_areas)
-				if(istype(A,area_type))
-					skip = 1
-					break
-			if(skip)
+			if(GLOB.typecache_powerfailure_safe_areas[A.type])
 				continue
 
 			C.cell.charge = 0
@@ -58,11 +40,13 @@
 			continue
 		S.charge = S.capacity
 		S.output_level = S.output_level_max
-		S.output_attempt = 1
+		S.output_attempt = TRUE
 		S.update_icon()
 		S.power_change()
-	for(var/area/A in world)
-		if(!istype(A, /area/space) && !istype(A, /area/shuttle))
+	for(var/area/A in GLOB.the_station_areas)
+		if(!A.requires_power || A.always_unpowered)
+			continue
+		if(!istype(A, /area/shuttle))
 			A.power_light = TRUE
 			A.power_equip = TRUE
 			A.power_environ = TRUE
@@ -76,7 +60,7 @@
 			continue
 		S.charge = S.capacity
 		S.output_level = S.output_level_max
-		S.output_attempt = 1
+		S.output_attempt = TRUE
 		S.update_icon()
 		S.power_change()
 
diff --git a/code/modules/events/grid_check.dm b/code/modules/events/grid_check.dm
index 8006d63b978..44984d3c02c 100644
--- a/code/modules/events/grid_check.dm
+++ b/code/modules/events/grid_check.dm
@@ -16,4 +16,8 @@
 	for(var/P in GLOB.apcs_list)
 		var/obj/machinery/power/apc/C = P
 		if(C.cell && is_station_level(C.z))
+			var/area/A = C.area
+			if(GLOB.typecache_powerfailure_safe_areas[A.type])
+				continue
+
 			C.energy_fail(rand(30,120))
\ No newline at end of file