Taser fix v.3.2

Now accounts for multiple layers of armor.

I've also commented out Vox stuff, while Zuhayr fixes it. Because, no compile.

I also fixed whistle.dm
This commit is contained in:
MisterBook
2013-06-05 19:37:29 -05:00
parent a34174e124
commit eab6f4fc44
7 changed files with 12 additions and 3 deletions

View File

@@ -23,8 +23,8 @@ emp_act
if(C.body_parts_covered & select_area.body_part) // Is that body part being targeted covered?
P.agony=P.agony*C.siemens_coefficient
visible_message("\red [src]'s [C.name] absorbs some of the shock from the [P.name]!</B></red>")
apply_effect(P.agony,AGONY,0)
del P
apply_effect(P.agony,AGONY,0)
del P
/* Commenting out new-old taser nerf.
if(C.siemens_coefficient == 0) //If so, is that clothing shock proof?
if(prob(deflectchance))

View File

@@ -444,9 +444,11 @@ proc/get_damage_icon_part(damage_state, body_part)
if("skrell")
race_icon = 'icons/mob/human_races/r_skrell.dmi'
deform_icon = 'icons/mob/human_races/r_def_skrell.dmi'
/*
if("vox")
race_icon = 'icons/mob/human_races/r_vox.dmi'
deform_icon = 'icons/mob/human_races/r_def_vox.dmi'
*/
else
race_icon = 'icons/mob/human_races/r_human.dmi'
deform_icon = 'icons/mob/human_races/r_def_human.dmi'

View File

@@ -144,8 +144,10 @@ datum/preferences
icobase = 'icons/mob/human_races/r_lizard.dmi'
if("Skrell")
icobase = 'icons/mob/human_races/r_skrell.dmi'
/*
if("Vox")
icobase = 'icons/mob/human_races/r_vox.dmi'
*/
else
icobase = 'icons/mob/human_races/r_human.dmi'
preview_icon = new /icon(icobase, "torso_[g]")

View File

@@ -740,8 +740,10 @@ obj/item/weapon/organ/New(loc, mob/living/carbon/human/H)
base = new('icons/mob/human_races/r_lizard.dmi')
if("skrell")
base = new('icons/mob/human_races/r_skrell.dmi')
/*
if("vox")
base = new('icons/mob/human_races/r_vox.dmi')
*/
else
base = new('icons/mob/human_races/r_human.dmi')
if(base)