From 6b02206adf6728e4c778bc4c287848c40bd6bfdf Mon Sep 17 00:00:00 2001 From: Spades Date: Wed, 9 Aug 2017 21:04:58 -0400 Subject: [PATCH] Sniper Changes and Fixes - Fixes the heavy sniper hand sprite so it no longer looks like a pistol. Not ideal, but better. - Changes energy sniper to use the Z8's hand sprite, because it's more distinct than looking the same as the laser carbine. - Adds the SVD back by request of Woodrat. It's not spawnable yet, since I don't know where you want to balance it. --- code/datums/autolathe/arms.dm | 2 +- .../projectiles/ammunition/magazines.dm | 19 ++++++++++++++++++- code/modules/projectiles/guns/energy/laser.dm | 2 +- .../projectiles/guns/projectile/sniper.dm | 15 +++++---------- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/code/datums/autolathe/arms.dm b/code/datums/autolathe/arms.dm index 7e336cf64d6..a79bf09d951 100644 --- a/code/datums/autolathe/arms.dm +++ b/code/datums/autolathe/arms.dm @@ -258,7 +258,7 @@ /datum/category_item/autolathe/arms/rifle_SVD name = "10rnd rifle magazine (7.62mm)" - path =/obj/item/ammo_magazine/SVD/empty + path =/obj/item/ammo_magazine/m762svd/empty category = "Arms and Ammunition" hidden = 1 diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 2e8373866cd..0a18f005722 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -460,6 +460,23 @@ name = "rifle clip (7.62mm practice)" ammo_type = /obj/item/ammo_casing/a762p +/obj/item/ammo_magazine/m762svd + name = "\improper SVD magazine (7.62mm)" + icon_state = "SVD" + mag_type = MAGAZINE + caliber = "7.62mm" + matter = list(DEFAULT_WALL_MATERIAL = 2000) + ammo_type = /obj/item/ammo_casing/a762 + max_ammo = 10 + multiple_sprites = 1 + +/obj/item/ammo_magazine/m762svd/ap + name = "\improper SVD magazine (7.62mm armor-piercing)" + ammo_type = /obj/item/ammo_casing/a762/ap + +/obj/item/ammo_magazine/m762svd/empty + initial_ammo = 0 + ///////// 12g ///////// /obj/item/ammo_magazine/m12gdrum @@ -490,7 +507,7 @@ ///////// .75 Gyrojet ///////// /obj/item/ammo_magazine/m75 - name = "ammo magazine (.75 Gyrojet)" + name = "magazine (.75 Gyrojet)" icon_state = "75" mag_type = MAGAZINE caliber = ".75" diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 604c936172b..fff6915a562 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -111,7 +111,7 @@ obj/item/weapon/gun/energy/retro desc = "The HI DMR 9E is an older design of Hesphaistos Industries. A designated marksman rifle capable of shooting powerful \ ionized beams, this is a weapon to kill from a distance." icon_state = "sniper" - item_state_slots = list(slot_r_hand_str = "laser", slot_l_hand_str = "laser") //placeholder + item_state_slots = list(slot_r_hand_str = "z8carbine", slot_l_hand_str = "z8carbine") //placeholder fire_sound = 'sound/weapons/gauss_shoot.ogg' origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 5, TECH_POWER = 4) projectile_type = /obj/item/projectile/beam/sniper diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 9a16f68a4c0..183de3cf17d 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -4,8 +4,7 @@ name = "anti-materiel rifle" desc = "A portable anti-armour rifle fitted with a scope, the HI PTR-7 Rifle was originally designed to used against armoured exosuits. It is capable of punching through windows and non-reinforced walls with ease. Fires armor piercing 14.5mm shells." icon_state = "heavysniper" - item_state = "l6closed-empty" // placeholder - item_state_slots = list(slot_r_hand_str = "heavysniper", slot_l_hand_str = "heavysniper") + item_state_slots = list(slot_r_hand_str = "l6closed-empty", slot_l_hand_str = "l6closed-empty") // placeholder w_class = ITEMSIZE_HUGE // So it can't fit in a backpack. force = 10 slot_flags = SLOT_BACK @@ -69,17 +68,15 @@ ////////////// Dragunov Sniper Rifle ////////////// -/* // Commented out until it's not worthless. Also might be nice to have a new icon that looks more sci-fi Dragunov-ish. /obj/item/weapon/gun/projectile/SVD name = "\improper Dragunov" - desc = "The SVD, also known as the Dragunov, was mass produced with an Optical Sniper Sight so simple that even Ivan can figure out how it works. Too bad for you that it's written in Russian. Uses 7.62mm rounds." + desc = "The SVD, also known as the Dragunov, is mass produced with an Optical Sniper Sight so simple that even Ivan can use it. Too bad for you that the inscriptions are written in Russian. Uses 7.62mm rounds." icon_state = "SVD" item_state = "SVD" w_class = ITEMSIZE_HUGE // So it can't fit in a backpack. force = 10 slot_flags = SLOT_BACK // Needs a sprite. origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8) - recoil = 2 //extra kickback caliber = "7.62mm" load_method = MAGAZINE accuracy = -3 //shooting at the hip @@ -87,13 +84,11 @@ // requires_two_hands = 1 one_handed_penalty = 4 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand. fire_sound = 'sound/weapons/SVD_shot.ogg' - magazine_type = /obj/item/ammo_magazine/SVD - allowed_magazines = list(/obj/item/ammo_magazine/SVD, /obj/item/ammo_magazine/m762) + magazine_type = /obj/item/ammo_magazine/m762svd + allowed_magazines = list(/obj/item/ammo_magazine/m762svd) /obj/item/weapon/gun/projectile/SVD/update_icon() ..() -// if(istype(ammo_magazine,/obj/item/ammo_magazine/m762) -// icon_state = "SVD-bigmag" //No icon for this exists yet. if(ammo_magazine) icon_state = "SVD" else @@ -104,4 +99,4 @@ set name = "Use Scope" set popup_menu = 1 - toggle_scope(2.0)*/ \ No newline at end of file + toggle_scope(2.0) \ No newline at end of file