diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index c9fc59a3fe..53209fac2f 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -39,6 +39,9 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \ /obj/item/stack/sheet/glass/fifty amount = 50 +/obj/item/stack/sheet/glass/five + amount = 5 + /obj/item/stack/sheet/glass/Initialize(mapload, new_amount, merge = TRUE) recipes = GLOB.glass_recipes return ..() diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index e053ff2a5c..3f8f6d9afc 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -875,7 +875,7 @@ #undef HEART #undef SMILEY -/obj/item/storage/box/ingredients //This box is for the randomely chosen version the chef spawns with, it shouldn't actually exist. +/obj/item/storage/box/ingredients //This box is for the randomly chosen version the chef spawns with, it shouldn't actually exist. name = "ingredients box" illustration = "fruit" var/theme_name diff --git a/code/modules/cargo/packs/emergency.dm b/code/modules/cargo/packs/emergency.dm index 3ac0bc9e8e..7d11ba84b8 100644 --- a/code/modules/cargo/packs/emergency.dm +++ b/code/modules/cargo/packs/emergency.dm @@ -44,11 +44,10 @@ crate_name = "emergency crate" crate_type = /obj/structure/closet/crate/internals -/datum/supply_pack/emergency/medemergency +/datum/supply_pack/emergency/medicalemergency name = "Emergency Medical Supplies" desc = "Emergency supplies for a front-line medic. Contains two boxes of body bags, a medical HUD, a defib unit, medical belt, toxin bottles, epipens, and several types of medical kits." - cost = 3000 - DropPodOnly = TRUE + cost = 6600 contains = list(/obj/item/storage/box/bodybags, /obj/item/storage/box/bodybags, /obj/item/clothing/glasses/hud/health, @@ -58,11 +57,29 @@ /obj/item/storage/firstaid/o2, /obj/item/storage/firstaid/brute, /obj/item/storage/firstaid/fire, - /obj/item/storage/firstaid/regular, /obj/item/reagent_containers/glass/bottle/toxin, /obj/item/reagent_containers/glass/bottle/toxin, /obj/item/storage/box/medipens) crate_name = "medical emergency crate" + crate_type = /obj/structure/closet/crate/medical + +/datum/supply_pack/emergency/medemergencylite + name = "Emergency Medical Supplies (Lite)" + desc = "A less than optimal, but still effective, set of tools for emergency care. Contains a box of bodybags, a medical HUD, healing sprays, charcoal, some gauze, and some spare medipens." + cost = 2800 + contains = list(/obj/item/storage/box/bodybags, + /obj/item/stack/medical/gauze, + /obj/item/clothing/glasses/hud/health, + /obj/item/reagent_containers/medspray/styptic, + /obj/item/reagent_containers/medspray/silver_sulf, + /obj/item/reagent_containers/medspray/synthflesh, + /obj/item/reagent_containers/glass/bottle/charcoal, + /obj/item/reagent_containers/glass/bottle/charcoal, + /obj/item/reagent_containers/hypospray/medipen, + /obj/item/reagent_containers/hypospray/medipen, + /obj/item/reagent_containers/hypospray/medipen) + crate_name = "medical emergency crate (lite)" + crate_type = /obj/structure/closet/crate/medical /datum/supply_pack/emergency/radiatione_emergency name = "Emergency Radiation Protection Crate" diff --git a/code/modules/cargo/packs/engineering.dm b/code/modules/cargo/packs/engineering.dm index 19cb53489e..ce42a41e6f 100644 --- a/code/modules/cargo/packs/engineering.dm +++ b/code/modules/cargo/packs/engineering.dm @@ -74,7 +74,7 @@ /datum/supply_pack/engineering/industrialrcd name = "Industrial RCD" - desc = "A industrial RCD in case the station has gone through more then one meteor storm and the CE needs to bring out the somthing a bit more reliable. Dose not contain spare ammo for the industrial RCD or any other RCD modles." + desc = "A industrial RCD in case the station has gone through more then one meteor storm and the CE needs to bring out the somthing a bit more reliable. Does not contain spare ammo for the industrial RCD or any other RCD models." cost = 4500 access = ACCESS_CE contains = list(/obj/item/construction/rcd/industrial) @@ -121,6 +121,17 @@ crate_name = "power cell crate" crate_type = /obj/structure/closet/crate/engineering/electrical +/datum/supply_pack/engineering/powertools + name = "Power Tools Crate" + desc = "Setting up the aux base? Working out in space? Maybe you just hate doing things by hand. Grab some power tools and slash your workload in half! Contains a hardhat, hazard vest, Hand Drill, and Jaws of Life" + cost = 6500 + access = ACCESS_ENGINE + contains = list(/obj/item/clothing/head/hardhat, + /obj/item/clothing/suit/hazardvest, + /obj/item/screwdriver/power, + /obj/item/crowbar/power) + crate_name = "power tools crate" + crate_type = /obj/structure/closet/crate/secure/engineering /datum/supply_pack/engineering/siezedpower name = "Siezed Power Cell Crate" diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm index 40c3334b46..5bda9173c0 100644 --- a/code/modules/cargo/packs/medical.dm +++ b/code/modules/cargo/packs/medical.dm @@ -95,7 +95,7 @@ /datum/supply_pack/science/adv_surgery_tools name = "Med-Co Advanced surgery tools" - desc = "A full set of Med-Co advanced surgery tools, this crate also comes with a spay of synth flesh as well as a can of . Requires Surgery access to open." + desc = "A full set of Med-Co advanced surgery tools, this crate both a can of synthflesh and a can of sterilizine. Requires Surgery access to open." cost = 5500 access = ACCESS_SURGERY contains = list(/obj/item/storage/belt/medical/surgery_belt_adv, diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm index ae61068462..2d834729ca 100644 --- a/code/modules/cargo/packs/misc.dm +++ b/code/modules/cargo/packs/misc.dm @@ -9,6 +9,10 @@ /datum/supply_pack/misc group = "Miscellaneous Supplies" +////////////////////////////////////////////////////////////////////////////// +//////////////////// Paperwork and Writing Supplies ////////////////////////// +////////////////////////////////////////////////////////////////////////////// + /datum/supply_pack/misc/artsupply name = "Art Supplies" desc = "Make some happy little accidents with six canvasses, two easels, two boxes of crayons, and a rainbow crayon!" @@ -29,68 +33,6 @@ crate_name = "art supply crate" crate_type = /obj/structure/closet/crate/wooden -/datum/supply_pack/misc/randombedsheets - name = "Bedsheet Crate (R)" - desc = "Snuggle up in some sweet sheets with this assorted bedsheet crate. Each set comes with eight random bedsheets for your slumbering pleasure!" - cost = 2000 - contains = list(/obj/item/bedsheet/random, - /obj/item/bedsheet/random, - /obj/item/bedsheet/random, - /obj/item/bedsheet/random, - /obj/item/bedsheet/random, - /obj/item/bedsheet/random, - /obj/item/bedsheet/random, - /obj/item/bedsheet/random) //I'm lazy, and I copy paste stuff. - crate_name = "random bedsheet crate" - -/datum/supply_pack/misc/coloredsheets - name = "Bedsheet Crate (C)" - desc = "Give your night life a splash of color with this crate filled with bedsheets! Contains a total of nine different-colored sheets." - cost = 1250 - contains = list(/obj/item/bedsheet/blue, - /obj/item/bedsheet/green, - /obj/item/bedsheet/orange, - /obj/item/bedsheet/purple, - /obj/item/bedsheet/red, - /obj/item/bedsheet/yellow, - /obj/item/bedsheet/brown, - /obj/item/bedsheet/black, - /obj/item/bedsheet/rainbow) - crate_name = "colored bedsheet crate" - -/datum/supply_pack/misc/captain_pen - name = "Captain Pen" - desc = "A spare Captain fountain pen." - access = ACCESS_CAPTAIN - cost = 10000 - contains = list(/obj/item/pen/fountain/captain) - crate_name = "captain pen" - crate_type = /obj/structure/closet/crate/secure/weapon //It is a combat pen - -/datum/supply_pack/misc/bicycle - name = "Bicycle" - desc = "Nanotrasen reminds all employees to never toy with powers outside their control." - cost = 1000000 - contains = list(/obj/vehicle/ridden/bicycle) - crate_name = "Bicycle Crate" - crate_type = /obj/structure/closet/crate/large - -/datum/supply_pack/misc/bigband - name = "Big Band Instrument Collection" - desc = "Get your sad station movin' and groovin' with this fine collection! Contains nine different instruments!" - cost = 5000 - crate_name = "Big band musical instruments collection" - contains = list(/obj/item/instrument/violin, - /obj/item/instrument/guitar, - /obj/item/instrument/glockenspiel, - /obj/item/instrument/accordion, - /obj/item/instrument/saxophone, - /obj/item/instrument/trombone, - /obj/item/instrument/recorder, - /obj/item/instrument/harmonica, - /obj/structure/piano/unanchored) - crate_type = /obj/structure/closet/crate/wooden - /datum/supply_pack/misc/book_crate name = "Book Crate" desc = "Surplus from the Nanotrasen Archives, these five books are sure to be good reads." @@ -127,6 +69,15 @@ /obj/item/storage/briefcase) crate_name = "bureaucracy crate" +/datum/supply_pack/misc/captain_pen + name = "Captain Pen" + desc = "A spare Captain fountain pen." + access = ACCESS_CAPTAIN + cost = 10000 + contains = list(/obj/item/pen/fountain/captain) + crate_name = "captain pen" + crate_type = /obj/structure/closet/crate/secure/weapon //It is a combat pen + /datum/supply_pack/misc/fountainpens name = "Calligraphy Crate" desc = "Sign death warrants in style with these seven executive fountain pens." @@ -136,43 +87,6 @@ crate_type = /obj/structure/closet/crate/wooden crate_name = "calligraphy 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/exoticfootwear - name = "Exotic Footwear Crate" - desc = "Popularised by lizards and exotic dancers, the footwear included in this shipment is sure to give your feet the breathing room they deserve. Sweet Kicks Inc. is not responsible for any damage, distress, or @r0u$a1 caused by this shipment." - cost = 2200 - contraband = TRUE - contains = list(/obj/item/clothing/shoes/wraps, - /obj/item/clothing/shoes/wraps, - /obj/item/clothing/shoes/wraps/silver, - /obj/item/clothing/shoes/wraps/silver, - /obj/item/clothing/shoes/wraps/red, - /obj/item/clothing/shoes/wraps/red, - /obj/item/clothing/shoes/wraps/blue, - /obj/item/clothing/shoes/wraps/blue, - /obj/item/clothing/shoes/clown_shoes, - /obj/item/clothing/shoes/kindleKicks) - crate_name = "footie crate" - -/datum/supply_pack/misc/wrapping_paper - name = "Festive Wrapping Paper Crate" - desc = "Want to mail your loved ones gift-wrapped chocolates, stuffed animals, the Clown's severed head? You can do all that, with this crate full of wrapping paper." - cost = 1000 - contains = list(/obj/item/stack/wrapping_paper) - crate_type = /obj/structure/closet/crate/wooden - crate_name = "festive wrapping paper crate" - /datum/supply_pack/misc/paper_work name = "Freelance Paper work" desc = "The Nanotrasen Primary Bureaucratic Database Intelligence (PDBI) reports that the station has not completed its funding and grant paperwork this solar cycle. In order to gain further funding, your station is required to fill out (20) ten of these forms or no additional capital will be disbursed. We have sent you ten copies of the following form and we expect every one to be up to Nanotrasen Standards." // Disbursement. It's not a typo, look it up. @@ -201,6 +115,136 @@ ) crate_name = "Paperwork" +////////////////////////////////////////////////////////////////////////////// +//////////////////////////////// Entertainment /////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/misc/randombedsheets + name = "Bedsheet Crate (R)" + desc = "Snuggle up in some sweet sheets with this assorted bedsheet crate. Each set comes with eight random bedsheets for your slumbering pleasure!" + cost = 2000 + contains = list(/obj/item/bedsheet/random, + /obj/item/bedsheet/random, + /obj/item/bedsheet/random, + /obj/item/bedsheet/random, + /obj/item/bedsheet/random, + /obj/item/bedsheet/random, + /obj/item/bedsheet/random, + /obj/item/bedsheet/random) //I'm lazy, and I copy paste stuff. + crate_name = "random bedsheet crate" + +/datum/supply_pack/misc/coloredsheets + name = "Bedsheet Crate (C)" + desc = "Give your night life a splash of color with this crate filled with bedsheets! Contains a total of nine different-colored sheets." + cost = 1250 + contains = list(/obj/item/bedsheet/blue, + /obj/item/bedsheet/green, + /obj/item/bedsheet/orange, + /obj/item/bedsheet/purple, + /obj/item/bedsheet/red, + /obj/item/bedsheet/yellow, + /obj/item/bedsheet/brown, + /obj/item/bedsheet/black, + /obj/item/bedsheet/rainbow) + crate_name = "colored bedsheet crate" + +/datum/supply_pack/misc/bicycle + name = "Bicycle" + desc = "Nanotrasen reminds all employees to never toy with powers outside their control." + cost = 1000000 + contains = list(/obj/vehicle/ridden/bicycle) + crate_name = "Bicycle Crate" + crate_type = /obj/structure/closet/crate/large + +/datum/supply_pack/misc/bigband + name = "Big Band Instrument Collection" + desc = "Get your sad station movin' and groovin' with this fine collection! Contains nine different instruments!" + cost = 5000 + crate_name = "Big band musical instruments collection" + contains = list(/obj/item/instrument/violin, + /obj/item/instrument/guitar, + /obj/item/instrument/glockenspiel, + /obj/item/instrument/accordion, + /obj/item/instrument/saxophone, + /obj/item/instrument/trombone, + /obj/item/instrument/recorder, + /obj/item/instrument/harmonica, + /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/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." + contraband = TRUE + cost = 10000 + contains = list(/obj/item/coin/iron) + crate_name = "coin crate" + crate_type = /obj/structure/closet/crate/large + +/datum/supply_pack/misc/coincrate/generate() + . = ..() + for(var/i in 1 to 9) + new /obj/item/coin/iron(.) + +/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!" + cost = 3000 + contains = list(/obj/item/circuitboard/computer/arcade/battle, + /obj/item/circuitboard/computer/arcade/battle, + /obj/item/circuitboard/computer/arcade/orion_trail, + /obj/item/circuitboard/computer/arcade/orion_trail, + /obj/item/circuitboard/computer/arcade/minesweeper, + /obj/item/circuitboard/computer/arcade/minesweeper, + /obj/item/circuitboard/computer/slot_machine, + /obj/item/circuitboard/computer/slot_machine, + /obj/item/circuitboard/computer/slot_machine, + /obj/item/circuitboard/computer/slot_machine, + /obj/item/circuitboard/computer/slot_machine, + /obj/item/circuitboard/computer/slot_machine) + crate_name = "casino crate" + +////////////////////////////////////////////////////////////////////////////// +//////////////////////////////// Misc Supplies /////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/misc/exoticfootwear + name = "Exotic Footwear Crate" + desc = "Popularised by lizards and exotic dancers, the footwear included in this shipment is sure to give your feet the breathing room they deserve. Sweet Kicks Inc. is not responsible for any damage, distress, or @r0u$a1 caused by this shipment." + cost = 2200 + contraband = TRUE + contains = list(/obj/item/clothing/shoes/wraps, + /obj/item/clothing/shoes/wraps, + /obj/item/clothing/shoes/wraps/silver, + /obj/item/clothing/shoes/wraps/silver, + /obj/item/clothing/shoes/wraps/red, + /obj/item/clothing/shoes/wraps/red, + /obj/item/clothing/shoes/wraps/blue, + /obj/item/clothing/shoes/wraps/blue, + /obj/item/clothing/shoes/clown_shoes, + /obj/item/clothing/shoes/kindleKicks) + crate_name = "footie crate" + +/datum/supply_pack/misc/wrapping_paper + name = "Festive Wrapping Paper Crate" + desc = "Want to mail your loved ones gift-wrapped chocolates, stuffed animals, the Clown's severed head? You can do all that, with this crate full of wrapping paper." + cost = 1000 + contains = list(/obj/item/stack/wrapping_paper) + crate_type = /obj/structure/closet/crate/wooden + crate_name = "festive wrapping paper crate" + /datum/supply_pack/misc/funeral name = "Funeral Supply crate" desc = "At the end of the day, someone's gonna want someone dead. Give them a proper send-off with these funeral supplies! Contains a coffin with burial garmets and flowers." @@ -218,9 +262,53 @@ contains = list(/obj/machinery/jukebox) crate_name = "Jukebox" +/datum/supply_pack/misc/religious_supplies + name = "Religious Supplies Crate" + desc = "Keep your local chaplain happy and well-supplied, lest they call down judgement upon your cargo bay. Contains two bottles of holywater, bibles, chaplain robes, and burial garmets." + cost = 4000 // it costs so much because the Space Church is ran by Space Jews + contains = list(/obj/item/reagent_containers/food/drinks/bottle/holywater, + /obj/item/reagent_containers/food/drinks/bottle/holywater, + /obj/item/storage/book/bible/booze, + /obj/item/storage/book/bible/booze, + /obj/item/clothing/suit/hooded/chaplain_hoodie, + /obj/item/clothing/suit/hooded/chaplain_hoodie + ) + crate_name = "religious supplies crate" + +/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!" + cost = 1000 + contains = list(/obj/item/reagent_containers/rag/towel, + /obj/item/reagent_containers/rag/towel, + /obj/item/reagent_containers/rag/towel, + /obj/item/reagent_containers/rag/towel, + /obj/item/reagent_containers/rag/towel, + /obj/item/reagent_containers/rag/towel, + /obj/item/bikehorn/rubberducky, + /obj/item/bikehorn/rubberducky, + /obj/item/soap/nanotrasen) + crate_name = "shower crate" + +/datum/supply_pack/misc/toner + name = "Toner Crate" + desc = "Spent too much ink printing butt pictures? Fret not, with these six toner refills, you'll be printing butts 'till the cows come home!'" + cost = 1000 + contains = list(/obj/item/toner, + /obj/item/toner, + /obj/item/toner, + /obj/item/toner, + /obj/item/toner, + /obj/item/toner) + crate_name = "toner crate" + +////////////////////////////////////////////////////////////////////////////// +//////////////////////////////// Lewd Supplies /////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + /datum/supply_pack/misc/lewd name = "Lewd Crate" // OwO - desc = "Psss want to have a good time with your sluts? Well I got what you want maid clothing, dildos, collars and more!" + desc = "Psss want to have a good time with your sluts? Well I got what you want! Maid clothing, dildos, collars and more!" cost = 5250 contraband = TRUE contains = list(/obj/item/dildo/custom, @@ -249,19 +337,6 @@ crate_name = "deluxe keg" crate_type = /obj/structure/closet/crate -/datum/supply_pack/misc/religious_supplies - name = "Religious Supplies Crate" - desc = "Keep your local chaplain happy and well-supplied, lest they call down judgement upon your cargo bay. Contains two bottles of holywater, bibles, chaplain robes, and burial garmets." - cost = 4000 // it costs so much because the Space Church is ran by Space Jews - contains = list(/obj/item/reagent_containers/food/drinks/bottle/holywater, - /obj/item/reagent_containers/food/drinks/bottle/holywater, - /obj/item/storage/book/bible/booze, - /obj/item/storage/book/bible/booze, - /obj/item/clothing/suit/hooded/chaplain_hoodie, - /obj/item/clothing/suit/hooded/chaplain_hoodie - ) - crate_name = "religious supplies crate" - /datum/supply_pack/misc/randomised/promiscuous name = "Promiscuous Organs" desc = "Do YOU want to have more genital? Well we have just the thing for you~. This crate has two autosurgeon, that will let you have a new sex, organ to impress that hot stud and or chick." @@ -273,31 +348,4 @@ /obj/item/autosurgeon/vagina, /obj/item/autosurgeon/breasts, /obj/item/autosurgeon/womb) - crate_name = "promiscuous organs" - -/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!" - cost = 1000 - contains = list(/obj/item/reagent_containers/rag/towel, - /obj/item/reagent_containers/rag/towel, - /obj/item/reagent_containers/rag/towel, - /obj/item/reagent_containers/rag/towel, - /obj/item/reagent_containers/rag/towel, - /obj/item/reagent_containers/rag/towel, - /obj/item/bikehorn/rubberducky, - /obj/item/bikehorn/rubberducky, - /obj/item/soap/nanotrasen) - crate_name = "shower crate" - -/datum/supply_pack/misc/toner - name = "Toner Crate" - desc = "Spent too much ink printing butt pictures? Fret not, with these six toner refills, you'll be printing butts 'till the cows come home!'" - cost = 1000 - contains = list(/obj/item/toner, - /obj/item/toner, - /obj/item/toner, - /obj/item/toner, - /obj/item/toner, - /obj/item/toner) - crate_name = "toner crate" + crate_name = "promiscuous organs" \ No newline at end of file diff --git a/code/modules/cargo/packs/organic.dm b/code/modules/cargo/packs/organic.dm index 18a9deeb47..3b1531224e 100644 --- a/code/modules/cargo/packs/organic.dm +++ b/code/modules/cargo/packs/organic.dm @@ -165,6 +165,20 @@ access = ACCESS_THEATRE crate_type = /obj/structure/closet/crate/secure +/datum/supply_pack/organic/fakemeat + name = "Meat Crate" + desc = "Run outta meat already? Keep the lizards content with this freezer filled with cruelty-free chemically compounded meat! Contains 4 slabs of meat product, and two slabs of *carp*." + cost = 1700 + hidden = TRUE + contains = list(/obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/carpmeat/imitation, + /obj/item/reagent_containers/food/snacks/carpmeat/imitation) + crate_name = "meaty crate" + crate_type = /obj/structure/closet/crate/freezer + /datum/supply_pack/organic/monkeydripmeat name = "*Meat* Crate" desc = "Need some meat? With this do-it-yourself kit you'll be swimming in it! Contains a monkey cube, an IV drip, and some cryoxadone!" @@ -175,7 +189,18 @@ /obj/machinery/iv_drip, /obj/item/reagent_containers/glass/beaker/cryoxadone, /obj/item/reagent_containers/glass/beaker/cryoxadone) - crate_name = "monkey iv crate" + crate_name = "monkey meat crate" + +/datum/supply_pack/organic/mixedboxes + name = "Mixed Ingredient Boxes" + desc = "Get overwhelmed with inspiration by ordering these boxes of surprise ingredients! Get four boxes filled with an assortment of products!" + cost = 2300 + contains = list(/obj/item/storage/box/ingredients/wildcard, + /obj/item/storage/box/ingredients/wildcard, + /obj/item/storage/box/ingredients/wildcard, + /obj/item/storage/box/ingredients/wildcard) + crate_name = "wildcard food crate" + crate_type = /obj/structure/closet/crate/freezer /datum/supply_pack/organic/pizza name = "Pizza Crate" diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm index 8bc16f84e4..abcc7b983d 100644 --- a/code/modules/cargo/packs/service.dm +++ b/code/modules/cargo/packs/service.dm @@ -70,10 +70,40 @@ crate_name = "ice cream vat crate" crate_type = /obj/structure/closet/crate +/datum/supply_pack/service/buildabar + name = "Build a Bar Crate" + desc = "Looking to set up your own little safe haven? Maintenance bar too much of a bummer to work on? Maybe you just want to set up shop right in front of the bartender. Whatever your reasons, get a jump-start on this with this handy kit. Contains circuitboards for bar equipment, some parts, and some basic bartending supplies. (Batteries not Included)" + cost = 3750 + contains = list(/obj/item/storage/box/drinkingglasses, + /obj/item/storage/box/drinkingglasses, + /obj/item/stock_parts/matter_bin, + /obj/item/stock_parts/matter_bin, + /obj/item/stock_parts/matter_bin, + /obj/item/stock_parts/matter_bin, + /obj/item/stock_parts/matter_bin, + /obj/item/stock_parts/matter_bin, + /obj/item/stock_parts/manipulator, + /obj/item/stock_parts/manipulator, + /obj/item/stock_parts/manipulator, + /obj/item/stock_parts/capacitor, + /obj/item/stock_parts/capacitor, + /obj/item/stack/sheet/metal/ten, + /obj/item/stack/sheet/metal/five, + /obj/item/stack/sheet/glass/five, + /obj/item/stack/cable_coil/random, + /obj/item/reagent_containers/rag, + /obj/item/book/manual/wiki/barman_recipes, + /obj/item/book/granter/action/drink_fling, + /obj/item/reagent_containers/food/drinks/shaker, + /obj/item/circuitboard/machine/chem_dispenser/drinks/beer, + /obj/item/circuitboard/machine/chem_dispenser/drinks, + /obj/item/circuitboard/machine/dish_drive) + crate_name = "build a bar crate" + /datum/supply_pack/service/maintgarden name = "Maintenance Garden Crate" desc = "Set up your own tiny paradise with do-it-yourself botany kit. Contains sandstone for dirt plots, pest spray, ammonia, a portable seed generator, basic botanical tools, and some seeds to start off with." - cost = 1950 + cost = 2350 contains = list(/obj/item/storage/bag/plants/portaseeder, /obj/item/reagent_containers/spray/pestspray, /obj/item/stack/sheet/mineral/sandstone/twelve, @@ -124,7 +154,7 @@ /datum/supply_pack/service/janitor/advanced name = "Advanced Sanitation Crate" desc = "Contains all the essentials for an advanced spacefaring cleanup crew. This kit includes a trashbag of holding, an advanced mop, a bottle of space cleaner, a floor buffer, and a holosign projector." - cost = 7500 + cost = 5000 access = ACCESS_JANITOR contains = list(/obj/item/storage/bag/trash/bluespace, /obj/item/reagent_containers/spray/cleaner, @@ -158,7 +188,7 @@ /datum/supply_pack/service/janitor/janpremium name = "Janitor Premium Supplies" desc = "The custodial union is in a tizzy, so we've gathered up some better supplies for you. In this crate you can get a brand new chem, Drying Agent. This stuff is the work of slimes or magic! This crate also contains a rag to test out the Drying Angent magic, several cleaning grenades, some spare bottles of ammonia, and an MCE (or Massive Cleaning Explosive)." - cost = 2500 + cost = 2700 contains = list(/obj/item/grenade/clusterbuster/cleaner, /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/cleaner,