Merge pull request #4789 from Citadel-Station-13/upstream-merge-34301

[MIRROR] Harvesters now normally attack those with NODISMEMBER species
This commit is contained in:
deathride58
2018-01-12 17:48:24 +00:00
committed by GitHub

View File

@@ -318,6 +318,11 @@
/mob/living/simple_animal/hostile/construct/harvester/AttackingTarget()
if(iscarbon(target))
if(ishuman(target))
var/mob/living/carbon/human/H = target
if(H.dna && H.dna.species)
if(NODISMEMBER in H.dna.species.species_traits)
return ..() //ATTACK!
var/mob/living/carbon/C = target
var/list/parts = list()
var/undismembermerable_limbs = 0