diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 03510c015f9..6f6a4f04fb9 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -710,6 +710,7 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/lemonjuice = 5, + /obj/item/weapon/reagent_containers/food/drinks/bottle/applejuice = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/milk = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/cola = 5, diff --git a/code/modules/economy/price_list.dm b/code/modules/economy/price_list.dm index eddec56714c..e9c8b1372d6 100644 --- a/code/modules/economy/price_list.dm +++ b/code/modules/economy/price_list.dm @@ -420,6 +420,9 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice price_tag = 6 +/obj/item/weapon/reagent_containers/food/drinks/bottle/applejuice + price_tag = 6 + /obj/item/weapon/reagent_containers/food/drinks/bottle/cream price_tag = 6 diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 1856b286479..f3dd6b876d1 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -387,6 +387,31 @@ I said no! items = list(/obj/item/weapon/reagent_containers/food/snacks/cheesewedge) result = /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato +/datum/recipe/mashedpotato + fruit = list("potato" = 1) + result = /obj/item/weapon/reagent_containers/food/snacks/mashedpotato + +/datum/recipe/bangersandmash + items = list( + /obj/item/weapon/reagent_containers/food/snacks/mashedpotato, + /obj/item/weapon/reagent_containers/food/snacks/sausage, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/bangersandmash + +/datum/recipe/cheesymash + items = list( + /obj/item/weapon/reagent_containers/food/snacks/mashedpotato, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/cheesymash + +/datum/recipe/blackpudding + reagents = list("blood" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/sausage, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/blackpudding + /datum/recipe/cheesyfries items = list( /obj/item/weapon/reagent_containers/food/snacks/fries, @@ -993,7 +1018,8 @@ I said no! result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake /datum/recipe/cake/carrot - fruit = list("carrot" = 3) + fruit = list("carrot" = 1) + reagents = list("milk" = 5, "flour" = 15, "egg" = 9,"sugar" = 5) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake /datum/recipe/cake/cheese @@ -1005,22 +1031,22 @@ I said no! /datum/recipe/cake/orange fruit = list("orange" = 1) - reagents = list("milk" = 5, "flour" = 15, "egg" = 9, "orangejuice" = 3, "sugar" = 5) + reagents = list("milk" = 5, "flour" = 15, "egg" = 9,"sugar" = 5) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake /datum/recipe/cake/lime fruit = list("lime" = 1) - reagents = list("milk" = 5, "flour" = 15, "egg" = 9, "limejuice" = 3, "sugar" = 5) + reagents = list("milk" = 5, "flour" = 15, "egg" = 9,"sugar" = 5) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake /datum/recipe/cake/lemon fruit = list("lemon" = 1) - reagents = list("milk" = 5, "flour" = 15, "egg" = 9, "lemonjuice" = 3, "sugar" = 5) + reagents = list("milk" = 5, "flour" = 15, "egg" = 9,"sugar" = 5) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake /datum/recipe/cake/chocolate items = list(/obj/item/weapon/reagent_containers/food/snacks/chocolatebar) - reagents = list("milk" = 5, "flour" = 15, "egg" = 9, "coco" = 4, "sugar" = 5) + reagents = list("milk" = 5, "flour" = 15, "egg" = 9,"sugar" = 5) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake /datum/recipe/cake/birthday @@ -1028,7 +1054,8 @@ I said no! result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake /datum/recipe/cake/apple - fruit = list("apple" = 2) + fruit = list("apple" = 1) + reagents = list("milk" = 5, "flour" = 15, "egg" = 9,"sugar" = 5) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake /datum/recipe/cake/brain diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 252060053e4..45708715e18 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -1605,6 +1605,18 @@ glass_name = "wine" glass_desc = "A very classy looking drink." + +/datum/reagent/ethanol/cider + name = "Cider" + id = "cider" + description = "Hard? Soft? No-one knows but it'll get you drunk." + taste_description = "tartness" + color = "#CE9C00" // rgb: 206, 156, 0 + strength = 10 + + glass_name = "cider" + glass_desc = "The second most Irish drink." + // Cocktails diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 4e172eb89e6..7dd4bbeadda 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1331,10 +1331,19 @@ name = "Vodka" id = "vodka" result = "vodka" - required_reagents = list("potato" = 10) + required_reagents = list("potatojuice" = 10) catalysts = list("enzyme" = 5) result_amount = 10 +/datum/chemical_reaction/drinks/cider + name = "Cider" + id = "cider" + result = "cider" + required_reagents = list("applejuice" = 10) + catalysts = list("enzyme" = 5) + result_amount = 10 + + /datum/chemical_reaction/drinks/sake name = "Sake" id = "sake" diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 4f0279f698f..72d121fb8b8 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -431,6 +431,18 @@ ..() reagents.add_reagent("orangejuice", 100) +/obj/item/weapon/reagent_containers/food/drinks/bottle/applejuice + name = "Apple Juice" + desc = "Squeezed, pressed and ground to perfection!" + icon_state = "applejuice" + item_state = "carton" + center_of_mass = list("x"=16, "y"=7) + isGlass = 0 + +/obj/item/weapon/reagent_containers/food/drinks/bottle/applejuice/New() + ..() + reagents.add_reagent("applejuice", 100) + /obj/item/weapon/reagent_containers/food/drinks/bottle/milk name = "Large Milk Carton" desc = "It's milk. This carton's large enough to serve your biggest milk drinkers." diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 014fddbbfef..5cfb894228d 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -1366,6 +1366,63 @@ ..() bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/mashedpotato + name = "Mashed Potato" + desc = "Pillowy mounds of mashed potato." + icon_state = "mashedpotato" + trash = /obj/item/trash/plate + filling_color = "#EDDD00" + center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 4 + nutriment_desc = list("fluffy mashed potatoes" = 4) + +/obj/item/weapon/reagent_containers/food/snacks/mashedpotato/New() + ..() + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/bangersandmash + name = "Bangers and Mash" + desc = "An English treat." + icon_state = "bangersandmash" + trash = /obj/item/trash/plate + filling_color = "#EDDD00" + center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 4 + nutriment_desc = list("fluffy potato" = 3, "sausage" = 2) + +/obj/item/weapon/reagent_containers/food/snacks/bangersandmash/New() + ..() + reagents.add_reagent("protein", 3) + bitesize = 4 + +/obj/item/weapon/reagent_containers/food/snacks/cheesymash + name = "Cheesy Mashed Potato" + desc = "The only thing that could make mash better." + icon_state = "cheesymash" + trash = /obj/item/trash/plate + filling_color = "#EDDD00" + center_of_mass = list("x"=16, "y"=11) + nutriment_amt = 4 + nutriment_desc = list("cheesy potato" = 4) + +/obj/item/weapon/reagent_containers/food/snacks/cheesymash/New() + ..() + reagents.add_reagent("protein", 3) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/blackpudding + name = "Black Pudding" + desc = "This doesn't seem like a pudding at all." + icon_state = "blackpudding" + filling_color = "#FF0000" + center_of_mass = list("x"=16, "y"=7) + +/obj/item/weapon/reagent_containers/food/snacks/blackpudding/New() + ..() + reagents.add_reagent("protein", 2) + reagents.add_reagent("blood", 5) + bitesize = 3 + /obj/item/weapon/reagent_containers/food/snacks/soydope name = "Soy Dope" desc = "Dope from a soy." diff --git a/html/changelogs/SunnyDaff-foodanddrink.yml b/html/changelogs/SunnyDaff-foodanddrink.yml new file mode 100644 index 00000000000..878be7a2038 --- /dev/null +++ b/html/changelogs/SunnyDaff-foodanddrink.yml @@ -0,0 +1,10 @@ +author: SunnyDaff +delete-after: True + + - rscadd: Added new food items. + - rscadd: Added Cider. + - rscadd: Added Apple Juice to bar vending machine. + - bugfix: Fixed Vodka recipe. + - bugfix: Fixed Apple and Carrot cake recipes + - tweak: Changed Cake recipes to not include fruit juice + diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 465d4e7f1bd..12993651aa1 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 001c6ca683b..dfd41034a23 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ