Merge pull request #15958 from Impisi/ImprovisedShellChanges

Improvised Shell Rework Attempt 2
This commit is contained in:
duncathan salt
2016-03-12 15:16:08 -06:00
3 changed files with 29 additions and 13 deletions
@@ -123,24 +123,20 @@
icon_state = "improvshell"
projectile_type = /obj/item/projectile/bullet/pellet/weak
materials = list(MAT_METAL=250)
pellets = 5
pellets = 10
variance = 0.8
/obj/item/ammo_casing/shotgun/improvised/overload
/obj/item/ammo_casing/shotgun/improvised/overload/
name = "overloaded improvised shell"
desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards. This one has been packed with even more \
propellant. It's like playing russian roulette, with a shotgun."
icon_state = "improvshell"
projectile_type = /obj/item/projectile/bullet/pellet/random
projectile_type = /obj/item/projectile/bullet/pellet/overload
materials = list(MAT_METAL=250)
pellets = 5
pellets = 4
variance = 1
/obj/item/ammo_casing/shotgun/improvised/overload/New()
..()
pellets = rand(3, 8)
/obj/item/ammo_casing/shotgun/stunslug
name = "taser slug"