shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moves tesla_ignore from var on /mob/living to secondary flag

Browse Source
This commit is contained in:
CitadelStationBot
2017-04-17 09:45:30 -05:00
parent 21827263f5
commit dd76874f1c
7 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/tesla/energy_ball.dm
+1 -1
View File
@@ -203,7 +203,7 @@ GLOBAL_LIST_INIT(blacklisted_tesla_types, typecacheof(list(/obj/machinery/atmosp
else if(isliving(A))
var/dist = get_dist(source, A)
var/mob/living/L = A
if(dist <= zap_range && (dist < closest_dist || !closest_mob) && L.stat != DEAD && !L.tesla_ignore)
if(dist <= zap_range && (dist < closest_dist || !closest_mob) && L.stat != DEAD && !HAS_SECONDARY_FLAG(L, TESLA_IGNORE))
closest_mob = L
closest_atom = A
closest_dist = dist