Merge pull request #5213 from Citadel-Station-13/upstream-merge-35045

[MIRROR] Turrets now check borgs!
This commit is contained in:
LetterJay
2018-01-31 04:12:11 -06:00
committed by GitHub
3 changed files with 22 additions and 0 deletions
@@ -372,6 +372,17 @@
if(SA.stat || in_faction(SA)) //don't target if dead or in faction
continue
targets += SA
if(issilicon(A))
var/mob/living/silicon/sillycone = A
if(sillycone.stat || in_faction(sillycone))
continue
if(iscyborg(sillycone))
var/mob/living/silicon/robot/sillyconerobot = A
if(faction == "syndicate" && sillyconerobot.emagged == 1)
continue
targets += sillycone
if(iscarbon(A))
var/mob/living/carbon/C = A