cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-05-27 19:25:13 -04:00
committed by GitHub
parent a74d6c1703
commit 9bf9a05302
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/machinery/pointdefense.dm
View File

@@ -79,19 +79,9 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense)
var/list/turrets = list()
if(id_tag)
var/list/connected_z_levels = GetConnectedZlevels(get_z(src))
<<<<<<< HEAD
for(var/i = 1 to LAZYLEN(GLOB.pointdefense_turrets))
var/obj/machinery/pointdefense/PD = GLOB.pointdefense_turrets[i]
if(!(PD.id_tag == id_tag && get_z(PD) in connected_z_levels))
||||||| parent of da4837903c... Merge pull request #10433 from VOREStation/upstream-merge-8085
for(var/i = 1 to LAZYLEN(pointdefense_turrets))
var/obj/machinery/power/pointdefense/PD = pointdefense_turrets[i]
if(!(PD.id_tag == id_tag && get_z(PD) in connected_z_levels))
=======
for(var/i = 1 to LAZYLEN(pointdefense_turrets))
var/obj/machinery/power/pointdefense/PD = pointdefense_turrets[i]
if(!(PD.id_tag == id_tag && (get_z(PD) in connected_z_levels)))
>>>>>>> da4837903c... Merge pull request #10433 from VOREStation/upstream-merge-8085
continue
var/list/turret = list()
turret["id"] = "#[i]"