diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index de8fc9beac6..97b33178433 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -370,6 +370,32 @@ projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/riot icon_state = "foamdart_riot" +/obj/item/ammo_casing/caseless/foam_dart/sniper + name = "foam sniper dart" + desc = "For the big nerf! Ages 8 and up." + caliber = "foam_force_sniper" + projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/sniper + icon_state = "foamdartsniper" + +/obj/item/ammo_casing/caseless/foam_dart/sniper/update_icon() + ..() + if(modified) + icon_state = "foamdartsniper_empty" + desc = "Its nerf or nothing! ... Although, this one doesn't look too safe." + if(BB) + BB.icon_state = "foamdartsniper_empty" + else + icon_state = initial(icon_state) + if(BB) + BB.icon_state = initial(BB.icon_state) + +/obj/item/ammo_casing/caseless/foam_dart/sniper/riot + name = "riot sniper foam dart" + desc = "For the bigger brother of the crowd control toy. Ages 18 and up." + caliber = "foam_force_sniper" + projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/sniper/riot + icon_state = "foamdartsniper_riot" + /obj/item/ammo_casing/shotgun/assassination name = "assassination shell" desc = "A specialist shrapnel shell that has been laced with a silencing toxin." diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index a19a5bf8ed9..9f8c451be65 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -164,14 +164,15 @@ /obj/item/ammo_box/magazine/toy/sniper_rounds name = "donksoft Sniper magazine" icon_state = ".50mag" - ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot + ammo_type = /obj/item/ammo_casing/caseless/foam_dart/sniper/riot max_ammo = 6 + caliber = "foam_force_sniper" /obj/item/ammo_box/magazine/toy/sniper_rounds/update_icon() overlays.Cut() var/ammo = ammo_count() - if(ammo && istype(contents[contents.len], /obj/item/ammo_casing/caseless/foam_dart/riot)) + if(ammo && istype(contents[contents.len], /obj/item/ammo_casing/caseless/foam_dart/sniper/riot)) overlays += image('icons/obj/ammo.dmi', icon_state = ".50mag-r") else if(ammo) overlays += image('icons/obj/ammo.dmi', icon_state = ".50mag-f") diff --git a/code/modules/projectiles/projectile/reusable.dm b/code/modules/projectiles/projectile/reusable.dm index 06bc778f4f0..1c23605f2b3 100644 --- a/code/modules/projectiles/projectile/reusable.dm +++ b/code/modules/projectiles/projectile/reusable.dm @@ -64,3 +64,16 @@ ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot stamina = 25 log_override = FALSE + +/obj/item/projectile/bullet/reusable/foam_dart/sniper + name = "foam sniper dart" + icon_state = "foamdartsniper" + ammo_type = /obj/item/ammo_casing/caseless/foam_dart/sniper + range = 30 + +/obj/item/projectile/bullet/reusable/foam_dart/sniper/riot + name = "riot sniper foam dart" + icon_state = "foamdartsniper_riot" + ammo_type = /obj/item/ammo_casing/caseless/foam_dart/sniper/riot + stamina = 100 + log_override = FALSE \ No newline at end of file diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 68e8e326c51..735070488b2 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/guns/toy.dmi b/icons/obj/guns/toy.dmi index 8b8a8ba2fa3..1f226afa509 100644 Binary files a/icons/obj/guns/toy.dmi and b/icons/obj/guns/toy.dmi differ