From bc7b34d369f1224b8df39d65b723b8fedc213889 Mon Sep 17 00:00:00 2001 From: Leo Date: Wed, 10 Jan 2018 20:04:22 -0200 Subject: [PATCH 1/2] Merge pull request #34168 from ShizCalev/dna-human-runtime Corrects runtime when shooting humans --- .../mob/living/carbon/human/human_defense.dm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index f52100b1c8..5a184331e9 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -32,13 +32,15 @@ return protection /mob/living/carbon/human/on_hit(obj/item/projectile/P) - dna.species.on_hit(P, src) + if(dna && dna.species) + dna.species.on_hit(P, src) /mob/living/carbon/human/bullet_act(obj/item/projectile/P, def_zone) - var/spec_return = dna.species.bullet_act(P, src) - if(spec_return) - return spec_return + if(dna && dna.species) + var/spec_return = dna.species.bullet_act(P, src) + if(spec_return) + return spec_return if(mind) if(mind.martial_art && mind.martial_art.deflection_chance) //Some martial arts users can deflect projectiles! @@ -115,9 +117,10 @@ return FALSE /mob/living/carbon/human/hitby(atom/movable/AM, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE) - var/spec_return = dna.species.spec_hitby(AM, src) - if(spec_return) - return spec_return + if(dna && dna.species) + var/spec_return = dna.species.spec_hitby(AM, src) + if(spec_return) + return spec_return var/obj/item/I var/throwpower = 30 if(istype(AM, /obj/item))