Skip to content

Commit

Permalink
E-Swords now have a chance to deflect projectiles when active.
Browse files Browse the repository at this point in the history
Added missing sprites for the ion rifle charges, and ion rifle on back sprites.

I still cannot into changelog

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2188 316c924e-a436-60f5-8080-3fe189b3f50e
  • Loading branch information
[email protected] committed Sep 13, 2011
1 parent 6cd53a0 commit 3de9c51
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 1 deletion.
9 changes: 9 additions & 0 deletions code/modules/mob/living/carbon/human/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@

/mob/living/carbon/human/bullet_act(A as obj, var/datum/organ/external/def_zone)
var/shielded = 0
var/parry = 0
//Preparing the var for grabbing the armor information, can't grab the values yet because we don't know what kind of bullet was used. --NEO

var/obj/item/projectile/P = A
Expand All @@ -213,6 +214,14 @@
show_message("\red Your shield blocks the blow!", 4)
return

for(var/obj/item/weapon/melee/energy/sword/B in src)
if (B.active)
parry = 1
B.active = 1
if ((parry))
if (prob(50 - round(P.damage / 3)))
visible_message("\red [src] deflects the shot with their blade!", 4)
return

for(var/obj/item/device/shield/S in src)
if (S.active)
Expand Down
2 changes: 1 addition & 1 deletion data/mode.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
traitor
extended
Binary file modified icons/mob/back.dmi
Binary file not shown.
Binary file modified icons/obj/gun.dmi
Binary file not shown.

0 comments on commit 3de9c51

Please sign in to comment.