Merge pull request #11259 from mwerezak/rubber-bullets

Rubber bullets and beanbags now check melee armour instead of bullet armour
This commit is contained in:
PsiOmegaDelta
2015-10-09 12:42:44 +02:00
2 changed files with 23 additions and 1 deletions
@@ -110,6 +110,7 @@
/obj/item/projectile/bullet/pistol/rubber //"rubber" bullets
name = "rubber bullet"
check_armour = "melee"
damage = 10
agony = 40
embed = 0
@@ -123,6 +124,7 @@
/obj/item/projectile/bullet/shotgun/beanbag //because beanbags are not bullets
name = "beanbag"
check_armour = "melee"
damage = 20
agony = 60
embed = 0
@@ -196,4 +198,4 @@
/obj/item/projectile/bullet/shotgun/practice
name = "practice"
damage = 5
damage = 5