mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
[MIRROR] var/global/list -> GLOB. conversion (#11193)
Co-authored-by: Cameron Lennox <killer65311@gmail.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
6f8cbcf612
commit
2c9453b5c3
@@ -136,10 +136,6 @@
|
||||
var/check_delay = 60 //periodically recheck if we need to rebuild a shield
|
||||
use_power = USE_POWER_OFF
|
||||
idle_power_usage = 0
|
||||
var/global/list/blockedturfs = list(
|
||||
/turf/space,
|
||||
/turf/simulated/floor/outdoors,
|
||||
)
|
||||
|
||||
/obj/machinery/shieldgen/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -175,7 +171,7 @@
|
||||
|
||||
/obj/machinery/shieldgen/proc/create_shields()
|
||||
for(var/turf/target_tile in range(2, src))
|
||||
if (is_type_in_list(target_tile,blockedturfs) && !(locate(/obj/machinery/shield) in target_tile))
|
||||
if (is_type_in_list(target_tile,GLOB.shieldgen_blockedturfs) && !(locate(/obj/machinery/shield) in target_tile))
|
||||
if (malfunction && prob(33) || !malfunction)
|
||||
var/obj/machinery/shield/S = new/obj/machinery/shield(target_tile)
|
||||
deployed_shields += S
|
||||
|
||||
@@ -3,10 +3,6 @@
|
||||
|
||||
/obj/machinery/shield_gen/external
|
||||
name = "hull shield generator"
|
||||
var/global/list/blockedturfs = list(
|
||||
/turf/space,
|
||||
/turf/simulated/floor/outdoors,
|
||||
)
|
||||
|
||||
/obj/machinery/shield_gen/external/advanced
|
||||
name = "advanced hull shield generator"
|
||||
@@ -24,10 +20,10 @@
|
||||
for (var/x_offset = -field_radius; x_offset <= field_radius; x_offset++)
|
||||
for (var/y_offset = -field_radius; y_offset <= field_radius; y_offset++)
|
||||
T = locate(gen_turf.x + x_offset, gen_turf.y + y_offset, gen_turf.z)
|
||||
if (is_type_in_list(T,blockedturfs))
|
||||
if (is_type_in_list(T,GLOB.external_shield_gen_blockedturfs))
|
||||
//check neighbors of T
|
||||
for(var/i in orange(1, T))
|
||||
if(istype(i, /turf/simulated) && !is_type_in_list(i,blockedturfs))
|
||||
if(istype(i, /turf/simulated) && !is_type_in_list(i,GLOB.external_shield_gen_blockedturfs))
|
||||
out += T
|
||||
break
|
||||
return out
|
||||
|
||||
Reference in New Issue
Block a user