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

Merge pull request #4756 from Citadel-Station-13/upstream-merge-34168

Browse Source 
[MIRROR] Corrects runtime when shooting humans
This commit is contained in:
LetterJay
2018-01-11 15:16:16 -06:00
committed by GitHub
parent 36def519b2 218a823ac3
commit 76c423e65d
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/modules/mob/living/carbon/human/human_defense.dm
View File

@@ -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))