From 03c173aeaffe738daebef51218ec83b78deb9b47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= Date: Sun, 24 Apr 2016 09:19:03 +0200 Subject: [PATCH] Lowers costs, adds darts to autolathe --- code/datums/supplypacks.dm | 4 ++-- code/datums/uplink_item.dm | 8 ++++---- .../projectiles/guns/projectile/toy.dm | 1 - .../research/designs/autolathe_designs.dm | 8 ++++++++ icons/obj/toyguns.dmi | Bin 2562 -> 2804 bytes 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 0db941e3ca5..a5b6605c76e 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1360,7 +1360,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/clothing/under/mafia/sue, /obj/item/clothing/under/mafia/tan, /obj/item/weapon/gun/projectile/automatic/tommygun/toy, - /obj/item/weapon/gun/projectile/automatic/tommygun/toy) + /obj/item/weapon/gun/projectile/automatic/tommygun/toy) cost = 15 containername = "mafia supply crate" @@ -1405,7 +1405,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/weapon/gun/projectile/shotgun/toy, /obj/item/weapon/gun/projectile/shotgun/toy, /obj/item/weapon/gun/projectile/shotgun/toy) - cost = 25 + cost = 10 containername = "foam force crate" /datum/supply_packs/misc/foamforce/bonus diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index cc10ee566af..2c74d75b545 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -411,7 +411,7 @@ var/list/uplink_items = list() name = "Toy Submachine Gun" desc = "A fully-loaded Donksoft bullpup submachine gun that fires riot grade rounds with a 20-round magazine." item = /obj/item/weapon/gun/projectile/automatic/c20r/toy - cost = 12 + cost = 5 gamemodes = list(/datum/game_mode/nuclear) surplus = 0 @@ -419,7 +419,7 @@ var/list/uplink_items = list() name = "Toy Machine Gun" desc = "A fully-loaded Donksoft belt-fed machine gun. This weapon has a massive 50-round magazine of devastating riot grade darts, that can briefly incapacitate someone in just one volley." item = /obj/item/weapon/gun/projectile/automatic/l6_saw/toy - cost = 30 + cost = 10 gamemodes = list(/datum/game_mode/nuclear) surplus = 0 @@ -427,7 +427,7 @@ var/list/uplink_items = list() name = "Box of Riot Darts" desc = "A box of 40 Donksoft foam riot darts, for reloading any compatible foam dart gun. Don't forget to share!" item = /obj/item/ammo_box/foambox/riot - cost = 10 + cost = 2 gamemodes = list(/datum/game_mode/nuclear) surplus = 0 @@ -579,7 +579,7 @@ var/list/uplink_items = list() name = "Toy Gun (with Stun Darts)" desc = "An innocent looking toy pistol designed to fire foam darts. Comes loaded with riot grade darts, to incapacitate a target." item = /obj/item/weapon/gun/projectile/automatic/toy/pistol/riot - cost = 10 + cost = 3 surplus = 10 /datum/uplink_item/stealthy_weapons/soap diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm index 350b53f9aa1..812361ec245 100644 --- a/code/modules/projectiles/guns/projectile/toy.dm +++ b/code/modules/projectiles/guns/projectile/toy.dm @@ -94,7 +94,6 @@ /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/gun.dmi' icon_state = "crossbow" item_state = "crossbow" mag_type = "/obj/item/ammo_box/magazine/internal/shot/toy/crossbow" diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 663b394efb6..b5d44579d07 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -323,6 +323,14 @@ build_path = /obj/item/weapon/canvas/twentythreeXnineteen category = list("initial", "Miscellaneous") +/datum/design/foambox + name = "Box of Foam Force darts" + id = "foamforce" + build_type = AUTOLATHE + materials = list(MAT_METAL = 2000) + build_path = /obj/item/ammo_box/foambox + category = list("initial", "Miscellaneous") + /datum/design/canvas/twentythreeXtwentythree name = "23px by 23px Canvas" id = "canvas23x23" diff --git a/icons/obj/toyguns.dmi b/icons/obj/toyguns.dmi index fee7774cae553b6e63d8c85d5ab699fe8740ad67..4ac5c62056e39a1fe97c752db1cabbf0010fe347 100644 GIT binary patch delta 2555 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