Merge pull request #6185 from Allfd/Enforcer

Ports Enforcer handgun, rubber bullets, and new shotgun ammo boxes from Stratus
This commit is contained in:
Fox McCloud
2017-01-23 06:08:36 -05:00
committed by GitHub
8 changed files with 73 additions and 5 deletions
@@ -42,6 +42,7 @@
damage = 5
weaken = 3
stamina = 60
icon_state = "bullet-r"
/obj/item/projectile/bullet/weakbullet2/rubber //detective's bullets that don't embed
embed = 0
@@ -50,6 +51,13 @@
/obj/item/projectile/bullet/weakbullet3
damage = 20
/obj/item/projectile/bullet/weakbullet4
name = "rubber bullet"
damage = 5
stamina = 30
icon_state = "bullet-r"
embed = 0
sharp = 0
/obj/item/projectile/bullet/toxinbullet
damage = 15
@@ -135,6 +143,7 @@
name = "rubber pellet"
damage = 3
stamina = 25
icon_state = "bullet-r"
/obj/item/projectile/bullet/stunshot//taser slugs for shotguns, nothing special
name = "stunshot"