diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 4cfff29784c..f14886328c1 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -1,9 +1,9 @@ /obj/item/weapon/gun/projectile/sniper_rifle name = "sniper rifle" - desc = "the kind of gun that will leave you crying for mummy before you even realise your leg's missing" - icon_state = "moistnugget" - item_state = "moistnugget" + desc = "The kind of gun that will leave you crying for mummy before you even realise your leg's missing" + icon_state = "sniper" + item_state = "sniper" recoil = 2 heavy_weapon = 1 mag_type = /obj/item/ammo_box/magazine/sniper_rounds @@ -14,11 +14,19 @@ w_class = 3 zoomable = TRUE zoom_amt = 7 //Long range, enough to see in front of you, but no tiles behind you. + slot_flags = SLOT_BACK + + +/obj/item/weapon/gun/projectile/sniper_rifle/update_icon() + if(magazine) + icon_state = "sniper-mag" + else + icon_state = "sniper" /obj/item/weapon/gun/projectile/sniper_rifle/syndicate name = "syndicate sniper rifle" - desc = "syndicate flavoured sniper rifle, it packs quite a punch, a punch to your face" + desc = "Syndicate flavoured sniper rifle, it packs quite a punch, a punch to your face" pin = /obj/item/device/firing_pin/implant/pindicate origin_tech = "combat=8;syndicate=4" @@ -29,21 +37,29 @@ //Normal Boolets /obj/item/ammo_box/magazine/sniper_rounds name = "sniper rounds (.50)" - icon_state = ".50" + icon_state = ".50mag" origin_tech = "combat=6;syndicate=2" ammo_type = /obj/item/ammo_casing/point50 max_ammo = 6 caliber = ".50" +/obj/item/ammo_box/magazine/sniper_rounds/update_icon() + if(ammo_count()) + icon_state = "[initial(icon_state)]-ammo" + else + icon_state = "[initial(icon_state)]" + /obj/item/ammo_casing/point50 desc = "A .50 bullet casing." caliber = ".50" projectile_type = /obj/item/projectile/bullet/sniper + icon_state = ".50" /obj/item/projectile/bullet/sniper damage = 70 stun = 5 weaken = 5 + armour_penetration = 50 var/breakthings = TRUE /obj/item/projectile/bullet/sniper/on_hit(atom/target, blocked = 0, hit_zone) @@ -53,6 +69,8 @@ return ..() + + //Sleepy ammo /obj/item/ammo_box/magazine/sniper_rounds/soporific name = "sniper rounds (Zzzzz)" @@ -67,8 +85,10 @@ desc = "A .50 bullet casing, specialised in sending the target to sleep, instead of hell." caliber = ".50" projectile_type = /obj/item/projectile/bullet/sniper/soporific + icon_state = ".50" /obj/item/projectile/bullet/sniper/soporific + armour_penetration = 0 nodamage = 1 stun = 0 weaken = 0 @@ -97,8 +117,10 @@ desc = "A .50 bullet casing, specialised in causing massive bloodloss" caliber = ".50" projectile_type = /obj/item/projectile/bullet/sniper/haemorrhage + icon_state = ".50" /obj/item/projectile/bullet/sniper/haemorrhage + armour_penetration = 15 damage = 15 stun = 0 weaken = 0 diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 44c7746c266..17290e3bdd7 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi index 2bef3ec79b4..d73d539e14c 100644 Binary files a/icons/mob/inhands/guns_lefthand.dmi and b/icons/mob/inhands/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi index 9d72ffd4f4e..159f8b93be2 100644 Binary files a/icons/mob/inhands/guns_righthand.dmi and b/icons/mob/inhands/guns_righthand.dmi differ diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 38c50c644be..b3b91d6236e 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index bf0688be19c..8c357f16615 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ