From 40ab99b354b412092ff9b1b9191d0a9aec6eeea1 Mon Sep 17 00:00:00 2001
From: HarpyEagle <mwerezak@gmail.com>
Date: Thu, 8 Oct 2015 16:36:51 -0400
Subject: [PATCH] Rubber bullets and beanbags now check melee armour instead of
 bullet armour

---
 .../modules/projectiles/projectile/bullets.dm |  4 +++-
 html/changelogs/HarpyEagle-rubberbullets.yml  | 20 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/HarpyEagle-rubberbullets.yml

diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index f2c10fd8a90..12fae31e4ee 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -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
diff --git a/html/changelogs/HarpyEagle-rubberbullets.yml b/html/changelogs/HarpyEagle-rubberbullets.yml
new file mode 100644
index 00000000000..841373a9f9a
--- /dev/null
+++ b/html/changelogs/HarpyEagle-rubberbullets.yml
@@ -0,0 +1,20 @@
+################################
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+author: HarpyEagle
+delete-after: True
+changes: 
+  - tweak: "Rubber bullets and beanbags now are now resisted by melee armour."