diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index e79d807a..3e599bda 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -425,6 +425,36 @@ for(var/i in 1 to 6) new /obj/item/reagent_containers/food/snacks/donkpocket(src) +/obj/item/storage/box/donkpockets/donkpocketspicy + name = "box of spicy-flavoured donk-pockets" + icon_state = "donkpocketboxspicy" + var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket/spicy + +/obj/item/storage/box/donkpockets/donkpocketteriyaki + name = "box of teriyaki-flavoured donk-pockets" + icon_state = "donkpocketboxteriyaki" + var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket/teriyaki + +/obj/item/storage/box/donkpockets/donkpocketpizza + name = "box of pizza-flavoured donk-pockets" + icon_state = "donkpocketboxpizza" + var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket/pizza + +/obj/item/storage/box/donkpockets/donkpocketgondola + name = "box of gondola-flavoured donk-pockets" + icon_state = "donkpocketboxgondola" + var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket/gondola + +/obj/item/storage/box/donkpockets/donkpocketberry + name = "box of berry-flavoured donk-pockets" + icon_state = "donkpocketboxberry" + var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket/berry + +/obj/item/storage/box/donkpockets/donkpockethonk + name = "box of banana-flavoured donk-pockets" + icon_state = "donkpocketboxbanana" + var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket/honk + /obj/item/storage/box/monkeycubes name = "monkey cube box" desc = "Drymate brand monkey cubes. Just add water!" diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index 1695329a..5c93f45f 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -460,6 +460,120 @@ tastes = list("meat" = 2, "dough" = 2) foodtype = GRAIN | VEGETABLES +/obj/item/reagent_containers/food/snacks/donkpocket/spicy + name = "\improper Spicy-pocket" + desc = "The classic snack food, now with a heat-activated spicy flair." + icon_state = "donkpocketspicy" + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/capsaicin = 2) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/spicy + filling_color = "#CD853F" + tastes = list("meat" = 2, "dough" = 2, "spice" = 1) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/spicy + name = "warm Spicy-pocket" + desc = "The classic snack food, now maybe a bit too spicy." + icon_state = "donkpocketspicy" + bonus_reagents = list(/datum/reagent/medicine/omnizine = 1, /datum/reagent/consumable/capsaicin = 3) + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/medicine/omnizine = 1, /datum/reagent/consumable/capsaicin = 2) + tastes = list("meat" = 2, "dough" = 2, "weird spices" = 2) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/teriyaki + name = "\improper Teriyaki-pocket" + desc = "An east-asian take on the classic stationside snack." + icon_state = "donkpocketteriyaki" + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/soysauce = 2) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/teriyaki + filling_color = "#CD853F" + tastes = list("meat" = 2, "dough" = 2, "soy sauce" = 2) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/teriyaki + name = "warm Teriyaki-pocket" + desc = "An east-asian take on the classic stationside snack, now steamy and warm." + icon_state = "donkpocketteriyaki" + bonus_reagents = list(/datum/reagent/medicine/omnizine = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/medicine/omnizine = 1, /datum/reagent/consumable/soysauce = 2) + tastes = list("meat" = 2, "dough" = 2, "soy sauce" = 2) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/pizza + name = "\improper Pizza-pocket" + desc = "Delicious, cheesy and surprisingly filling." + icon_state = "donkpocketpizza" + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/tomatojuice = 2) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/pizza + filling_color = "#CD853F" + tastes = list("meat" = 2, "dough" = 2, "cheese"= 2) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/pizza + name = "warm Pizza-pocket" + desc = "Delicious, cheesy, and even better when hot." + icon_state = "donkpocketpizza" + bonus_reagents = list(/datum/reagent/medicine/omnizine = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/medicine/omnizine = 1, /datum/reagent/consumable/tomatojuice = 2) + tastes = list("meat" = 2, "dough" = 2, "melty cheese"= 2) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/honk + name = "\improper Honk-pocket" + desc = "The award-winning donk-pocket that won the hearts of clowns and humans alike." + icon_state = "donkpocketbanana" + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/banana = 4) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/honk + filling_color = "#XXXXXX" + tastes = list("banana" = 2, "dough" = 2, "children's antibiotics" = 1) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/honk + name = "warm Honk-pocket" + desc = "The award-winning donk-pocket, now warm and toasty." + icon_state = "donkpocketbanana" + bonus_reagents = list(/datum/reagent/medicine/omnizine = 1, /datum/reagent/consumable/laughter = 3) + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/medicine/omnizine = 1, /datum/reagent/consumable/banana = 4, /datum/reagent/consumable/laughter = 3) + tastes = list("dough" = 2, "children's antibiotics" = 1) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/berry + name = "\improper Berry-pocket" + desc = "A relentlessly sweet donk-pocket first created for use in Operation Dessert Storm." + icon_state = "donkpocketberry" + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/berryjuice = 3) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/berry + filling_color = "#CD853F" + tastes = list("dough" = 2, "jam" = 2) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/berry + name = "warm Berry-pocket" + desc = "A relentlessly sweet donk-pocket, now warm and delicious." + icon_state = "donkpocketberry" + 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 + +/obj/item/reagent_containers/food/snacks/donkpocket/gondola + name = "\improper Gondola-pocket" + desc = "The choice to use real gondola meat in the recipe is controversial, to say the least." //Only a monster would craft this. + icon_state = "donkpocketgondola" + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/tranquility = 5) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/gondola + filling_color = "#CD853F" + tastes = list("meat" = 2, "dough" = 2, "inner peace" = 1) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/gondola + name = "warm Gondola-pocket" + desc = "The choice to use real gondola meat in the recipe is controversial, to say the least." + icon_state = "donkpocketgondola" + bonus_reagents = list(/datum/reagent/medicine/omnizine = 1, /datum/reagent/tranquility = 5) + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/medicine/omnizine = 1, /datum/reagent/tranquility = 5) + tastes = list("meat" = 2, "dough" = 2, "inner peace" = 1) + foodtype = GRAIN + /obj/item/reagent_containers/food/snacks/fortunecookie name = "fortune cookie" desc = "A true prophecy in each cookie!" 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 70973dd2..53324207 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -344,6 +344,138 @@ datum/crafting_recipe/food/donut/meat result = /obj/item/reagent_containers/food/snacks/dankpocket subcategory = CAT_PASTRY +/obj/item/reagent_containers/food/snacks/donkpocket/warm + name = "warm Donk-pocket" + desc = "The heated food of choice for the seasoned traitor." + bonus_reagents = list(/datum/reagent/medicine/omnizine = 3) //The original donk pocket has the most omnizine, can't beat the original on everything... + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/medicine/omnizine = 3) + cooked_type = null + tastes = list("meat" = 2, "dough" = 2, "laziness" = 1) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/dankpocket + name = "\improper Dank-pocket" + desc = "The food of choice for the seasoned botanist." + icon_state = "dankpocket" + list_reagents = list(/datum/reagent/toxin/lipolicide = 3, /datum/reagent/drug/space_drugs = 3, /datum/reagent/consumable/nutriment = 4) + filling_color = "#00FF00" + tastes = list("meat" = 2, "dough" = 2) + foodtype = GRAIN | VEGETABLES + +/obj/item/reagent_containers/food/snacks/donkpocket/spicy + name = "\improper Spicy-pocket" + desc = "The classic snack food, now with a heat-activated spicy flair." + icon_state = "donkpocketspicy" + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/capsaicin = 2) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/spicy + filling_color = "#CD853F" + tastes = list("meat" = 2, "dough" = 2, "spice" = 1) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/spicy + name = "warm Spicy-pocket" + desc = "The classic snack food, now maybe a bit too spicy." + icon_state = "donkpocketspicy" + bonus_reagents = list(/datum/reagent/medicine/omnizine = 1, /datum/reagent/consumable/capsaicin = 3) + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/medicine/omnizine = 1, /datum/reagent/consumable/capsaicin = 2) + tastes = list("meat" = 2, "dough" = 2, "weird spices" = 2) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/teriyaki + name = "\improper Teriyaki-pocket" + desc = "An east-asian take on the classic stationside snack." + icon_state = "donkpocketteriyaki" + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/soysauce = 2) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/teriyaki + filling_color = "#CD853F" + tastes = list("meat" = 2, "dough" = 2, "soy sauce" = 2) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/teriyaki + name = "warm Teriyaki-pocket" + desc = "An east-asian take on the classic stationside snack, now steamy and warm." + icon_state = "donkpocketteriyaki" + bonus_reagents = list(/datum/reagent/medicine/omnizine = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/medicine/omnizine = 1, /datum/reagent/consumable/soysauce = 2) + tastes = list("meat" = 2, "dough" = 2, "soy sauce" = 2) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/pizza + name = "\improper Pizza-pocket" + desc = "Delicious, cheesy and surprisingly filling." + icon_state = "donkpocketpizza" + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/tomatojuice = 2) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/pizza + filling_color = "#CD853F" + tastes = list("meat" = 2, "dough" = 2, "cheese"= 2) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/pizza + name = "warm Pizza-pocket" + desc = "Delicious, cheesy, and even better when hot." + icon_state = "donkpocketpizza" + bonus_reagents = list(/datum/reagent/medicine/omnizine = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/medicine/omnizine = 1, /datum/reagent/consumable/tomatojuice = 2) + tastes = list("meat" = 2, "dough" = 2, "melty cheese"= 2) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/honk + name = "\improper Honk-pocket" + desc = "The award-winning donk-pocket that won the hearts of clowns and humans alike." + icon_state = "donkpocketbanana" + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/banana = 4) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/honk + filling_color = "#XXXXXX" + tastes = list("banana" = 2, "dough" = 2, "children's antibiotics" = 1) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/honk + name = "warm Honk-pocket" + desc = "The award-winning donk-pocket, now warm and toasty." + icon_state = "donkpocketbanana" + bonus_reagents = list(/datum/reagent/medicine/omnizine = 1, /datum/reagent/consumable/laughter = 3) + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/medicine/omnizine = 1, /datum/reagent/consumable/banana = 4, /datum/reagent/consumable/laughter = 3) + tastes = list("dough" = 2, "children's antibiotics" = 1) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/berry + name = "\improper Berry-pocket" + desc = "A relentlessly sweet donk-pocket first created for use in Operation Dessert Storm." + icon_state = "donkpocketberry" + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/berryjuice = 3) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/berry + filling_color = "#CD853F" + tastes = list("dough" = 2, "jam" = 2) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/berry + name = "warm Berry-pocket" + desc = "A relentlessly sweet donk-pocket, now warm and delicious." + icon_state = "donkpocketberry" + 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 + +/obj/item/reagent_containers/food/snacks/donkpocket/gondola + name = "\improper Gondola-pocket" + desc = "The choice to use real gondola meat in the recipe is controversial, to say the least." //Only a monster would craft this. + icon_state = "donkpocketgondola" + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/tranquility = 5) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/gondola + filling_color = "#CD853F" + tastes = list("meat" = 2, "dough" = 2, "inner peace" = 1) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/donkpocket/warm/gondola + name = "warm Gondola-pocket" + desc = "The choice to use real gondola meat in the recipe is controversial, to say the least." + icon_state = "donkpocketgondola" + bonus_reagents = list(/datum/reagent/medicine/omnizine = 1, /datum/reagent/tranquility = 5) + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/medicine/omnizine = 1, /datum/reagent/tranquility = 5) + tastes = list("meat" = 2, "dough" = 2, "inner peace" = 1) + foodtype = GRAIN + ////////////////////////////////////////////////MUFFINS//////////////////////////////////////////////// /datum/crafting_recipe/food/muffin diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 0d6ee7e5..a42b95f1 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 d741dcba..0d1fe954 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ diff --git a/icons/turf/floors/carpet_donk.dmi b/icons/turf/floors/carpet_donk.dmi new file mode 100644 index 00000000..04c4148d Binary files /dev/null and b/icons/turf/floors/carpet_donk.dmi differ diff --git a/modular_citadel/icons/mob/robots.dmi b/modular_citadel/icons/mob/robots.dmi index 1489ae2a..2b1aa7f6 100644 Binary files a/modular_citadel/icons/mob/robots.dmi and b/modular_citadel/icons/mob/robots.dmi differ