Emergency Shield Fix (#10910)

This commit is contained in:
Geeves
2021-01-07 10:03:01 +01:00
committed by GitHub
parent 5c7350bd0d
commit dc17cc8aa4
2 changed files with 9 additions and 1 deletions
+3 -1
View File
@@ -178,10 +178,12 @@
/obj/machinery/shieldgen/proc/create_shields()
for(var/T in RANGE_TURFS(2, src))
var/turf/target_tile = T
if(locate(/obj/machinery/shield) in target_tile)
continue
var/obj/item/tape/engineering/E = locate() in target_tile
if(E?.shield_marker)
deploy_shield(target_tile)
else if(istype(target_tile,/turf/space) || istype(target_tile,/turf/simulated/open) || istype(target_tile,/turf/unsimulated/floor/asteroid/ash) || istype(target_tile,/turf/simulated/floor/airless) && !(locate(/obj/machinery/shield) in target_tile))
else if(istype(target_tile,/turf/space) || istype(target_tile,/turf/simulated/open) || istype(target_tile,/turf/unsimulated/floor/asteroid/ash) || istype(target_tile,/turf/simulated/floor/airless))
if(malfunction && prob(33) || !malfunction)
deploy_shield(target_tile)
@@ -0,0 +1,6 @@
author: Geeves
delete-after: True
changes:
- bugfix: "Emergency shield generators no longer infinitely stack shields when you use tape."