Merge branch 'gun' into bleeding-edge-freeze

This commit is contained in:
Chinsky
2013-03-12 08:46:07 +04:00

View File

@@ -6,6 +6,10 @@
nodamage = 0
flag = "bullet"
on_hit(var/atom/target, var/blocked = 0)
if (..(target, blocked))
var/mob/living/L = target
shake_camera(L, 3, 2)
/obj/item/projectile/bullet/weakbullet
damage = 10