From 07abc91e8e8e7a989e7db049ef6a407c7553c0a3 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sun, 15 Jun 2014 20:28:34 -0400 Subject: [PATCH] Bullets are now properly sharp Conflicts: code/modules/projectiles/projectile/bullets.dm --- code/modules/projectiles/projectile/bullets.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 8a9df9ad300..a8bece1641e 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -6,6 +6,7 @@ nodamage = 0 flag = "bullet" embed = 1 + sharp = 1 on_hit(var/atom/target, var/blocked = 0) if (..(target, blocked)) @@ -24,6 +25,7 @@ stun = 5 weaken = 5 embed = 0 + sharp = 0 /obj/item/projectile/bullet/weakbullet/booze embed = 0 @@ -84,6 +86,7 @@ /obj/item/projectile/bullet/burstbullet//I think this one needs something for the on hit name = "exploding bullet" damage = 20 + edge = 1 /obj/item/projectile/bullet/stunshot @@ -92,6 +95,8 @@ stun = 10 weaken = 10 stutter = 10 + embed = 0 + sharp = 0 /obj/item/projectile/bullet/a762 damage = 35