From 775728e20e25de00277fac9dfc7c8ffa8b49a5cb Mon Sep 17 00:00:00 2001 From: Hornygranny Date: Mon, 13 Jan 2014 11:08:19 -0800 Subject: [PATCH] Beanbag damage lowered. .38 damage increased. --- code/modules/projectiles/ammunition/bullets.dm | 2 +- code/modules/projectiles/projectile/bullets.dm | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 70e70c31b1f..facac4e2206 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -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 diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index d2e0a4063f3..03191e9896d 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -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 @@ -60,6 +66,7 @@ name = "incendiary bullet" damage = 20 + /obj/item/projectile/bullet/incendiary/on_hit(var/atom/target, var/blocked = 0) if(istype(target, /mob/living/carbon)) var/mob/living/carbon/M = target