Merge pull request #1152 from Citadel-Station-13/upstream-merge-27533

[MIRROR] Auto Rifle Armour Piercing Increase
This commit is contained in:
LetterJay
2017-05-24 08:33:14 -05:00
committed by GitHub

View File

@@ -28,8 +28,8 @@
damage = 10
/obj/item/projectile/bullet/armourpiercing
damage = 17
armour_penetration = 10
damage = 15
armour_penetration = 40
/obj/item/projectile/bullet/pellet
name = "pellet"
@@ -244,7 +244,7 @@
name = "\improper DNA injector"
icon_state = "syringeproj"
var/obj/item/weapon/dnainjector/injector
/obj/item/projectile/bullet/dnainjector/on_hit(atom/target, blocked = 0)
if(iscarbon(target))
var/mob/living/carbon/M = target