diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index ec6aa9bc7f4..16fad035055 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -268,7 +268,7 @@ var/modified = 0 /obj/item/ammo_casing/caseless/foam_dart/update_icon() - ..() + ....() //to omit adding "-live" to the ammo casing if(modified) icon_state = "foamdart_empty" desc = "Its nerf or nothing! ...Although, this one doesn't look too safe." @@ -290,6 +290,7 @@ to_chat(user, "You insert [A] into [src].") return + /obj/item/ammo_casing/caseless/foam_dart/riot name = "riot foam dart" desc = "Whose smart idea was it to use toys as crowd control? Ages 18 and up." diff --git a/code/modules/projectiles/projectile/reusable.dm b/code/modules/projectiles/projectile/reusable.dm index 367d20b6992..81defd55743 100644 --- a/code/modules/projectiles/projectile/reusable.dm +++ b/code/modules/projectiles/projectile/reusable.dm @@ -31,10 +31,12 @@ damage = 0 // It's a damn toy. damage_type = OXY nodamage = 1 + edge = 0 + embed = 0 icon = 'icons/obj/toyguns.dmi' icon_state = "foamdart" ammo_type = /obj/item/ammo_casing/caseless/foam_dart - range = 10 + range = 10 /obj/item/projectile/bullet/reusable/foam_dart/riot name = "riot foam dart" diff --git a/icons/obj/toyguns.dmi b/icons/obj/toyguns.dmi index 4ac5c62056e..bd2ff273a40 100644 Binary files a/icons/obj/toyguns.dmi and b/icons/obj/toyguns.dmi differ