From a8f0732b2be11464a8a86adfd829c768b6522d5f Mon Sep 17 00:00:00 2001 From: Vail Date: Mon, 2 Nov 2020 05:52:32 -0500 Subject: [PATCH] New 7.62/Phase Bolt fix --- code/modules/projectiles/ammunition/magazines.dm | 8 ++++++++ code/modules/projectiles/ammunition/rounds.dm | 8 ++++++++ code/modules/projectiles/projectile/bullets.dm | 8 ++++++++ code/modules/projectiles/projectile/energy.dm | 2 +- 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index a2464bcbc4e..eb4845db9b6 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -745,6 +745,14 @@ name = "rifle clip (7.62mm hunting)" ammo_type = /obj/item/ammo_casing/a762/hunter +/obj/item/ammo_magazine/clip/c762/sniper + name = "rifle clip (7.62mm HV)" + ammo_type = /obj/item/ammo_casing/a762/sniper + +/obj/item/ammo_magazine/clip/c762/sniperhunter + name = "rifle clip (7.62mm HV hunting)" + ammo_type = /obj/item/ammo_casing/a762/sniperhunter + /obj/item/ammo_magazine/clip/c762/silver name = "rifle clip (7.62mm silver)" icon_state = "agclip_rifle" diff --git a/code/modules/projectiles/ammunition/rounds.dm b/code/modules/projectiles/ammunition/rounds.dm index 4d0654eedd9..e7ecf391c93 100644 --- a/code/modules/projectiles/ammunition/rounds.dm +++ b/code/modules/projectiles/ammunition/rounds.dm @@ -338,6 +338,14 @@ desc = "A 7.62mm hunting bullet casing." projectile_type = /obj/item/projectile/bullet/rifle/a762/hunter +/obj/item/ammo_casing/a762/sniper + desc = "A 7.62mm high velocity bullet casing optimised for a marksman rifle." + projectile_type = /obj/item/projectile/bullet/rifle/a762/sniper + +/obj/item/ammo_casing/a762/sniperhunter + desc = "A 7.62mm high velocity hunter bullet casing optimised for a marksman rifle." + projectile_type = /obj/item/projectile/bullet/rifle/a762/sniperhunter + /obj/item/ammo_casing/a762/silver desc = "A 7.62mm hunting bullet casing. Bless and Sancitfied to banish otherworlds entities." icon_state = "agrifle-casing" diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 8f2fb30e76e..5ecbf5f968a 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -259,6 +259,14 @@ damage = 20 SA_bonus_damage = 50 // 70 total on animals. SA_vulnerability = MOB_CLASS_ANIMAL + embed_chance = -1 + +/obj/item/projectile/bullet/rifle/a762/sniperhunter + damage = 20 + SA_bonus_damage = 50 // 70 total on animals. + SA_vulnerability = MOB_CLASS_ANIMAL + embed_chance = -1 + hitscan = 1 /obj/item/projectile/bullet/rifle/a762/silver // Hunting Demons with bolt action rifles. damage = 20 diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index a52f41edf92..2724b8aea0c 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -222,7 +222,7 @@ range = 25 damage = 5 SA_bonus_damage = 45 // 50 total on animals - SA_vulnerability = SA_ANIMAL + SA_vulnerability = MOB_CLASS_ANIMAL /obj/item/projectile/energy/phase/light range = 15