From 1f9f404012144c65c34f1532ba205c1a3eb34f95 Mon Sep 17 00:00:00 2001 From: Verkister Date: Sat, 7 Apr 2018 18:14:35 +0300 Subject: [PATCH 1/3] Adds a bunch of stuff to cargo selection. -Xenowear crate, 13 non-random xenowear items for 100 points. -Teshari smocks crate, comes with all the 5 basic colors for 25 points. -Teshari undercoats, comes with 4 random colors from basic and grey selection for 20 points. -Teshari undercoats black, comes with 4 random colors from the black trim selection for 20 points. -Teshari cloaks, comes with 4 random colors from basic and grey selection for 40 points. -Teshari cloaks black, comes with 4 random colors from the black trim selection for 40 points. -Utility uniforms, comes with the 3 loadout utility uniforms (black/blue/grey) for 30 points. -Skirts crate, comes with the 10 regular type skirts for 40 points. -Varsity jackets, comes with the set of 6 colors for 60 points. -Leather gear crate, comes with 5 random items from a selection of 21 more or less tough/kinky gear for 50 points. -Eyewear crate, comes with 11 cosmetic and/or prescription pieces for 50 points. -Gloves crate, comes with 4 random gloves with a chance to hit a couple fancier ones among the basic colors for 40 points. -Boots crate, comes with 3 random pairs of boots freely available in loadout for 60 points. -Taurbags crate, comes with the 3 universal saddlebags we have (basic/robust/vest) for 60 points. -Cuisine crate, comes with 5 random foods from a list of varying cultural fanciness for 25 points. -Burger crate, comes with 5 random basic burgers for 15 points. -Special burger crate, comes with 3 random special burgers for 60 points. -Bakery products, comes with 5 random bakery products for 15 points. -Cakes crate, comes with 5 random cakes for 50 points. -Mexican food crate, comes with 5 random mexican foods for 15 points. -Asian food crate, comes with 5 random asian foods for 15 points. -Action figures crate, comes with 5 random figures for 50 points. -Tabletop miniatures crate, delivers the set of those characters for 30 points. -Plushies crate, comes with 3 random plushies for 30 points. --- code/datums/supplypacks/costumes_vr.dm | 269 ++++++++++++++++++++++ code/datums/supplypacks/hospitality_vr.dm | 143 ++++++++++++ code/datums/supplypacks/recreation_vr.dm | 98 +++++++- vorestation.dme | 2 + 4 files changed, 511 insertions(+), 1 deletion(-) create mode 100644 code/datums/supplypacks/costumes_vr.dm create mode 100644 code/datums/supplypacks/hospitality_vr.dm diff --git a/code/datums/supplypacks/costumes_vr.dm b/code/datums/supplypacks/costumes_vr.dm new file mode 100644 index 00000000000..9fe66f5d309 --- /dev/null +++ b/code/datums/supplypacks/costumes_vr.dm @@ -0,0 +1,269 @@ +/datum/supply_packs/costumes/xenowear_vr + name = "Xenowear crate" + contains = list( + /obj/item/clothing/shoes/footwraps, + /obj/item/clothing/shoes/boots/jackboots/toeless, + /obj/item/clothing/shoes/boots/workboots/toeless, + /obj/item/clothing/suit/tajaran/furs, + /obj/item/clothing/head/tajaran/scarf, + /obj/item/clothing/suit/unathi/robe, + /obj/item/clothing/suit/unathi/mantle, + /obj/item/clothing/under/permit, + /obj/item/clothing/under/vox/vox_casual, + /obj/item/clothing/under/vox/vox_robes, + /obj/item/clothing/under/harness, + /obj/item/clothing/under/skirt/loincloth, + /obj/item/clothing/gloves/vox + ) + cost = 100 + containertype = /obj/structure/closet/crate + containername = "Xenowear crate" + +/datum/supply_packs/costumes/tesh_smocks_vr + name = "Teshari smocks" + contains = list( + /obj/item/clothing/under/seromi/smock, + /obj/item/clothing/under/seromi/smock/rainbow, + /obj/item/clothing/under/seromi/smock/red, + /obj/item/clothing/under/seromi/smock/white, + /obj/item/clothing/under/seromi/smock/yellow + ) + cost = 25 + containertype = /obj/structure/closet/crate + containername = "Teshari smocks crate" + +/datum/supply_packs/randomised/costumes/tesh_coats_vr + name = "Teshari undercoats" + num_contained = 4 + contains = list( + /obj/item/clothing/under/seromi/undercoat/blue_grey, + /obj/item/clothing/under/seromi/undercoat/brown_grey, + /obj/item/clothing/under/seromi/undercoat/green_grey, + /obj/item/clothing/under/seromi/undercoat/lightgrey_grey, + /obj/item/clothing/under/seromi/undercoat/orange, + /obj/item/clothing/under/seromi/undercoat/orange_grey, + /obj/item/clothing/under/seromi/undercoat/pink_grey, + /obj/item/clothing/under/seromi/undercoat/purple_grey, + /obj/item/clothing/under/seromi/undercoat/rainbow, + /obj/item/clothing/under/seromi/undercoat/red_grey, + /obj/item/clothing/under/seromi/undercoat/white_grey, + /obj/item/clothing/under/seromi/undercoat/yellow_grey + ) + cost = 20 + containertype = /obj/structure/closet/crate + containername = "Teshari undercoats crate" + +/datum/supply_packs/randomised/costumes/tesh_coats_b_vr + name = "Teshari undercoats (black)" + num_contained = 4 + contains = list( + /obj/item/clothing/under/seromi/undercoat/black, + /obj/item/clothing/under/seromi/undercoat/black_blue, + /obj/item/clothing/under/seromi/undercoat/black_brown, + /obj/item/clothing/under/seromi/undercoat/black_green, + /obj/item/clothing/under/seromi/undercoat/black_grey, + /obj/item/clothing/under/seromi/undercoat/black_lightgrey, + /obj/item/clothing/under/seromi/undercoat/black_midgrey, + /obj/item/clothing/under/seromi/undercoat/black_orange, + /obj/item/clothing/under/seromi/undercoat/black_pink, + /obj/item/clothing/under/seromi/undercoat/black_purple, + /obj/item/clothing/under/seromi/undercoat/black_red, + /obj/item/clothing/under/seromi/undercoat/black_white, + /obj/item/clothing/under/seromi/undercoat/black_yellow + ) + cost = 20 + containertype = /obj/structure/closet/crate + containername = "Teshari undercoats crate" + +/datum/supply_packs/randomised/costumes/tesh_cloaks_vr + name = "Teshari cloaks" + num_contained = 4 + contains = list( + /obj/item/clothing/suit/storage/seromi/cloak/blue_grey, + /obj/item/clothing/suit/storage/seromi/cloak/brown_grey, + /obj/item/clothing/suit/storage/seromi/cloak/green_grey, + /obj/item/clothing/suit/storage/seromi/cloak/lightgrey_grey, + /obj/item/clothing/suit/storage/seromi/cloak/orange, + /obj/item/clothing/suit/storage/seromi/cloak/orange_grey, + /obj/item/clothing/suit/storage/seromi/cloak/pink_grey, + /obj/item/clothing/suit/storage/seromi/cloak/purple_grey, + /obj/item/clothing/suit/storage/seromi/cloak/rainbow, + /obj/item/clothing/suit/storage/seromi/cloak/red_grey, + /obj/item/clothing/suit/storage/seromi/cloak/white_grey, + /obj/item/clothing/suit/storage/seromi/cloak/yellow_grey + ) + cost = 40 + containertype = /obj/structure/closet/crate + containername = "Teshari cloaks crate" + +/datum/supply_packs/randomised/costumes/tesh_cloaks_b_vr + name = "Teshari cloaks (black)" + num_contained = 4 + contains = list( + /obj/item/clothing/suit/storage/seromi/cloak/black, + /obj/item/clothing/suit/storage/seromi/cloak/black_blue, + /obj/item/clothing/suit/storage/seromi/cloak/black_brown, + /obj/item/clothing/suit/storage/seromi/cloak/black_green, + /obj/item/clothing/suit/storage/seromi/cloak/black_grey, + /obj/item/clothing/suit/storage/seromi/cloak/black_lightgrey, + /obj/item/clothing/suit/storage/seromi/cloak/black_midgrey, + /obj/item/clothing/suit/storage/seromi/cloak/black_orange, + /obj/item/clothing/suit/storage/seromi/cloak/black_pink, + /obj/item/clothing/suit/storage/seromi/cloak/black_purple, + /obj/item/clothing/suit/storage/seromi/cloak/black_red, + /obj/item/clothing/suit/storage/seromi/cloak/black_white, + /obj/item/clothing/suit/storage/seromi/cloak/black_yellow + ) + cost = 40 + containertype = /obj/structure/closet/crate + containername = "Teshari cloaks crate" + +/datum/supply_packs/costumes/utility_vr + name = "Utility uniforms" + contains = list( + /obj/item/clothing/under/utility, + /obj/item/clothing/under/utility/blue, + /obj/item/clothing/under/utility/grey + ) + cost = 30 + containertype = /obj/structure/closet/crate + containername = "Utility uniforms crate" + +/datum/supply_packs/costumes/skirts_vr + name = "Skirts crate" + contains = list( + /obj/item/clothing/under/skirt, + /obj/item/clothing/under/skirt/blue, + /obj/item/clothing/under/skirt/denim, + /obj/item/clothing/under/skirt/khaki, + /obj/item/clothing/under/skirt/outfit, + /obj/item/clothing/under/skirt/red, + /obj/item/clothing/under/skirt/swept, + /obj/item/clothing/under/skirt/outfit/plaid_blue, + /obj/item/clothing/under/skirt/outfit/plaid_purple, + /obj/item/clothing/under/skirt/outfit/plaid_red + ) + cost = 40 + containertype = /obj/structure/closet/crate + containername = "Skirts crate" + +/datum/supply_packs/costumes/varsity_vr + name = "Varsity jackets" + contains = list( + /obj/item/clothing/suit/varsity, + /obj/item/clothing/suit/varsity/blue, + /obj/item/clothing/suit/varsity/brown, + /obj/item/clothing/suit/varsity/green, + /obj/item/clothing/suit/varsity/purple, + /obj/item/clothing/suit/varsity/red + ) + cost = 60 + containertype = /obj/structure/closet/crate + containername = "Varsity jackets crate" + +/datum/supply_packs/randomised/costumes/leathergear_vr + name = "Leather gear" + num_contained = 5 + contains = list( + /obj/item/clothing/suit/leathercoat, + /obj/item/clothing/suit/storage/leather_jacket_alt, + /obj/item/clothing/suit/storage/toggle/leather_jacket, + /obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless, + /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen, + /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless, + /obj/item/clothing/under/pants/chaps, + /obj/item/clothing/under/pants/chaps/black, + /obj/item/clothing/under/harness, + /obj/item/clothing/shoes/leather, + /obj/item/clothing/shoes/boots/jungle, + /obj/item/clothing/shoes/boots/jackboots, + /obj/item/clothing/shoes/boots/cowboy, + /obj/item/clothing/shoes/boots/cowboy/classic, + /obj/item/clothing/shoes/boots/cowboy/snakeskin, + /obj/item/clothing/accessory/chaps, + /obj/item/clothing/accessory/chaps/black, + /obj/item/clothing/accessory/collar/spike, + /obj/item/clothing/gloves/fingerless, + /obj/item/clothing/gloves/botanic_leather, + /obj/item/clothing/head/cowboy_hat, + /obj/item/clothing/head/cowboy_hat/black + ) + cost = 50 + containertype = /obj/structure/closet/crate + containername = "Leather gear crate" + +/datum/supply_packs/costumes/eyewear_vr + name = "Eyewear crate" + contains = list( + /obj/item/clothing/glasses/eyepatch, + /obj/item/clothing/glasses/fakesunglasses, + /obj/item/clothing/glasses/fakesunglasses/aviator, + /obj/item/clothing/glasses/fluff/science_proper, + /obj/item/clothing/glasses/fluff/spiffygogs, + /obj/item/clothing/glasses/gglasses, + /obj/item/clothing/glasses/monocle, + /obj/item/clothing/glasses/regular, + /obj/item/clothing/glasses/regular/hipster, + /obj/item/clothing/glasses/regular/scanners, + /obj/item/clothing/glasses/threedglasses + ) + cost = 50 + containertype = /obj/structure/closet/crate + containername = "Eyewear crate" + +/datum/supply_packs/randomised/costumes/gloves_vr + name = "Gloves crate" + num_contained = 4 + contains = list( + /obj/item/clothing/gloves/black, + /obj/item/clothing/gloves/blue, + /obj/item/clothing/gloves/botanic_leather, + /obj/item/clothing/gloves/brown, + /obj/item/clothing/gloves/evening, + /obj/item/clothing/gloves/fingerless, + /obj/item/clothing/gloves/yellow, + /obj/item/clothing/gloves/fyellow, + /obj/item/clothing/gloves/green, + /obj/item/clothing/gloves/grey, + /obj/item/clothing/gloves/light_brown, + /obj/item/clothing/gloves/orange, + /obj/item/clothing/gloves/purple, + /obj/item/clothing/gloves/rainbow, + /obj/item/clothing/gloves/red, + /obj/item/clothing/gloves/white, + /obj/item/clothing/gloves/sterile/latex, + /obj/item/clothing/gloves/sterile/nitrile, + /obj/item/clothing/gloves/swat, + /obj/item/clothing/gloves/tactical + ) + cost = 40 + containertype = /obj/structure/closet/crate + containername = "Gloves crate" + +/datum/supply_packs/randomised/costumes/boots_vr + name = "Boots crate" + num_contained = 3 + contains = list( + /obj/item/clothing/shoes/boots/workboots, + /obj/item/clothing/shoes/boots/cowboy, + /obj/item/clothing/shoes/boots/cowboy/classic, + /obj/item/clothing/shoes/boots/cowboy/snakeskin, + /obj/item/clothing/shoes/boots/duty, + /obj/item/clothing/shoes/boots/jackboots, + /obj/item/clothing/shoes/boots/jungle, + /obj/item/clothing/shoes/boots/winter + ) + cost = 60 + containertype = /obj/structure/closet/crate + containername = "Boots crate" + +/datum/supply_packs/costumes/taurbags + name = "Saddlebags crate" + contains = list( + /obj/item/weapon/storage/backpack/saddlebag_common, + /obj/item/weapon/storage/backpack/saddlebag_common/robust, + /obj/item/weapon/storage/backpack/saddlebag_common/vest + ) + cost = 60 + containertype = /obj/structure/closet/crate + containername = "Saddlebags crate" \ No newline at end of file diff --git a/code/datums/supplypacks/hospitality_vr.dm b/code/datums/supplypacks/hospitality_vr.dm new file mode 100644 index 00000000000..ac009e9b4a9 --- /dev/null +++ b/code/datums/supplypacks/hospitality_vr.dm @@ -0,0 +1,143 @@ +/datum/supply_packs/randomised/hospitality/cuisine_vr + num_contained = 5 + contains = list( + /obj/item/weapon/reagent_containers/food/snacks/blackpudding, + /obj/item/weapon/reagent_containers/food/snacks/bangersandmash, + /obj/item/weapon/reagent_containers/food/snacks/cubancarp, + /obj/item/weapon/reagent_containers/food/snacks/cubannachos, + /obj/item/weapon/reagent_containers/food/snacks/dionaroast, + /obj/item/weapon/reagent_containers/food/snacks/donerkebab, + /obj/item/weapon/reagent_containers/food/snacks/goulash, + /obj/item/weapon/reagent_containers/food/snacks/kitsuneudon, + /obj/item/weapon/reagent_containers/food/snacks/makaroni, + /obj/item/weapon/reagent_containers/food/snacks/mammi, + /obj/item/weapon/reagent_containers/food/snacks/milosoup, + /obj/item/weapon/reagent_containers/food/snacks/pillbug, + /obj/item/weapon/reagent_containers/food/snacks/sashimi, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/sushi, + /obj/item/weapon/reagent_containers/food/snacks/benedict, + /obj/item/weapon/reagent_containers/food/snacks/enchiladas, + /obj/item/weapon/reagent_containers/food/snacks/cheeseburrito, + /obj/item/weapon/reagent_containers/food/snacks/cheesenachos, + /obj/item/weapon/reagent_containers/food/snacks/eggplantparm, + /obj/item/weapon/reagent_containers/food/snacks/fuegoburrito, + /obj/item/weapon/reagent_containers/food/snacks/generalschicken, + /obj/item/weapon/reagent_containers/food/snacks/hotandsoursoup, + /obj/item/weapon/reagent_containers/food/snacks/hotchili, + /obj/item/weapon/reagent_containers/food/snacks/lasagna, + /obj/item/weapon/reagent_containers/food/snacks/meatburrito, + /obj/item/weapon/reagent_containers/food/snacks/wingfangchu + ) + name = "Cuisine crate" + cost = 25 + containertype = /obj/structure/closet/crate/freezer + containername = "Cuisine crate" + +/datum/supply_packs/randomised/hospitality/burgers_vr + num_contained = 5 + contains = list( + /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, + /obj/item/weapon/reagent_containers/food/snacks/cheeseburger, + /obj/item/weapon/reagent_containers/food/snacks/jellyburger, + /obj/item/weapon/reagent_containers/food/snacks/tofuburger, + /obj/item/weapon/reagent_containers/food/snacks/fishburger + ) + name = "Burger crate" + cost = 15 + containertype = /obj/structure/closet/crate/freezer + containername = "Burger crate" + +/datum/supply_packs/randomised/hospitality/specialburgers_vr + num_contained = 3 + contains = list( + /obj/item/weapon/reagent_containers/food/snacks/clownburger, + /obj/item/weapon/reagent_containers/food/snacks/ghostburger, + /obj/item/weapon/reagent_containers/food/snacks/mimeburger, + /obj/item/weapon/reagent_containers/food/snacks/brainburger, + /obj/item/weapon/reagent_containers/food/snacks/roburger, + /obj/item/weapon/reagent_containers/food/snacks/spellburger, + /obj/item/weapon/reagent_containers/food/snacks/superbiteburger, + /obj/item/weapon/reagent_containers/food/snacks/xenoburger, + /obj/item/weapon/reagent_containers/food/snacks/monkeyburger + ) + name = "Special burger crate" + cost = 60 + containertype = /obj/structure/closet/crate/freezer + containername = "Special burger crate" + +/datum/supply_packs/randomised/hospitality/bakery_vr + num_contained = 5 + contains = list( + /obj/item/weapon/reagent_containers/food/snacks/baguette, + /obj/item/weapon/reagent_containers/food/snacks/appletart, + /obj/item/weapon/reagent_containers/food/snacks/berrymuffin, + /obj/item/weapon/reagent_containers/food/snacks/bunbun, + /obj/item/weapon/reagent_containers/food/snacks/cherrypie, + /obj/item/weapon/reagent_containers/food/snacks/cookie, + /obj/item/weapon/reagent_containers/food/snacks/croissant, + /obj/item/weapon/reagent_containers/food/snacks/donut/normal, + /obj/item/weapon/reagent_containers/food/snacks/donut/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly, + /obj/item/weapon/reagent_containers/food/snacks/muffin, + /obj/item/weapon/reagent_containers/food/snacks/pie, + /obj/item/weapon/reagent_containers/food/snacks/plump_pie, + /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit, + /obj/item/weapon/reagent_containers/food/snacks/poppypretzel, + /obj/item/weapon/reagent_containers/food/snacks/sugarcookie, + /obj/item/weapon/reagent_containers/food/snacks/waffles + ) + name = "Bakery products crate" + cost = 15 + containertype = /obj/structure/closet/crate/freezer + containername = "Bakery products crate" + +/datum/supply_packs/randomised/hospitality/cakes_vr + num_contained = 5 + contains = list( + /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake + ) + name = "Cake crate" + cost = 50 + containertype = /obj/structure/closet/crate/freezer + containername = "Cake crate" + +/datum/supply_packs/randomised/hospitality/mexican_vr + num_contained = 5 + contains = list( + /obj/item/weapon/reagent_containers/food/snacks/cheeseburrito, + /obj/item/weapon/reagent_containers/food/snacks/cheesenachos, + /obj/item/weapon/reagent_containers/food/snacks/enchiladas, + /obj/item/weapon/reagent_containers/food/snacks/fuegoburrito, + /obj/item/weapon/reagent_containers/food/snacks/meatburrito, + /obj/item/weapon/reagent_containers/food/snacks/nachos, + /obj/item/weapon/reagent_containers/food/snacks/taco + ) + name = "Mexican food crate" + cost = 15 + containertype = /obj/structure/closet/crate/freezer + containername = "Mexican food crate" + +/datum/supply_packs/randomised/hospitality/asian_vr + num_contained = 5 + contains = list( + /obj/item/weapon/reagent_containers/food/snacks/chawanmushi, + /obj/item/weapon/reagent_containers/food/snacks/generalschicken, + /obj/item/weapon/reagent_containers/food/snacks/hotandsoursoup, + /obj/item/weapon/reagent_containers/food/snacks/kitsuneudon, + /obj/item/weapon/reagent_containers/food/snacks/sashimi, + /obj/item/weapon/reagent_containers/food/snacks/wingfangchu, + /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/sushi + ) + name = "Asian food crate" + cost = 15 + containertype = /obj/structure/closet/crate/freezer + containername = "Asian food crate" \ No newline at end of file diff --git a/code/datums/supplypacks/recreation_vr.dm b/code/datums/supplypacks/recreation_vr.dm index e95094428e2..c40ef25e070 100644 --- a/code/datums/supplypacks/recreation_vr.dm +++ b/code/datums/supplypacks/recreation_vr.dm @@ -38,4 +38,100 @@ ) cost = 50 containertype = /obj/structure/closet/crate - containername = "wolfgirl cosplay crate" \ No newline at end of file + containername = "wolfgirl cosplay crate" + +/datum/supply_packs/randomised/recreation/figures_vr + name = "Action figures crate" + num_contained = 5 + contains = list( + /obj/item/toy/figure/agent, + /obj/item/toy/figure/assistant, + /obj/item/toy/figure/atmos, + /obj/item/toy/figure/bartender, + /obj/item/toy/figure/borg, + /obj/item/toy/figure/captain, + /obj/item/toy/figure/cargotech, + /obj/item/toy/figure/ce, + /obj/item/toy/figure/chaplain, + /obj/item/toy/figure/chef, + /obj/item/toy/figure/chemist, + /obj/item/toy/figure/clown, + /obj/item/toy/figure/cmo, + /obj/item/toy/figure/corgi, + /obj/item/toy/figure/detective, + /obj/item/toy/figure/dsquad, + /obj/item/toy/figure/engineer, + /obj/item/toy/figure/ert, + /obj/item/toy/figure/gardener, + /obj/item/toy/figure/geneticist, + /obj/item/toy/figure/hop, + /obj/item/toy/figure/hos, + /obj/item/toy/figure/janitor, + /obj/item/toy/figure/librarian, + /obj/item/toy/figure/md, + /obj/item/toy/figure/mime, + /obj/item/toy/figure/miner, + /obj/item/toy/figure/ninja, + /obj/item/toy/figure/paramedic, + /obj/item/toy/figure/psychologist, + /obj/item/toy/figure/qm, + /obj/item/toy/figure/rd, + /obj/item/toy/figure/roboticist, + /obj/item/toy/figure/scientist, + /obj/item/toy/figure/secofficer, + /obj/item/toy/figure/syndie, + /obj/item/toy/figure/virologist, + /obj/item/toy/figure/warden, + /obj/item/toy/figure/wizard, + /obj/item/toy/griffin, + /obj/item/toy/owl + ) + cost = 50 + containertype = /obj/structure/closet/crate + containername = "Action figures crate" + +/datum/supply_packs/recreation/characters_vr + name = "Tabletop miniatures" + contains = list( + /obj/item/weapon/storage/box/characters + ) + containertype = /obj/structure/closet/crate + containername = "Tabletop miniatures crate" + cost = 30 + +/datum/supply_packs/randomised/recreation/plushies_vr + name = "Plushies crate" + num_contained = 3 + contains = list( + /obj/item/toy/plushie/black_cat, + /obj/item/toy/plushie/black_fox, + /obj/item/toy/plushie/blue_fox, + /obj/item/toy/plushie/coffee_fox, + /obj/item/toy/plushie/corgi, + /obj/item/toy/plushie/crimson_fox, + /obj/item/toy/plushie/deer, + /obj/item/toy/plushie/face_hugger, + /obj/item/toy/plushie/farwa, + /obj/item/toy/plushie/girly_corgi, + /obj/item/toy/plushie/grey_cat, + /obj/item/toy/plushie/kitten, + /obj/item/toy/plushie/lizard, + /obj/item/toy/plushie/marble_fox, + /obj/item/toy/plushie/mouse, + /obj/item/toy/plushie/nymph, + /obj/item/toy/plushie/octopus, + /obj/item/toy/plushie/orange_cat, + /obj/item/toy/plushie/orange_fox, + /obj/item/toy/plushie/pink_fox, + /obj/item/toy/plushie/purple_fox, + /obj/item/toy/plushie/red_fox, + /obj/item/toy/plushie/robo_corgi, + /obj/item/toy/plushie/siamese_cat, + /obj/item/toy/plushie/spider, + /obj/item/toy/plushie/tabby_cat, + /obj/item/toy/plushie/tuxedo_cat, + /obj/item/toy/plushie/white_cat + ) + cost = 30 + containertype = /obj/structure/closet/crate + containername = "Plushies crate" \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index 070421534e8..20dd5d3df5e 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -314,9 +314,11 @@ #include "code\datums\supplypacks\contraband.dm" #include "code\datums\supplypacks\contraband_vr.dm" #include "code\datums\supplypacks\costumes.dm" +#include "code\datums\supplypacks\costumes_vr.dm" #include "code\datums\supplypacks\engineering.dm" #include "code\datums\supplypacks\engineering_vr.dm" #include "code\datums\supplypacks\hospitality.dm" +#include "code\datums\supplypacks\hospitality_vr.dm" #include "code\datums\supplypacks\hydroponics.dm" #include "code\datums\supplypacks\hydroponics_vr.dm" #include "code\datums\supplypacks\materials.dm" From 6d93803b7828a303186ad789f9eb078078207514 Mon Sep 17 00:00:00 2001 From: Verkister Date: Sun, 8 Apr 2018 15:21:34 +0300 Subject: [PATCH 2/3] Cargo pack tweaks. --- code/datums/supplypacks/costumes_vr.dm | 7 +- code/datums/supplypacks/hospitality_vr.dm | 91 ++++------------------- code/datums/supplypacks/recreation_vr.dm | 6 +- 3 files changed, 20 insertions(+), 84 deletions(-) diff --git a/code/datums/supplypacks/costumes_vr.dm b/code/datums/supplypacks/costumes_vr.dm index 9fe66f5d309..fd8921ba771 100644 --- a/code/datums/supplypacks/costumes_vr.dm +++ b/code/datums/supplypacks/costumes_vr.dm @@ -221,7 +221,6 @@ /obj/item/clothing/gloves/brown, /obj/item/clothing/gloves/evening, /obj/item/clothing/gloves/fingerless, - /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/fyellow, /obj/item/clothing/gloves/green, /obj/item/clothing/gloves/grey, @@ -230,11 +229,7 @@ /obj/item/clothing/gloves/purple, /obj/item/clothing/gloves/rainbow, /obj/item/clothing/gloves/red, - /obj/item/clothing/gloves/white, - /obj/item/clothing/gloves/sterile/latex, - /obj/item/clothing/gloves/sterile/nitrile, - /obj/item/clothing/gloves/swat, - /obj/item/clothing/gloves/tactical + /obj/item/clothing/gloves/white ) cost = 40 containertype = /obj/structure/closet/crate diff --git a/code/datums/supplypacks/hospitality_vr.dm b/code/datums/supplypacks/hospitality_vr.dm index ac009e9b4a9..1f69ef11513 100644 --- a/code/datums/supplypacks/hospitality_vr.dm +++ b/code/datums/supplypacks/hospitality_vr.dm @@ -1,38 +1,3 @@ -/datum/supply_packs/randomised/hospitality/cuisine_vr - num_contained = 5 - contains = list( - /obj/item/weapon/reagent_containers/food/snacks/blackpudding, - /obj/item/weapon/reagent_containers/food/snacks/bangersandmash, - /obj/item/weapon/reagent_containers/food/snacks/cubancarp, - /obj/item/weapon/reagent_containers/food/snacks/cubannachos, - /obj/item/weapon/reagent_containers/food/snacks/dionaroast, - /obj/item/weapon/reagent_containers/food/snacks/donerkebab, - /obj/item/weapon/reagent_containers/food/snacks/goulash, - /obj/item/weapon/reagent_containers/food/snacks/kitsuneudon, - /obj/item/weapon/reagent_containers/food/snacks/makaroni, - /obj/item/weapon/reagent_containers/food/snacks/mammi, - /obj/item/weapon/reagent_containers/food/snacks/milosoup, - /obj/item/weapon/reagent_containers/food/snacks/pillbug, - /obj/item/weapon/reagent_containers/food/snacks/sashimi, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/sushi, - /obj/item/weapon/reagent_containers/food/snacks/benedict, - /obj/item/weapon/reagent_containers/food/snacks/enchiladas, - /obj/item/weapon/reagent_containers/food/snacks/cheeseburrito, - /obj/item/weapon/reagent_containers/food/snacks/cheesenachos, - /obj/item/weapon/reagent_containers/food/snacks/eggplantparm, - /obj/item/weapon/reagent_containers/food/snacks/fuegoburrito, - /obj/item/weapon/reagent_containers/food/snacks/generalschicken, - /obj/item/weapon/reagent_containers/food/snacks/hotandsoursoup, - /obj/item/weapon/reagent_containers/food/snacks/hotchili, - /obj/item/weapon/reagent_containers/food/snacks/lasagna, - /obj/item/weapon/reagent_containers/food/snacks/meatburrito, - /obj/item/weapon/reagent_containers/food/snacks/wingfangchu - ) - name = "Cuisine crate" - cost = 25 - containertype = /obj/structure/closet/crate/freezer - containername = "Cuisine crate" - /datum/supply_packs/randomised/hospitality/burgers_vr num_contained = 5 contains = list( @@ -43,28 +8,10 @@ /obj/item/weapon/reagent_containers/food/snacks/fishburger ) name = "Burger crate" - cost = 15 + cost = 25 containertype = /obj/structure/closet/crate/freezer containername = "Burger crate" - -/datum/supply_packs/randomised/hospitality/specialburgers_vr - num_contained = 3 - contains = list( - /obj/item/weapon/reagent_containers/food/snacks/clownburger, - /obj/item/weapon/reagent_containers/food/snacks/ghostburger, - /obj/item/weapon/reagent_containers/food/snacks/mimeburger, - /obj/item/weapon/reagent_containers/food/snacks/brainburger, - /obj/item/weapon/reagent_containers/food/snacks/roburger, - /obj/item/weapon/reagent_containers/food/snacks/spellburger, - /obj/item/weapon/reagent_containers/food/snacks/superbiteburger, - /obj/item/weapon/reagent_containers/food/snacks/xenoburger, - /obj/item/weapon/reagent_containers/food/snacks/monkeyburger - ) - name = "Special burger crate" - cost = 60 - containertype = /obj/structure/closet/crate/freezer - containername = "Special burger crate" - +/* /datum/supply_packs/randomised/hospitality/bakery_vr num_contained = 5 contains = list( @@ -87,12 +34,12 @@ /obj/item/weapon/reagent_containers/food/snacks/waffles ) name = "Bakery products crate" - cost = 15 + cost = 25 containertype = /obj/structure/closet/crate/freezer containername = "Bakery products crate" /datum/supply_packs/randomised/hospitality/cakes_vr - num_contained = 5 + num_contained = 2 contains = list( /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake, /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake, @@ -105,7 +52,7 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake ) name = "Cake crate" - cost = 50 + cost = 100 containertype = /obj/structure/closet/crate/freezer containername = "Cake crate" @@ -113,31 +60,25 @@ num_contained = 5 contains = list( /obj/item/weapon/reagent_containers/food/snacks/cheeseburrito, - /obj/item/weapon/reagent_containers/food/snacks/cheesenachos, /obj/item/weapon/reagent_containers/food/snacks/enchiladas, - /obj/item/weapon/reagent_containers/food/snacks/fuegoburrito, /obj/item/weapon/reagent_containers/food/snacks/meatburrito, - /obj/item/weapon/reagent_containers/food/snacks/nachos, /obj/item/weapon/reagent_containers/food/snacks/taco ) - name = "Mexican food crate" - cost = 15 + name = "Mexican takeout crate" + cost = 50 containertype = /obj/structure/closet/crate/freezer - containername = "Mexican food crate" - + containername = "Mexican takeout crate" +*/ /datum/supply_packs/randomised/hospitality/asian_vr num_contained = 5 contains = list( - /obj/item/weapon/reagent_containers/food/snacks/chawanmushi, /obj/item/weapon/reagent_containers/food/snacks/generalschicken, - /obj/item/weapon/reagent_containers/food/snacks/hotandsoursoup, - /obj/item/weapon/reagent_containers/food/snacks/kitsuneudon, - /obj/item/weapon/reagent_containers/food/snacks/sashimi, - /obj/item/weapon/reagent_containers/food/snacks/wingfangchu, - /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/sushi + /obj/item/weapon/reagent_containers/food/snacks/hotandsoursoup ) - name = "Asian food crate" - cost = 15 + name = "Chinese takeout crate" + cost = 50 containertype = /obj/structure/closet/crate/freezer - containername = "Asian food crate" \ No newline at end of file + containername = "Chinese takeout crate" + +/datum/supply_packs/randomised/hospitality/pizza + cost = 50 \ No newline at end of file diff --git a/code/datums/supplypacks/recreation_vr.dm b/code/datums/supplypacks/recreation_vr.dm index c40ef25e070..b805adb8e4a 100644 --- a/code/datums/supplypacks/recreation_vr.dm +++ b/code/datums/supplypacks/recreation_vr.dm @@ -86,7 +86,7 @@ /obj/item/toy/griffin, /obj/item/toy/owl ) - cost = 50 + cost = 200 containertype = /obj/structure/closet/crate containername = "Action figures crate" @@ -97,7 +97,7 @@ ) containertype = /obj/structure/closet/crate containername = "Tabletop miniatures crate" - cost = 30 + cost = 50 /datum/supply_packs/randomised/recreation/plushies_vr name = "Plushies crate" @@ -132,6 +132,6 @@ /obj/item/toy/plushie/tuxedo_cat, /obj/item/toy/plushie/white_cat ) - cost = 30 + cost = 60 containertype = /obj/structure/closet/crate containername = "Plushies crate" \ No newline at end of file From 2311edbc36b0f584b8f2e9422f86710ecf8e050b Mon Sep 17 00:00:00 2001 From: Verkister Date: Mon, 9 Apr 2018 09:38:42 +0300 Subject: [PATCH 3/3] snib --- code/datums/supplypacks/recreation_vr.dm | 71 +----------------------- 1 file changed, 2 insertions(+), 69 deletions(-) diff --git a/code/datums/supplypacks/recreation_vr.dm b/code/datums/supplypacks/recreation_vr.dm index b805adb8e4a..8f0d775797a 100644 --- a/code/datums/supplypacks/recreation_vr.dm +++ b/code/datums/supplypacks/recreation_vr.dm @@ -44,47 +44,7 @@ name = "Action figures crate" num_contained = 5 contains = list( - /obj/item/toy/figure/agent, - /obj/item/toy/figure/assistant, - /obj/item/toy/figure/atmos, - /obj/item/toy/figure/bartender, - /obj/item/toy/figure/borg, - /obj/item/toy/figure/captain, - /obj/item/toy/figure/cargotech, - /obj/item/toy/figure/ce, - /obj/item/toy/figure/chaplain, - /obj/item/toy/figure/chef, - /obj/item/toy/figure/chemist, - /obj/item/toy/figure/clown, - /obj/item/toy/figure/cmo, - /obj/item/toy/figure/corgi, - /obj/item/toy/figure/detective, - /obj/item/toy/figure/dsquad, - /obj/item/toy/figure/engineer, - /obj/item/toy/figure/ert, - /obj/item/toy/figure/gardener, - /obj/item/toy/figure/geneticist, - /obj/item/toy/figure/hop, - /obj/item/toy/figure/hos, - /obj/item/toy/figure/janitor, - /obj/item/toy/figure/librarian, - /obj/item/toy/figure/md, - /obj/item/toy/figure/mime, - /obj/item/toy/figure/miner, - /obj/item/toy/figure/ninja, - /obj/item/toy/figure/paramedic, - /obj/item/toy/figure/psychologist, - /obj/item/toy/figure/qm, - /obj/item/toy/figure/rd, - /obj/item/toy/figure/roboticist, - /obj/item/toy/figure/scientist, - /obj/item/toy/figure/secofficer, - /obj/item/toy/figure/syndie, - /obj/item/toy/figure/virologist, - /obj/item/toy/figure/warden, - /obj/item/toy/figure/wizard, - /obj/item/toy/griffin, - /obj/item/toy/owl + /obj/random/action_figure ) cost = 200 containertype = /obj/structure/closet/crate @@ -103,34 +63,7 @@ name = "Plushies crate" num_contained = 3 contains = list( - /obj/item/toy/plushie/black_cat, - /obj/item/toy/plushie/black_fox, - /obj/item/toy/plushie/blue_fox, - /obj/item/toy/plushie/coffee_fox, - /obj/item/toy/plushie/corgi, - /obj/item/toy/plushie/crimson_fox, - /obj/item/toy/plushie/deer, - /obj/item/toy/plushie/face_hugger, - /obj/item/toy/plushie/farwa, - /obj/item/toy/plushie/girly_corgi, - /obj/item/toy/plushie/grey_cat, - /obj/item/toy/plushie/kitten, - /obj/item/toy/plushie/lizard, - /obj/item/toy/plushie/marble_fox, - /obj/item/toy/plushie/mouse, - /obj/item/toy/plushie/nymph, - /obj/item/toy/plushie/octopus, - /obj/item/toy/plushie/orange_cat, - /obj/item/toy/plushie/orange_fox, - /obj/item/toy/plushie/pink_fox, - /obj/item/toy/plushie/purple_fox, - /obj/item/toy/plushie/red_fox, - /obj/item/toy/plushie/robo_corgi, - /obj/item/toy/plushie/siamese_cat, - /obj/item/toy/plushie/spider, - /obj/item/toy/plushie/tabby_cat, - /obj/item/toy/plushie/tuxedo_cat, - /obj/item/toy/plushie/white_cat + /obj/random/plushie ) cost = 60 containertype = /obj/structure/closet/crate