From d3d491588e47ed8f3bcbbdd3cbdff659a5849546 Mon Sep 17 00:00:00 2001 From: Fayrik Date: Fri, 20 Mar 2015 22:39:42 +0000 Subject: [PATCH] Cleaned up the functionality and prepared things for PR. --- .../projectiles/ammunition/magazines.dm | 22 ++++++++++-------- .../projectiles/guns/projectile/toy.dm | 10 ++++---- icons/obj/guns/toy.dmi | Bin 1376 -> 1400 bytes tgstation.dme | 2 ++ 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index d77a0a26b8a..6a605ad218a 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -109,11 +109,7 @@ caliber = "foam_force" max_ammo = 4 -/obj/item/ammo_box/magazine/internal/cylinder/toy - name = "crossbow cylinder" - desc = "Oh god, this shouldn't be here" - ammo_type = /obj/item/ammo_casing/caseless/foam_dart - caliber = "foam_force" +/obj/item/ammo_box/magazine/internal/shot/toy/crossbow max_ammo = 5 ///////////EXTERNAL MAGAZINES//////////////// @@ -230,14 +226,20 @@ obj/item/ammo_box/magazine/tommygunm45 ammo_type = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath /obj/item/ammo_box/magazine/toy - name = "foam force SMG magazine" - icon_state = "c20r45" + name = "foam force META magazine" ammo_type = /obj/item/ammo_casing/caseless/foam_dart caliber = "foam_force" - max_ammo = 18 - multiple_sprites = 2 -/obj/item/ammo_box/magazine/toy/riot +/obj/item/ammo_box/magazine/toy/smg + name = "foam force SMG magazine" + icon_state = "smg9mm-20" + max_ammo = 20 + +/obj/item/ammo_box/magazine/toy/smg/update_icon() + ..() + icon_state = "smg9mm-[round(ammo_count(),5)]" + +/obj/item/ammo_box/magazine/toy/smg/riot ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot /obj/item/ammo_box/magazine/toy/pistol diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm index 7560d24322f..b0e1c5cec0f 100644 --- a/code/modules/projectiles/guns/projectile/toy.dm +++ b/code/modules/projectiles/guns/projectile/toy.dm @@ -1,12 +1,11 @@ /obj/item/weapon/gun/projectile/automatic/toy name = "foam force SMG" - desc = "A bullpup three-round burst toy SMG. Ages 8 and up." + desc = "A prototype three-round burst toy submachine gun. Ages 8 and up." icon = 'icons/obj/guns/toy.dmi' icon_state = "saber" - item_state = "c20r" - mag_type = /obj/item/ammo_box/magazine/toy + item_state = "gun" + mag_type = /obj/item/ammo_box/magazine/toy/smg fire_sound = 'sound/weapons/Gunshot_smg.ogg' - fire_delay = 2 force = 0 throwforce = 0 burst_size = 3 @@ -20,7 +19,6 @@ name = "foam force pistol" desc = "A small, easily concealable toy handgun. Ages 8 and up." icon_state = "pistol" - item_state = "gun" w_class = 2 mag_type = /obj/item/ammo_box/magazine/toy/pistol fire_sound = 'sound/weapons/Gunshot.ogg' @@ -51,8 +49,10 @@ /obj/item/weapon/gun/projectile/shotgun/toy/crossbow name = "foam force crossbow" desc = "A weapon favored by many overactive children. Ages 8 and up." + icon = 'icons/obj/toy.dmi' icon_state = "foamcrossbow" item_state = "crossbow" + mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/crossbow fire_sound = 'sound/items/syringeproj.ogg' slot_flags = SLOT_BELT w_class = 2 \ No newline at end of file diff --git a/icons/obj/guns/toy.dmi b/icons/obj/guns/toy.dmi index 1934606682a194889415db8a3c19512834fbe3a7..2f418c7b9a1fe1e6021e1e3789d05ecae277ab39 100644 GIT binary patch delta 1224 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 diff --git a/tgstation.dme b/tgstation.dme index 1e275010267..f8ef16d8d32 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1325,10 +1325,12 @@ #include "code\modules\projectiles\guns\projectile\pistol.dm" #include "code\modules\projectiles\guns\projectile\revolver.dm" #include "code\modules\projectiles\guns\projectile\shotgun.dm" +#include "code\modules\projectiles\guns\projectile\toy.dm" #include "code\modules\projectiles\projectile\beams.dm" #include "code\modules\projectiles\projectile\bullets.dm" #include "code\modules\projectiles\projectile\energy.dm" #include "code\modules\projectiles\projectile\magic.dm" +#include "code\modules\projectiles\projectile\reusable.dm" #include "code\modules\projectiles\projectile\special.dm" #include "code\modules\reagents\Chemistry-Colours.dm" #include "code\modules\reagents\Chemistry-Goon-420BlazeIt.dm"