From d35248366a16cf4af885fef826bf1907bc9b5daf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= Date: Tue, 26 Apr 2016 11:28:00 +0200 Subject: [PATCH] Thingies don't embed, icons work. --- .../projectiles/ammunition/ammo_casings.dm | 3 ++- .../projectiles/projectile/reusable.dm | 4 +++- icons/obj/toyguns.dmi | Bin 2804 -> 2486 bytes 3 files changed, 5 insertions(+), 2 deletions(-) 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 4ac5c62056e39a1fe97c752db1cabbf0010fe347..bd2ff273a40c1f1d38bdc3fe4a85e9089d2547be 100644 GIT binary patch delta 2414 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