cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 01:57:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Aligned grid_check event code with the power_failure one.

Browse Source 
Some code cleaning.
This commit is contained in:
Menshin
2019-03-07 13:35:41 +01:00
parent fdbecf4742
commit 6835cbe986
3 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/__HELPERS/areas.dm
View File

@@ -1,5 +1,10 @@
#define BP_MAX_ROOM_SIZE 300 #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 // Gets an atmos isolated contained space
// Returns an associative list of turf|dirs pairs // Returns an associative list of turf|dirs pairs
// The dirs are connected turfs in the same space // The dirs are connected turfs in the same space

40
code/game/gamemodes/events.dm
View File

@@ -5,28 +5,16 @@
continue continue
S.charge = 0 S.charge = 0
S.output_level = 0 S.output_level = 0
S.output_attempt = 0 S.output_attempt = FALSE
S.update_icon() S.update_icon()
S.power_change() 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 GLOB.the_station_areas)
if(!A.requires_power || A.always_unpowered )
for(var/area/A in world) continue
if( !A.requires_power || A.always_unpowered ) if(GLOB.typecache_powerfailure_safe_areas[A.type])
continue 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_light = FALSE
A.power_equip = FALSE A.power_equip = FALSE
A.power_environ = FALSE A.power_environ = FALSE
@@ -35,13 +23,7 @@
for(var/obj/machinery/power/apc/C in GLOB.apcs_list) for(var/obj/machinery/power/apc/C in GLOB.apcs_list)
if(C.cell && is_station_level(C.z)) if(C.cell && is_station_level(C.z))
var/area/A = C.area var/area/A = C.area
if(GLOB.typecache_powerfailure_safe_areas[A.type])
var/skip = 0
for(var/area_type in skipped_areas)
if(istype(A,area_type))
skip = 1
break
if(skip)
continue continue
C.cell.charge = 0 C.cell.charge = 0
@@ -58,11 +40,13 @@
continue continue
S.charge = S.capacity S.charge = S.capacity
S.output_level = S.output_level_max S.output_level = S.output_level_max
S.output_attempt = 1 S.output_attempt = TRUE
S.update_icon() S.update_icon()
S.power_change() S.power_change()
for(var/area/A in world) for(var/area/A in GLOB.the_station_areas)
if(!istype(A, /area/space) && !istype(A, /area/shuttle)) if(!A.requires_power || A.always_unpowered)
continue
if(!istype(A, /area/shuttle))
A.power_light = TRUE A.power_light = TRUE
A.power_equip = TRUE A.power_equip = TRUE
A.power_environ = TRUE A.power_environ = TRUE
@@ -76,7 +60,7 @@
continue continue
S.charge = S.capacity S.charge = S.capacity
S.output_level = S.output_level_max S.output_level = S.output_level_max
S.output_attempt = 1 S.output_attempt = TRUE
S.update_icon() S.update_icon()
S.power_change() S.power_change()

4
code/modules/events/grid_check.dm
View File

@@ -16,4 +16,8 @@
for(var/P in GLOB.apcs_list) for(var/P in GLOB.apcs_list)
var/obj/machinery/power/apc/C = P var/obj/machinery/power/apc/C = P
if(C.cell && is_station_level(C.z)) 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)) C.energy_fail(rand(30,120))