From 429237d06c9288c268c202c7bbdb921462e5b00e Mon Sep 17 00:00:00 2001 From: Leo Date: Fri, 12 Jan 2018 11:05:18 -0200 Subject: [PATCH 1/2] Merge pull request #34301 from kevinz000/patch-428 Harvesters now normally attack those with NODISMEMBER species --- code/modules/mob/living/simple_animal/constructs.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index f40a3a8b95..0a3061cacc 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -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