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 fee7774cae5..4ac5c62056e 100644 Binary files a/icons/obj/toyguns.dmi and b/icons/obj/toyguns.dmi differ