diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index f8d822431..87c3e3719 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -474,6 +474,11 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \ new /datum/stack_recipe("donk-pockets teriyaki box", /obj/item/storage/box/donkpockets/donkpocketteriyaki), \ new /datum/stack_recipe("donk-pockets pizza box", /obj/item/storage/box/donkpockets/donkpocketpizza), \ new /datum/stack_recipe("donk-pockets berry box", /obj/item/storage/box/donkpockets/donkpocketberry), \ + new /datum/stack_recipe("donk-pockets taco box", /obj/item/storage/box/donkpockets/donkpockettaco), \ + new /datum/stack_recipe("donk-pockets plasma box", /obj/item/storage/box/donkpockets/donkpocketplasma), \ + new /datum/stack_recipe("donk-pockets breakfast box", /obj/item/storage/box/donkpockets/donkpocketbreakfast), \ + new /datum/stack_recipe("donk-pockets moth box", /obj/item/storage/box/donkpockets/donkpocketmoth), \ + new /datum/stack_recipe("donk-pockets vegan box", /obj/item/storage/box/donkpockets/donkpocketvegan), \ new /datum/stack_recipe("donk-pockets honk box", /obj/item/storage/box/donkpockets/donkpockethonk), \ new /datum/stack_recipe("monkey cube box", /obj/item/storage/box/monkeycubes), null, \ diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 278ecb93e..899617fd1 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -437,6 +437,36 @@ donktype = /obj/item/reagent_containers/food/snacks/donkpocket/spicy warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm/spicy +/obj/item/storage/box/donkpockets/donkpockettaco //Property of Angel's Donk Co. subsidary Not'cho Corp. "They're mine! Not yo's." + name = "box of taco-flavoured donk-pockets" + icon_state = "donkpocketboxtaco" + donktype = /obj/item/reagent_containers/food/snacks/donkpocket/taco + warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm/taco + +/obj/item/storage/box/donkpockets/donkpocketplasma + name = "box of toxic-flavoured donk-pockets" + icon_state = "donkpocketboxplasma" + donktype = /obj/item/reagent_containers/food/snacks/donkpocket/plasma + warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm/plasma + +/obj/item/storage/box/donkpockets/donkpocketbreakfast + name = "box of breakfast-flavoured donk-pockets" + icon_state = "donkpocketboxbreakfast" + donktype = /obj/item/reagent_containers/food/snacks/donkpocket/breakfast + warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm/breakfast + +/obj/item/storage/box/donkpockets/donkpocketmoth + name = "box of cloth-flavoured donk-pockets" + icon_state = "donkpocketboxmoth" + donktype = /obj/item/reagent_containers/food/snacks/donkpocket/moth + warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm/moth + +/obj/item/storage/box/donkpockets/donkpocketvegan + name = "box of veggie-flavoured donk-pockets" + icon_state = "donkpocketboxvegan" + donktype = /obj/item/reagent_containers/food/snacks/donkpocket/vegan + warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm/vegan + /obj/item/storage/box/donkpockets/donkpocketteriyaki name = "box of teriyaki-flavoured donk-pockets" icon_state = "donkpocketboxteriyaki" @@ -1325,4 +1355,4 @@ /obj/item/storage/box/marshmallow/PopulateContents() for (var/i in 1 to 5) - new /obj/item/reagent_containers/food/snacks/marshmallow(src) + new /obj/item/reagent_containers/food/snacks/marshmallow(src) diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index e01b770ba..7e0d0a31a 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -461,6 +461,120 @@ tastes = list("meat" = 2, "dough" = 2, "laziness" = 1) foodtype = GRAIN | ANTITOXIC +/obj/item/reagent_containers/food/snacks/donkpocket/taco + name = "\improper Taco-pocket" + desc = "Es hora de adentrarse en el espacio de bolsillo más salvaje jamás conocido. ¡jajaja!" + icon_state = "donkpockettaco" + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/capsaicin = 2) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/taco + filling_color = "#CD853F" + tastes = list("meat" = 2, "dough" = 2, "spice" = 2, "vegetables" = 2, "cheese" = 2) + foodtype = GRAIN | VEGETABLES | MEAT + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/taco + name = "warm Taco-pocket" + desc = "Es hora de adentrarse en el espacio de bolsillo más salvaje jamás conocido. ¡jajaja!" + icon_state = "donkpockettaco" + bonus_reagents = list(/datum/reagent/medicine/omnizine = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/capsaicin = 2) + tastes = list("meat" = 2, "dough" = 2, "spice" = 2, "vegetables" = 2, "cheese" = 2) + foodtype = GRAIN | VEGETABLES | MEAT + +/obj/item/reagent_containers/food/snacks/donkpocket/plasma + name = "\improper Poison-pocket" + desc = "NOTE: WARNING. For slime species consumption only. Call ###-##-### if injested" + icon_state = "donkpocketplasma" + list_reagents = list(/datum/reagent/toxin/carpotoxin = 2, /datum/reagent/toxin/plasma = 2, /datum/reagent/fuel = 2) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/plasma + filling_color = "#CD853F" + tastes = list("meat" = 2, "dough" = 2, "poison" = 2, "welding fuel" = 2) + foodtype = GRAIN | TOXIC | MEAT + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/plasma + name = "warm Poison-pocket" + desc = "NOTE: WARNING. For slime species consumption only. Call ###-##-### if injested" + icon_state = "donkpocketplasma" + bonus_reagents = list(/datum/reagent/toxin/carpotoxin = 2, /datum/reagent/toxin/plasma = 2, /datum/reagent/fuel = 2) + list_reagents = list(/datum/reagent/consumable/nutriment = 4) + tastes = list("meat" = 2, "dough" = 2, "poison" = 2, "welding fuel" = 2) + foodtype = GRAIN | TOXIC | MEAT + +/obj/item/reagent_containers/food/snacks/donkpocket/breakfast + name = "\improper Breakfast-pocket" + desc = "Now for all you early morning Joes!." + icon_state = "donkpocketbreakfast" + list_reagents = list(/datum/reagent/consumable/nutriment = 4) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/breakfast + filling_color = "#CD853F" + tastes = list("meat" = 2, "dough" = 2, "eggs" =2, "bacon" =2) + foodtype = GRAIN | DAIRY | MEAT | BREAKFAST + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/breakfast //IT'S BEEN ELEVEN FUCKING HOURS I HATE BYOND I HATE BYOND I HATE BEYOND!!! + name = "warm Breakfast-pocket" + desc = "Now for all you early morning Joes!." + icon_state = "donkpocketbreakfast" + bonus_reagents = list(/datum/reagent/medicine/omnizine = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 4) + tastes = list("meat" = 2, "dough" = 2, "eggs" = 2, "bacon" = 2) + foodtype = GRAIN | DAIRY | MEAT | BREAKFAST | ANTITOXIC + +/obj/item/reagent_containers/food/snacks/donkpocket/moth + name = "\improper Moth-pocket" + desc = "Donk Corp is now reaching out to all species! Dig in moths one and all." + icon_state = "donkpocketmoth" + list_reagents = list(/datum/reagent/consumable/nutriment = 4) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/moth + filling_color = "#CD853F" + tastes = list("lint" = 2, "dough" = 2, "felt" = 2) + foodtype = GRAIN | DAIRY | CLOTH + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/moth + name = "warm Moth-pocket" + desc = "Donk Corp is now reaching out to all species! Dig in moths one and all." + icon_state = "donkpocketmoth" + bonus_reagents = list(/datum/reagent/medicine/omnizine = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 4) + tastes = list("lint" = 2, "dough" = 2, "felt" = 2) + foodtype = GRAIN | DAIRY | CLOTH + +/obj/item/reagent_containers/food/snacks/donkpocket/vegan + name = "\improper Vegan-pocket" + desc = "For all you Animal Rights Consortium members out there!." + icon_state = "donkpocketvegan" + list_reagents = list(/datum/reagent/consumable/nutriment = 2) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/vegan + filling_color = "#CD853F" + tastes = list("vegetables" = 2, "dough" = 2) + foodtype = GRAIN | VEGETABLES + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/vegan + name = "warm Vegan-pocket" + desc = "For all you Animal Rights Consortium members out there!." + icon_state = "donkpocketvegan" + bonus_reagents = list(/datum/reagent/medicine/omnizine = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 3) + tastes = list("vegetables" = 2, "dough" = 2) + foodtype = GRAIN | VEGETABLES + +/obj/item/reagent_containers/food/snacks/donkpocket/sm + name = "\improper Super-pocket" + desc = "You're probably not in a good spot if you're laying eyes on this." + icon_state = "donkpocketsm" + list_reagents = list(/datum/reagent/consumable/nutriment = 99) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/sm + filling_color = "#CD853F" + tastes = list("white-noise" = 2) + foodtype = TOXIC + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/sm + name = "warm Super-pocket" + desc = "You're probably not in a good spot if you're laying eyes on this." + icon_state = "donkpocketsm" + bonus_reagents = list(/datum/reagent/medicine/omnizine = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 99) + tastes = list("white-noise" = 2) + foodtype = TOXIC + /obj/item/reagent_containers/food/snacks/dankpocket name = "\improper Dank-pocket" desc = "The food of choice for the seasoned botanist." @@ -554,7 +668,7 @@ cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/berry filling_color = "#CD853F" tastes = list("dough" = 2, "jam" = 2) - foodtype = GRAIN + foodtype = GRAIN | SUGAR /obj/item/reagent_containers/food/snacks/donkpocket/warm/berry name = "warm Berry-pocket" @@ -563,7 +677,7 @@ bonus_reagents = list(/datum/reagent/medicine/omnizine = 1) list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/medicine/omnizine = 1, /datum/reagent/consumable/berryjuice = 3) tastes = list("dough" = 2, "warm jam" = 2) - foodtype = GRAIN + foodtype = GRAIN | SUGAR /obj/item/reagent_containers/food/snacks/donkpocket/gondola name = "\improper Gondola-pocket" diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index 7c34fc8c2..9100bab34 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -362,6 +362,159 @@ datum/crafting_recipe/food/donut/meat tastes = list("meat" = 2, "dough" = 2) foodtype = GRAIN | VEGETABLES +/datum/crafting_recipe/food/donkpocket/taco + time = 15 + name = "Taco-pocket" + reqs = list( + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/meatball = 1, + /obj/item/reagent_containers/food/snacks/grown/carrot = 1, + /obj/item/reagent_containers/food/snacks/grown/citrus/lime = 1, + ) + result = /obj/item/reagent_containers/food/snacks/donkpocket/taco + subcategory = CAT_PASTRY + +/obj/item/reagent_containers/food/snacks/donkpocket/taco + name = "\improper Taco-pocket" + desc = "Es hora de adentrarse en el espacio de bolsillo más salvaje jamás conocido. ¡jajaja!" + icon_state = "donkpockettaco" + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/capsaicin = 2) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/taco + filling_color = "#CD853F" + tastes = list("meat" = 2, "dough" = 2, "spice" = 2, "vegetables" = 2, "cheese" = 2) + foodtype = GRAIN | VEGETABLES | MEAT + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/taco + name = "warm Taco-pocket" + desc = "Es hora de adentrarse en el espacio de bolsillo más salvaje jamás conocido. ¡jajaja!" + icon_state = "donkpockettaco" + bonus_reagents = list(/datum/reagent/medicine/omnizine = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/capsaicin = 2) + tastes = list("meat" = 2, "dough" = 2, "spice" = 2, "vegetables" = 2, "cheese" = 2) + foodtype = GRAIN | VEGETABLES | MEAT + +/datum/crafting_recipe/food/donkpocket/plasma + time = 15 + name = "Plasma-pocket" + reqs = list( + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/meatball = 1, + /datum/reagent/fuel = 1, + /datum/reagent/toxin/plasma = 1, + ) + result = /obj/item/reagent_containers/food/snacks/donkpocket/plasma + subcategory = CAT_PASTRY + +/obj/item/reagent_containers/food/snacks/donkpocket/plasma + name = "\improper Poison-pocket" + desc = "NOTE: WARNING. For slime species consumption only. Call ###-##-### if injested" + icon_state = "donkpocketplasma" + list_reagents = list(/datum/reagent/toxin/carpotoxin = 2, /datum/reagent/toxin/plasma = 2, /datum/reagent/fuel = 2) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/plasma + filling_color = "#CD853F" + tastes = list("meat" = 2, "dough" = 2, "poison" = 2, "welding fuel" = 2) + foodtype = GRAIN | TOXIC | MEAT + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/plasma + name = "warm Poison-pocket" + desc = "NOTE: WARNING. For slime species consumption only. Call ###-##-### if injested" + icon_state = "donkpocketplasma" + bonus_reagents = list(/datum/reagent/toxin/carpotoxin = 2, /datum/reagent/toxin/plasma = 2, /datum/reagent/fuel = 2) + list_reagents = list(/datum/reagent/consumable/nutriment = 4) + tastes = list("meat" = 2, "dough" = 2, "poison" = 2, "welding fuel" = 2) + foodtype = GRAIN | TOXIC | MEAT + +/datum/crafting_recipe/food/donkpocket/breakfast + time = 15 + name = "Breakfast-pocket" + reqs = list( + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/friedegg = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 1, + ) + result = /obj/item/reagent_containers/food/snacks/donkpocket/breakfast + subcategory = CAT_PASTRY + +/obj/item/reagent_containers/food/snacks/donkpocket/breakfast + name = "\improper Breakfast-pocket" + desc = "Now for all you early morning Joes!." + icon_state = "donkpocketbreakfast" + list_reagents = list(/datum/reagent/consumable/nutriment = 4) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/breakfast + filling_color = "#CD853F" + tastes = list("meat" = 2, "dough" = 2, "eggs" = 2, "bacon" = 2) + foodtype = GRAIN | DAIRY | MEAT | BREAKFAST + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/breakfast + name = "warm Breakfast-pocket" + desc = "Now for all you early morning Joes!." + icon_state = "donkpocketbreakfast" + bonus_reagents = list(/datum/reagent/medicine/omnizine = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 4) + tastes = list("meat" = 2, "dough" = 2, "eggs" = 2, "bacon" = 2) + foodtype = GRAIN | DAIRY | MEAT | BREAKFAST | ANTITOXIC + +/datum/crafting_recipe/food/donkpocket/moth + time = 15 + name = "Moth-pocket" + reqs = list( + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/stack/sheet/cloth = 1, + ) + result = /obj/item/reagent_containers/food/snacks/donkpocket/moth + subcategory = CAT_PASTRY + +/obj/item/reagent_containers/food/snacks/donkpocket/moth + name = "\improper Moth-pocket" + desc = "Donk Corp is now reaching out to all species! Dig in moths one and all." + icon_state = "donkpocketmoth" + list_reagents = list(/datum/reagent/consumable/nutriment = 4) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/moth + filling_color = "#CD853F" + tastes = list("lint" = 2, "dough" = 2, "felt" = 2) + foodtype = GRAIN | DAIRY | CLOTH + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/moth + name = "warm Moth-pocket" + desc = "Donk Corp is now reaching out to all species! Dig in moths one and all." + icon_state = "donkpocketmoth" + bonus_reagents = list(/datum/reagent/medicine/omnizine = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 4) + tastes = list("lint" = 2, "dough" = 2, "felt" = 2) + foodtype = GRAIN | DAIRY | CLOTH + +/datum/crafting_recipe/food/donkpocket/vegan + time = 15 + name = "Vegan-pocket" + reqs = list( + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, + /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1, + ) + result = /obj/item/reagent_containers/food/snacks/donkpocket/vegan + subcategory = CAT_PASTRY + +/obj/item/reagent_containers/food/snacks/donkpocket/vegan + name = "\improper Vegan-pocket" + desc = "For all you Animal Rights Consortium members out there!." + icon_state = "donkpocketvegan" + list_reagents = list(/datum/reagent/consumable/nutriment = 2) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/vegan + filling_color = "#CD853F" + tastes = list("vegetables" = 2, "dough" = 2) + foodtype = GRAIN | VEGETABLES + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/vegan + name = "warm Vegan-pocket" + desc = "For all you Animal Rights Consortium members out there!." + icon_state = "donkpocketvegan" + bonus_reagents = list(/datum/reagent/medicine/omnizine = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 3) + tastes = list("vegetables" = 2, "dough" = 2) + foodtype = GRAIN | VEGETABLES + /datum/crafting_recipe/food/donkpocket/spicy time = 15 name = "Spicy-pocket" diff --git a/hyperstation/code/modules/cargo/packs/misc.dm b/hyperstation/code/modules/cargo/packs/misc.dm index d1b88903f..21eb315b2 100644 --- a/hyperstation/code/modules/cargo/packs/misc.dm +++ b/hyperstation/code/modules/cargo/packs/misc.dm @@ -5,3 +5,31 @@ contains = list(/obj/item/polepack/, /obj/item/wrench/) crate_name = "stripper pole crate" + +/datum/supply_pack/organic/donkpockets + name = "Donkpocket Shipment" + desc = "We at Donk corp provide a wide five selection of holovid ready dinner pockets for all your dietary needs from extra-cheese to vegan to even mothpeople. Product of Donk co." + cost = 1500 + contains = list() + crate_name = "Donk Crate" + crate_type = /obj/structure/closet/crate/freezer + var/num_contained = 5 + //Put the types you want to contain inside this list below. + var/can_contain = list( /obj/item/storage/box/donkpockets, + /obj/item/storage/box/donkpockets/donkpockettaco, + /obj/item/storage/box/donkpockets/donkpocketplasma, + /obj/item/storage/box/donkpockets/donkpocketbreakfast, + /obj/item/storage/box/donkpockets/donkpocketmoth, + /obj/item/storage/box/donkpockets/donkpocketvegan, + /obj/item/storage/box/donkpockets/donkpocketspicy, + /obj/item/storage/box/donkpockets/donkpocketteriyaki, + /obj/item/storage/box/donkpockets/donkpocketpizza, + /obj/item/storage/box/donkpockets/donkpocketberry, + /obj/item/storage/box/donkpockets/donkpockethonk + ) + +/datum/supply_pack/organic/donkpockets/fill(obj/structure/closet/crate/C) + contains = list() + for(var/i = 0; i < num_contained; i++) + contains += pick(can_contain) + . = ..() \ No newline at end of file diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index bd4b429fc..88607735c 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 121e8f452..4c33552b5 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ