From 47912cfd4380c0495ce0c4c15550fba60743ecf7 Mon Sep 17 00:00:00 2001 From: shazbot194 Date: Wed, 14 Sep 2016 20:11:38 -0800 Subject: [PATCH] Small fixes for foam force weapons -Adds a new icon for the toy tommy gun with a blue muzzle, so it doesn't have to use the real tommy gun's icon or what is was using, nothing. -fixes the rounding on the toy smg so it now doesn't have an invisable magazine when loaded and displays the correct amount of ammo. --- .../projectiles/ammunition/magazines.dm | 2 +- .../projectiles/guns/projectile/toy.dm | 4 ++-- icons/obj/guns/toy.dmi | Bin 2484 -> 2672 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index a5eafacba51..139126fe2c2 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -378,7 +378,7 @@ /obj/item/ammo_box/magazine/toy/smg/update_icon() ..() - icon_state = "smg9mm-[round(ammo_count(),5)]" + icon_state = "smg9mm-[round(ammo_count()+1,4)*6/4]" /obj/item/ammo_box/magazine/toy/smg/riot ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm index 4efeb570e0f..809647e4186 100644 --- a/code/modules/projectiles/guns/projectile/toy.dm +++ b/code/modules/projectiles/guns/projectile/toy.dm @@ -92,8 +92,8 @@ /obj/item/weapon/gun/projectile/shotgun/toy/tommygun name = "tommy gun" desc = "Looks almost like the real thing! Great for practicing Drive-bys. Ages 8 and up." - icon = 'icons/obj/guns/projectile.dmi' - icon_state = "tommy" + icon = 'icons/obj/guns/toy.dmi' + icon_state = "tommygun" item_state = "shotgun" mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/tommygun w_class = 2 diff --git a/icons/obj/guns/toy.dmi b/icons/obj/guns/toy.dmi index d05231e7718b8e09fbc17999dce5647122258bc0..c832bb3670addd818247b2da280f846dd854db9c 100644 GIT binary patch delta 2412 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