From 623696b985d8436bf6b5f5716d77f0c87724a060 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Tue, 6 Oct 2015 17:18:39 -0400
Subject: [PATCH] Ammo Update and Fixes

---
 code/modules/projectiles/ammunition/ammo_casings.dm | 10 +++++++++-
 code/modules/projectiles/projectile/bullets.dm      |  5 ++++-
 code/modules/research/designs/autolathe_designs.dm  |  8 ++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm
index 8117ff8441c..557407ac8a3 100644
--- a/code/modules/projectiles/ammunition/ammo_casings.dm
+++ b/code/modules/projectiles/ammunition/ammo_casings.dm
@@ -24,7 +24,7 @@
 	desc = "A 9mm bullet casing."
 	caliber = "9mm"
 	projectile_type = "/obj/item/projectile/bullet/weakbullet3"
-	
+
 /obj/item/ammo_casing/c9mmap
 	desc = "A 9mm bullet casing."
 	caliber = "9mm"
@@ -63,6 +63,14 @@
 	pellets = 5
 	deviation = 30
 
+/obj/item/ammo_casing/shotgun/rubbershot
+	name = "rubber shot"
+	desc = "A shotgun casing filled with densely-packed rubber balls, used to incapacitate crowds from a distance."
+	icon_state = "bshell"
+	projectile_type = "/obj/item/projectile/bullet/rpellet"
+	pellets = 5
+	deviation = 30
+	materials = list(MAT_METAL=4000)
 
 /obj/item/ammo_casing/shotgun/beanbag
 	name = "beanbag slug"
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index e23c8653667..5eeff0dac3e 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -27,7 +27,7 @@
 
 /obj/item/projectile/bullet/weakbullet3
 	damage = 20
-	
+
 
 /obj/item/projectile/bullet/toxinbullet
 	damage = 15
@@ -67,6 +67,9 @@
 /obj/item/projectile/bullet/heavybullet
 	damage = 35
 
+/obj/item/projectile/bullet/rpellet
+	damage = 3
+	stamina = 25
 
 /obj/item/projectile/bullet/stunshot//taser slugs for shotguns, nothing special
 	name = "stunshot"
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 90cebcf4648..ea572447756 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -418,6 +418,14 @@
 	build_path = /obj/item/ammo_casing/shotgun/beanbag
 	category = list("initial", "Security")
 
+/datum/design/rubbershot
+	name = "Rubber shot"
+	id = "rubber_shot"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 4000)
+	build_path = /obj/item/ammo_casing/shotgun/rubbershot
+	category = list("initial", "Security")
+
 /datum/design/c38
 	name = "Speed Loader (.38)"
 	id = "c38"