Merge pull request #4310 from Neerti/11/19/2017_hunting_rounds

Adds Hunting Rounds

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -504,7 +504,10 @@
 		stun_effect_act(0, Proj.agony)
 
 	if(!Proj.nodamage)
-		adjustBruteLoss(Proj.damage)
+		var/true_damage = Proj.damage
+		if(!Proj.SA_vulnerability || Proj.SA_vulnerability == intelligence_level)
+			true_damage += Proj.SA_bonus_damage
+		adjustBruteLoss(true_damage)
 
 	if(Proj.firer)
 		react_to_attack(Proj.firer)

code/modules/projectiles/ammunition/magazines.dm

@@ -356,6 +356,14 @@
 	name = "extended magazine (5.45mm armor-piercing)"
 	max_ammo = 30
 
+/obj/item/ammo_magazine/m545/hunter
+	name = "magazine (5.45mm hunting)"
+	ammo_type = /obj/item/ammo_casing/a545/hunter
+
+/obj/item/ammo_magazine/m545/hunter/ext
+	name = "extended magazine (5.45mm hunting)"
+	max_ammo = 30
+
 /obj/item/ammo_magazine/m545/small
 	name = "reduced magazine (5.45mm)"
 	icon_state = "m545-small"
@@ -373,6 +381,10 @@
 	name = "magazine (5.45mm armor-piercing)"
 	ammo_type = /obj/item/ammo_casing/a545/ap
 
+/obj/item/ammo_magazine/m545/small/hunter
+	name = "magazine (5.45mm hunting)"
+	ammo_type = /obj/item/ammo_casing/a545/hunter
+
 /obj/item/ammo_magazine/clip/c545
 	name = "ammo clip (5.45mm)"
 	icon_state = "clip_rifle"
@@ -386,6 +398,10 @@
 	name = "rifle clip (5.45mm armor-piercing)"
 	ammo_type = /obj/item/ammo_casing/a545/ap
 
+/obj/item/ammo_magazine/clip/c545/hunter
+	name = "rifle clip (5.45mm hunting)"
+	ammo_type = /obj/item/ammo_casing/a545/hunter
+
 /obj/item/ammo_magazine/clip/c545/practice
 	name = "rifle clip (5.45mm practice)"
 	ammo_type = /obj/item/ammo_casing/a545
@@ -406,6 +422,10 @@
 	name = "magazine box (5.45mm armor-piercing)"
 	ammo_type = /obj/item/ammo_casing/a545/ap
 
+/obj/item/ammo_magazine/m545saw/hunter
+	name = "magazine box (5.45mm hunting)"
+	ammo_type = /obj/item/ammo_casing/a545/hunter
+
 /obj/item/ammo_magazine/m545saw/empty
 	initial_ammo = 0
 
@@ -505,6 +525,10 @@
 	name = "rifle clip (7.62mm practice)"
 	ammo_type = /obj/item/ammo_casing/a762p
 
+/obj/item/ammo_magazine/clip/c762/hunter
+	name = "rifle clip (7.62mm hunting)"
+	ammo_type = /obj/item/ammo_casing/a762/hunter
+
 /obj/item/ammo_magazine/m762svd
 	name = "\improper SVD magazine (7.62mm)"
 	icon_state = "SVD"

code/modules/projectiles/ammunition/rounds.dm

@@ -258,6 +258,10 @@
 	desc = "A 7.62mm hollow-point bullet casing."
 	projectile_type = /obj/item/projectile/bullet/rifle/a762/hollow
 
+/obj/item/ammo_casing/a762/hunter
+	desc = "A 7.62mm hunting bullet casing."
+	projectile_type = /obj/item/projectile/bullet/rifle/a762/hunter
+
 /*
  * 14.5mm (anti-materiel rifle round)
  */
@@ -298,6 +302,10 @@
 	desc = "A 5.45mm hollow-point bullet casing."
 	projectile_type = /obj/item/projectile/bullet/rifle/a545/hollow
 
+/obj/item/ammo_casing/a545/hunter
+	desc = "A 5.45mm hunting bullet casing."
+	projectile_type = /obj/item/projectile/bullet/rifle/a545/hunter
+
 /*
  * Misc
  */

code/modules/projectiles/projectile.dm

@@ -38,6 +38,8 @@
 
 	var/damage = 10
 	var/damage_type = BRUTE //BRUTE, BURN, TOX, OXY, CLONE, HALLOSS are the only things that should be in here
+	var/SA_bonus_damage = 0 // Some bullets inflict extra damage on simple animals.
+	var/SA_vulnerability = null // What kind of simple animal the above bonus damage should be applied to. Set to null to apply to all SAs.
 	var/nodamage = 0 //Determines if the projectile will skip any damage inflictions
 	var/taser_effect = 0 //If set then the projectile will apply it's agony damage using stun_effect_act() to mobs it hits, and other damage will be ignored
 	var/check_armour = "bullet" //Defines what armor to use when it hits things.  Must be set to bullet, laser, energy,or bomb	//Cael - bio and rad are also valid

code/modules/projectiles/projectile/bullets.dm

@@ -209,6 +209,11 @@
 	armor_penetration = -50
 	penetrating = 0
 
+/obj/item/projectile/bullet/rifle/a762/hunter // Optimized for killing simple animals and not people, because Balance.
+	damage = 20
+	SA_bonus_damage = 50 // 70 total on animals.
+	SA_vulnerability = SA_ANIMAL
+
 /obj/item/projectile/bullet/rifle/a545
 	damage = 25
 
@@ -221,6 +226,11 @@
 	armor_penetration = -50
 	penetrating = 0
 
+/obj/item/projectile/bullet/rifle/a545/hunter
+	damage = 15
+	SA_bonus_damage = 35 // 50 total on animals.
+	SA_vulnerability = SA_ANIMAL
+
 /obj/item/projectile/bullet/rifle/a145
 	damage = 80
 	stun = 3