Allows the use of stun weapons to show up in autopsies

This commit is contained in:
mwerezak
2014-07-31 17:01:06 -04:00
parent ecd7df9628
commit 5b90e4afc6
3 changed files with 5 additions and 6 deletions
@@ -57,13 +57,12 @@ emp_act
return -1 // complete projectile permutation
//BEGIN BOOK'S TASER NERF.
//Tasers
if(istype(P, /obj/item/projectile/beam/stun))
stun_effect_act(0, P.agony, def_zone)
stun_effect_act(0, P.agony, def_zone, P)
src <<"\red You have been hit by [P]!"
del P
return
//END TASER NERF
//Shrapnel
if (P.damage_type == BRUTE)
+2 -2
View File
@@ -66,7 +66,7 @@
return absorb
//Handles the effects of "stun" weapons
/mob/living/proc/stun_effect_act(var/stun_amount, var/agony_amount, var/def_zone)
/mob/living/proc/stun_effect_act(var/stun_amount, var/agony_amount, var/def_zone, var/used_weapon=null)
flash_pain()
if (stun_amount)
@@ -76,7 +76,7 @@
apply_effect(EYE_BLUR, stun_amount)
if (agony_amount)
apply_effect(agony_amount, AGONY,0)
apply_damage(agony_amount, HALLOSS, def_zone, 0, used_weapon)
apply_effect(STUTTER, agony_amount/10)
apply_effect(EYE_BLUR, agony_amount/10)