diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 33a895cad7..3a9b9274a5 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -244,6 +244,9 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ recipes = GLOB.wood_recipes return ..() +/obj/item/stack/sheet/mineral/wood/twenty + amount = 20 + /obj/item/stack/sheet/mineral/wood/fifty amount = 50 @@ -695,6 +698,4 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra icon_state = "sheet-durathreadraw" merge_type = /obj/item/stack/sheet/cotton/durathread pull_effort = 70 - loom_result = /obj/item/stack/sheet/durathread - - + loom_result = /obj/item/stack/sheet/durathread \ No newline at end of file diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 18acb5e14d..fa4e5a3886 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -233,39 +233,111 @@ turf_type = /turf/open/floor/carpet/royalblue tableVariant = /obj/structure/table/wood/fancy/royalblue +/obj/item/stack/tile/carpet/ten + amount = 10 + +/obj/item/stack/tile/carpet/twenty + amount = 20 + /obj/item/stack/tile/carpet/fifty amount = 50 +/obj/item/stack/tile/carpet/black/ten + amount = 10 + +/obj/item/stack/tile/carpet/black/twenty + amount = 20 + /obj/item/stack/tile/carpet/black/fifty amount = 50 +/obj/item/stack/tile/carpet/blackred/ten + amount = 10 + +/obj/item/stack/tile/carpet/blackred/twenty + amount = 20 + /obj/item/stack/tile/carpet/blackred/fifty amount = 50 +/obj/item/stack/tile/carpet/monochrome/ten + amount = 10 + +/obj/item/stack/tile/carpet/monochrome/twenty + amount = 20 + /obj/item/stack/tile/carpet/monochrome/fifty amount = 50 +/obj/item/stack/tile/carpet/blue/ten + amount = 10 + +/obj/item/stack/tile/carpet/blue/twenty + amount = 20 + /obj/item/stack/tile/carpet/blue/fifty amount = 50 +/obj/item/stack/tile/carpet/cyan/ten + amount = 10 + +/obj/item/stack/tile/carpet/cyan/twenty + amount = 20 + /obj/item/stack/tile/carpet/cyan/fifty amount = 50 +/obj/item/stack/tile/carpet/green/ten + amount = 10 + +/obj/item/stack/tile/carpet/green/twenty + amount = 20 + /obj/item/stack/tile/carpet/green/fifty amount = 50 +/obj/item/stack/tile/carpet/orange/ten + amount = 10 + +/obj/item/stack/tile/carpet/orange/twenty + amount = 20 + /obj/item/stack/tile/carpet/orange/fifty amount = 50 +/obj/item/stack/tile/carpet/purple/ten + amount = 10 + +/obj/item/stack/tile/carpet/purple/twenty + amount = 20 + /obj/item/stack/tile/carpet/purple/fifty amount = 50 +/obj/item/stack/tile/carpet/red/ten + amount = 10 + +/obj/item/stack/tile/carpet/red/twenty + amount = 20 + /obj/item/stack/tile/carpet/red/fifty amount = 50 +/obj/item/stack/tile/carpet/royalblack/ten + amount = 10 + +/obj/item/stack/tile/carpet/royalblack/twenty + amount = 20 + /obj/item/stack/tile/carpet/royalblack/fifty amount = 50 +/obj/item/stack/tile/carpet/royalblue/ten + amount = 10 + +/obj/item/stack/tile/carpet/royalblue/twenty + amount = 20 + /obj/item/stack/tile/carpet/royalblue/fifty amount = 50 diff --git a/code/modules/cargo/packs/armory.dm b/code/modules/cargo/packs/armory.dm index 58677814a6..e04a66d279 100644 --- a/code/modules/cargo/packs/armory.dm +++ b/code/modules/cargo/packs/armory.dm @@ -172,6 +172,22 @@ /obj/item/storage/box/beanbag) crate_name = "riot shotgun crate" +/datum/supply_pack/security/armory/spinfusor + name = "Stormhammer Spinfusor Crate" + cost = 14000 + desc = "Got yourself a code red? Blob, nukies or even worst knocking on your door? Well with the Stormhammer Spinfusor you can stop crime in one shot, dont miss! Contains two Stormhammer Spinfusors (Note, guns may or may not be loaded). Requires Armory access to open." + contains = list(/obj/item/gun/ballistic/automatic/spinfusor, + /obj/item/gun/ballistic/automatic/spinfusor) + crate_name = "spinfusor crate" + +/datum/supply_pack/security/armory/spinfusorammo + name = "Spinfusor Disk Crate" + cost = 7000 + desc = "Need more ammo for a Stormhammer? Well we got some for a price! Contains two boxes of Spinfusor disks. Requires Armory access to open." + contains = list(/obj/item/ammo_box/aspinfusor, + /obj/item/ammo_box/aspinfusor) + crate_name = "spinfusor disk crate" + /datum/supply_pack/security/armory/swat name = "SWAT Crate" desc = "Contains two fullbody sets of tough, fireproof, pressurized suits designed in a joint effort by IS-ERI and Nanotrasen. Each set contains a suit, helmet, mask, combat belt, and combat gloves. Requires Armory access to open." @@ -197,7 +213,7 @@ crate_name = "swat taser crate" /datum/supply_pack/security/armory/woodstock - name = "Classic WoodStock Shotguns Crate" + name = "WoodStock Classic Shotguns Crate" desc = "Contains three rustic, pumpaction shotguns. Requires Armory access to open." cost = 3000 contains = list(/obj/item/gun/ballistic/shotgun, diff --git a/code/modules/cargo/packs/materials.dm b/code/modules/cargo/packs/materials.dm index c9862282dc..9973845362 100644 --- a/code/modules/cargo/packs/materials.dm +++ b/code/modules/cargo/packs/materials.dm @@ -69,6 +69,11 @@ contains = list(/obj/item/grown/log) crate_name = "lumber crate" +/datum/supply_pack/materials/rawlumber/generate() + . = ..() + for(var/i in 1 to 49) + new /obj/item/grown/log(.) + /datum/supply_pack/materials/wood50 name = "50 Wood Planks" desc = "Turn cargo's boring metal groundwork into beautiful panelled flooring and much more with fifty wooden planks!" @@ -89,7 +94,7 @@ /datum/supply_pack/materials/rawcottonbulk name = "Raw Cotton Crate (Bulk)" desc = "We have so much of this stuff we need to get rid of it in -bulk- now. This crate contains 240 raw cotton sheets." - cost = 1300 // 100 net cost (per 40 cotton) , 20 x 20 = 400. 300 profit if turned into cloth sheets or more if turned to silk then 10 x 200 = 2000 + cost = 1300 // 600 net cost 20 x 120 = 2400 profit if turned into cloth sheets or if turned into silk 200 x 60 = 12000 contains = list(/obj/item/stack/sheet/cotton/thirty, /obj/item/stack/sheet/cotton/thirty, /obj/item/stack/sheet/cotton/thirty, @@ -102,11 +107,6 @@ crate_name = "bulk cotton crate" crate_type = /obj/structure/closet/crate/hydroponics -/datum/supply_pack/critter/animal_feed/generate() - . = ..() - for(var/i in 1 to 49) - new /obj/item/grown/log(.) - /datum/supply_pack/materials/rcdammo name = "Spare RDC ammo" desc = "This crate contains sixteen RCD compressed matter packs, to help with any holes or projects people might be working on." diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm index 248d9ba6fb..45baed091a 100644 --- a/code/modules/cargo/packs/misc.dm +++ b/code/modules/cargo/packs/misc.dm @@ -183,18 +183,6 @@ /obj/structure/piano/unanchored) crate_type = /obj/structure/closet/crate/wooden -/datum/supply_pack/misc/cbtpack - name = "CBT Equipment" - desc = "(*!&@#CBT is a special term coined by high ranking syndicate operatives for a special form of information extraction. While the training required to use this shipment is highly classified, the distribution of it's contents are not. In addition to this crates unusual contents, we have added a bar of soap.#@*$" - hidden = TRUE - cost = 2400 - contains = list(/mob/living/simple_animal/chicken, - /obj/item/toy/beach_ball/holoball, - /obj/item/melee/baton/cattleprod, - /obj/item/soap/syndie) - crate_name = "cbt crate" - crate_type = /obj/structure/closet/crate/large - /datum/supply_pack/misc/casinocrate name = "Casino Crate" desc = "Start up your own grand casino with this crate filled with slot machine and arcade boards!" @@ -213,6 +201,49 @@ /obj/item/circuitboard/computer/slot_machine) crate_name = "casino crate" +/datum/supply_pack/misc/candlelitdinner + name = "Candlelit Dinner Crate" + desc = "Need to organise a date night? Set up a fancy room for it with this luxurious crate filled with romance! Contains 40 tiles of classic, blue, black, and green carpeting, materials to build chairs, several boxes of candles, eight bottles of wine, two boxes of drinking glasses, ten metal rods, twenty wood, and twenty metal." + cost = 3200 // 200 for each wine bottle, 450 for metal/wood, 800 + 700 + 450 = 2750. + contains = list(/obj/item/storage/fancy/candle_box, + /obj/item/storage/fancy/candle_box, + /obj/item/storage/fancy/candle_box, + /obj/item/storage/fancy/candle_box, + /obj/item/stack/tile/carpet/twenty, + /obj/item/stack/tile/carpet/twenty, + /obj/item/stack/tile/carpet/blue/twenty, + /obj/item/stack/tile/carpet/blue/twenty, + /obj/item/stack/tile/carpet/royalblack/twenty, + /obj/item/stack/tile/carpet/royalblack/twenty, + /obj/item/stack/tile/carpet/green/twenty, + /obj/item/stack/tile/carpet/green/twenty, + /obj/item/reagent_containers/food/drinks/bottle/wine, + /obj/item/reagent_containers/food/drinks/bottle/wine, + /obj/item/reagent_containers/food/drinks/bottle/wine, + /obj/item/reagent_containers/food/drinks/bottle/wine, + /obj/item/reagent_containers/food/drinks/bottle/wine, + /obj/item/reagent_containers/food/drinks/bottle/wine, + /obj/item/reagent_containers/food/drinks/bottle/wine, + /obj/item/reagent_containers/food/drinks/bottle/wine, + /obj/item/stack/rods/ten, + /obj/item/stack/sheet/metal/twenty, + /obj/item/stack/sheet/mineral/wood/twenty, + /obj/item/storage/box/drinkingglasses, + /obj/item/storage/box/drinkingglasses) + crate_name = "romance crate" + +/datum/supply_pack/misc/cbtpack + name = "CBT Equipment" + desc = "(*!&@#CBT is a special term coined by high ranking syndicate operatives for a special form of information extraction. While the training required to use this shipment is highly classified, the distribution of it's contents are not. In addition to this crates unusual contents, we have added a bar of soap.#@*$" + hidden = TRUE + cost = 2400 + contains = list(/mob/living/simple_animal/chicken, + /obj/item/toy/beach_ball/holoball, + /obj/item/melee/baton/cattleprod, + /obj/item/soap/syndie) + crate_name = "cbt crate" + crate_type = /obj/structure/closet/crate/large + /datum/supply_pack/misc/coincrate name = "Coin Crate" desc = "Psssst, hey, you. Yes, you. I've heard that coins can do some special things on your station, give you access to some pretty cool stuff. Here's the deal, you give me some credits, and I give so some coins. Sound like a deal? I'll give you 10 for 10000 creds." @@ -255,6 +286,25 @@ crate_type = /obj/structure/closet/crate/wooden crate_name = "festive wrapping paper crate" +/datum/supply_pack/misc/funeral + name = "Funeral Supplies" + desc = "Mourn your dead properly buy sending them off with love filled notes, clean clothes, and a proper ceremony. Contains two candle packs, funeral garb, flowers, a paperbin , and crayons to help aid in religious rituals. Coffin included." + cost = 1200 + contains = list(/obj/item/clothing/under/burial, + /obj/item/storage/fancy/candle_box, + /obj/item/storage/fancy/candle_box, + /obj/item/reagent_containers/food/snacks/grown/harebell, + /obj/item/reagent_containers/food/snacks/grown/harebell, + /obj/item/reagent_containers/food/snacks/grown/poppy/geranium, + /obj/item/reagent_containers/food/snacks/grown/poppy/geranium, + /obj/item/reagent_containers/food/snacks/grown/poppy/lily, + /obj/item/reagent_containers/food/snacks/grown/poppy/lily, + /obj/item/storage/crayons, + /obj/item/paper_bin + ) + crate_name = "coffin" + crate_type = /obj/structure/closet/crate/coffin + /datum/supply_pack/misc/jukebox name = "Jukebox" cost = 10000 @@ -286,25 +336,6 @@ ) crate_name = "religious supplies crate" -/datum/supply_pack/misc/funeral - name = "Funeral Supplies" - desc = "Mourn your dead properly buy sending them off with love filled notes, clean clothes, and a proper ceremony. Contains two candle packs, funeral garb, flowers, a paperbin , and crayons to help aid in religious rituals. Coffin included." - cost = 1200 - contains = list(/obj/item/clothing/under/burial, - /obj/item/storage/fancy/candle_box, - /obj/item/storage/fancy/candle_box, - /obj/item/reagent_containers/food/snacks/grown/harebell, - /obj/item/reagent_containers/food/snacks/grown/harebell, - /obj/item/reagent_containers/food/snacks/grown/poppy/geranium, - /obj/item/reagent_containers/food/snacks/grown/poppy/geranium, - /obj/item/reagent_containers/food/snacks/grown/poppy/lily, - /obj/item/reagent_containers/food/snacks/grown/poppy/lily, - /obj/item/storage/crayons, - /obj/item/paper_bin - ) - crate_name = "coffin" - crate_type = /obj/structure/closet/crate/coffin - /datum/supply_pack/misc/shower name = "Shower Supplies" desc = "Everyone needs a bit of R&R. Make sure you get can get yours by ordering this crate filled with towels, rubber duckies, and some soap!" @@ -364,29 +395,6 @@ /obj/item/stack/tile/carpet/monochrome/fifty) crate_name = "premium carpet crate" -/datum/supply_pack/misc/party - name = "Party Equipment" - desc = "Celebrate both life and death on the station with Nanotrasen's Party Essentials(tm)! Contains seven colored glowsticks, four beers, two ales, a drinking shaker, and a bottle of patron & goldschlager!" - cost = 2000 - contains = list(/obj/item/storage/box/drinkingglasses, - /obj/item/reagent_containers/food/drinks/shaker, - /obj/item/reagent_containers/food/drinks/bottle/patron, - /obj/item/reagent_containers/food/drinks/bottle/goldschlager, - /obj/item/reagent_containers/food/drinks/ale, - /obj/item/reagent_containers/food/drinks/ale, - /obj/item/reagent_containers/food/drinks/beer, - /obj/item/reagent_containers/food/drinks/beer, - /obj/item/reagent_containers/food/drinks/beer, - /obj/item/reagent_containers/food/drinks/beer, - /obj/item/flashlight/glowstick, - /obj/item/flashlight/glowstick/red, - /obj/item/flashlight/glowstick/blue, - /obj/item/flashlight/glowstick/cyan, - /obj/item/flashlight/glowstick/orange, - /obj/item/flashlight/glowstick/yellow, - /obj/item/flashlight/glowstick/pink) - crate_name = "party equipment crate" - /datum/supply_pack/misc/noslipfloor name = "High-traction Floor Tiles" desc = "Make slipping a thing of the past with sixty industrial-grade anti-slip floortiles!" diff --git a/code/modules/cargo/packs/organic.dm b/code/modules/cargo/packs/organic.dm index a070dee591..68fd32afed 100644 --- a/code/modules/cargo/packs/organic.dm +++ b/code/modules/cargo/packs/organic.dm @@ -219,6 +219,29 @@ crate_name = "wildcard food crate" crate_type = /obj/structure/closet/crate/freezer +/datum/supply_pack/organic/party + name = "Party Equipment" + desc = "Celebrate both life and death on the station with Nanotrasen's Party Essentials(tm)! Contains seven colored glowsticks, four beers, two ales, a drinking shaker, and a bottle of patron & goldschlager!" + cost = 2000 + contains = list(/obj/item/storage/box/drinkingglasses, + /obj/item/reagent_containers/food/drinks/shaker, + /obj/item/reagent_containers/food/drinks/bottle/patron, + /obj/item/reagent_containers/food/drinks/bottle/goldschlager, + /obj/item/reagent_containers/food/drinks/ale, + /obj/item/reagent_containers/food/drinks/ale, + /obj/item/reagent_containers/food/drinks/beer, + /obj/item/reagent_containers/food/drinks/beer, + /obj/item/reagent_containers/food/drinks/beer, + /obj/item/reagent_containers/food/drinks/beer, + /obj/item/flashlight/glowstick, + /obj/item/flashlight/glowstick/red, + /obj/item/flashlight/glowstick/blue, + /obj/item/flashlight/glowstick/cyan, + /obj/item/flashlight/glowstick/orange, + /obj/item/flashlight/glowstick/yellow, + /obj/item/flashlight/glowstick/pink) + crate_name = "party equipment crate" + /datum/supply_pack/organic/pizza name = "Pizza Crate" desc = "Best prices on this side of the galaxy. All deliveries are guaranteed to be 99% anomaly-free!" diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm index d0cdc474f6..ef39e4f53d 100644 --- a/code/modules/cargo/packs/service.dm +++ b/code/modules/cargo/packs/service.dm @@ -28,32 +28,6 @@ /obj/item/stack/packageWrap) crate_name = "cargo supplies crate" -/datum/supply_pack/service/carpet_exotic - name = "Exotic Carpet Crate" - desc = "Exotic carpets straight from Space Russia, for all your decorating needs. Contains 100 tiles each of 10 different flooring patterns." - cost = 7000 - contains = list(/obj/item/stack/tile/carpet/blue/fifty, - /obj/item/stack/tile/carpet/blue/fifty, - /obj/item/stack/tile/carpet/cyan/fifty, - /obj/item/stack/tile/carpet/cyan/fifty, - /obj/item/stack/tile/carpet/green/fifty, - /obj/item/stack/tile/carpet/green/fifty, - /obj/item/stack/tile/carpet/orange/fifty, - /obj/item/stack/tile/carpet/orange/fifty, - /obj/item/stack/tile/carpet/purple/fifty, - /obj/item/stack/tile/carpet/purple/fifty, - /obj/item/stack/tile/carpet/red/fifty, - /obj/item/stack/tile/carpet/red/fifty, - /obj/item/stack/tile/carpet/royalblue/fifty, - /obj/item/stack/tile/carpet/royalblue/fifty, - /obj/item/stack/tile/carpet/royalblack/fifty, - /obj/item/stack/tile/carpet/royalblack/fifty, - /obj/item/stack/tile/carpet/blackred/fifty, - /obj/item/stack/tile/carpet/blackred/fifty, - /obj/item/stack/tile/carpet/monochrome/fifty, - /obj/item/stack/tile/carpet/monochrome/fifty) - crate_name = "exotic carpet crate" - /datum/supply_pack/service/mule name = "MULEbot Crate" desc = "Pink-haired Quartermaster not doing her job? Replace her with this tireless worker, today!" @@ -279,21 +253,6 @@ crate_name = "janitorial cart crate" crate_type = /obj/structure/closet/crate/large -/datum/supply_pack/service/janitor/janpremium - name = "Janitor Premium Supplies" - desc = "Do to the union for better supplies, we have desided to make a deal for you, In this crate you can get a brand new chem, Drying Angent this stuff is the work of slimes or magic! This crate also contains a rag to test out the Drying Angent magic, three wet floor signs, and some spare bottles of ammonia." - cost = 1750 - access = ACCESS_JANITOR - contains = list(/obj/item/caution, - /obj/item/caution, - /obj/item/caution, - /obj/item/reagent_containers/rag, - /obj/item/reagent_containers/glass/bottle/ammonia, - /obj/item/reagent_containers/glass/bottle/ammonia, - /obj/item/reagent_containers/glass/bottle/ammonia, - /obj/item/reagent_containers/spray/drying_agent) - crate_name = "janitor backpack crate" - /datum/supply_pack/service/carpet name = "Premium Carpet Crate" desc = "Plasteel floor tiles getting on your nerves? These stacks of extra soft carpet will tie any room together. Contains the classics." @@ -314,6 +273,32 @@ /obj/item/stack/tile/carpet/monochrome/fifty) crate_name = "premium carpet crate #2" +/datum/supply_pack/service/carpet_exotic + name = "Exotic Carpet Crate" + desc = "Exotic carpets straight from Space Russia, for all your decorating needs. Contains 100 tiles each of 10 different flooring patterns." + cost = 7000 + contains = list(/obj/item/stack/tile/carpet/blue/fifty, + /obj/item/stack/tile/carpet/blue/fifty, + /obj/item/stack/tile/carpet/cyan/fifty, + /obj/item/stack/tile/carpet/cyan/fifty, + /obj/item/stack/tile/carpet/green/fifty, + /obj/item/stack/tile/carpet/green/fifty, + /obj/item/stack/tile/carpet/orange/fifty, + /obj/item/stack/tile/carpet/orange/fifty, + /obj/item/stack/tile/carpet/purple/fifty, + /obj/item/stack/tile/carpet/purple/fifty, + /obj/item/stack/tile/carpet/red/fifty, + /obj/item/stack/tile/carpet/red/fifty, + /obj/item/stack/tile/carpet/royalblue/fifty, + /obj/item/stack/tile/carpet/royalblue/fifty, + /obj/item/stack/tile/carpet/royalblack/fifty, + /obj/item/stack/tile/carpet/royalblack/fifty, + /obj/item/stack/tile/carpet/blackred/fifty, + /obj/item/stack/tile/carpet/blackred/fifty, + /obj/item/stack/tile/carpet/monochrome/fifty, + /obj/item/stack/tile/carpet/monochrome/fifty) + crate_name = "exotic carpet crate" + ////////////////////////////////////////////////////////////////////////////// //////////////////////////// Vendor Refills ////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm index f006f2b358..c585961604 100644 --- a/code/modules/events/shuttle_loan.dm +++ b/code/modules/events/shuttle_loan.dm @@ -133,7 +133,7 @@ shuttle_spawns.Add(/mob/living/simple_animal/hostile/syndicate/ranged/infiltrator) if(RUSKY_PARTY) - var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/misc/party] + var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/organic/party] pack.generate(pick_n_take(empty_shuttle_turfs)) shuttle_spawns.Add(/mob/living/simple_animal/hostile/russian) diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index 74a5164844..e418657065 100644 Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ diff --git a/modular_citadel/code/modules/projectiles/guns/ballistic/spinfusor.dm b/modular_citadel/code/modules/projectiles/guns/ballistic/spinfusor.dm index d16df6b285..5cb6dc5f20 100644 --- a/modular_citadel/code/modules/projectiles/guns/ballistic/spinfusor.dm +++ b/modular_citadel/code/modules/projectiles/guns/ballistic/spinfusor.dm @@ -71,20 +71,4 @@ icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi' icon_state = "spinfusorbox" ammo_type = /obj/item/ammo_casing/caseless/spinfusor - max_ammo = 8 - -/datum/supply_pack/security/armory/spinfusor - name = "Stormhammer Spinfusor Crate" - cost = 14000 - contains = list(/obj/item/gun/ballistic/automatic/spinfusor, - /obj/item/gun/ballistic/automatic/spinfusor) - crate_name = "spinfusor crate" - -/datum/supply_pack/security/armory/spinfusorammo - name = "Spinfusor Disk Crate" - cost = 7000 - contains = list(/obj/item/ammo_box/aspinfusor, - /obj/item/ammo_box/aspinfusor, - /obj/item/ammo_box/aspinfusor, - /obj/item/ammo_box/aspinfusor) - crate_name = "spinfusor disk crate" \ No newline at end of file + max_ammo = 8 \ No newline at end of file