From 52f789a75b113b8d44ba4a1cd05b75c3d9c07552 Mon Sep 17 00:00:00 2001 From: Screemonster Date: Mon, 23 Oct 2017 04:26:44 +0100 Subject: [PATCH] fixes exterior shields putting shields EVERYWHERE --- code/modules/shieldgen/emergency_shield.dm | 1 - code/modules/shieldgen/shield_gen_external.dm | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm index 6bf1ea58ef6..b67e6f70a2f 100644 --- a/code/modules/shieldgen/emergency_shield.dm +++ b/code/modules/shieldgen/emergency_shield.dm @@ -141,7 +141,6 @@ idle_power_usage = 0 var/global/list/blockedturfs = list( /turf/space, - /turf/simulated/open, /turf/simulated/floor/outdoors, ) diff --git a/code/modules/shieldgen/shield_gen_external.dm b/code/modules/shieldgen/shield_gen_external.dm index 2d7dd383d95..27b1def2714 100644 --- a/code/modules/shieldgen/shield_gen_external.dm +++ b/code/modules/shieldgen/shield_gen_external.dm @@ -5,7 +5,6 @@ name = "hull shield generator" var/global/list/blockedturfs = list( /turf/space, - /turf/simulated/open, /turf/simulated/floor/outdoors, ) /obj/machinery/shield_gen/external/New() @@ -24,6 +23,8 @@ T = locate(gen_turf.x + x_offset, gen_turf.y + y_offset, gen_turf.z) if (is_type_in_list(T,blockedturfs)) //check neighbors of T - if (locate(/turf/simulated/) in orange(1, T)) - out += T + for(var/i in orange(1, T)) + if(istype(i, /turf/simulated) && !is_type_in_list(i,blockedturfs)) + out += T + break return out \ No newline at end of file