Merge pull request #2345 from hornygranny/weakbullet

Weakbullet damage change
This commit is contained in:
fleure
2014-01-14 10:41:34 -08:00
2 changed files with 9 additions and 3 deletions
@@ -29,7 +29,7 @@
/obj/item/ammo_casing/c38
desc = "A .38 bullet casing."
caliber = "38"
projectile_type = /obj/item/projectile/bullet/weakbullet
projectile_type = /obj/item/projectile/bullet/weakbullet2
/obj/item/ammo_casing/c10mm
@@ -8,7 +8,13 @@
/obj/item/projectile/bullet/weakbullet
damage = 10
damage = 5
stun = 5
weaken = 5
/obj/item/projectile/bullet/weakbullet2
damage = 15
stun = 5
weaken = 5
@@ -113,4 +119,4 @@
/obj/item/projectile/bullet/neurotoxin/on_hit(var/atom/target, var/blocked = 0)
if(isalien(target))
return 0
..() // Execute the rest of the code.
..() // Execute the rest of the code.