diff --git a/code/modules/cooking/recipes/cultural/recipes_earth.dm b/code/modules/cooking/recipes/cultural/recipes_earth.dm index 8a332fad18a..e6e6b4b5372 100644 --- a/code/modules/cooking/recipes/cultural/recipes_earth.dm +++ b/code/modules/cooking/recipes/cultural/recipes_earth.dm @@ -332,3 +332,32 @@ fruit = list("dried peanut" = 10) result = /obj/item/reagent_containers/food/snacks/chipplate/peanuts_bowl reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/chana_masala + appliance = POT | SAUCEPAN + reagents = list(/singleton/reagent/spacespice = 2, /singleton/reagent/nutriment/rice = 10) + fruit = list("chickpeas" = 2, "tomato" = 1, "chili" = 1) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product + result = /obj/item/reagent_containers/food/snacks/chana_masala + +/singleton/recipe/hummus + appliance = MIX + reagents = list(/singleton/reagent/nutriment/garlicsauce = 10, /singleton/reagent/spacespice = 2) + fruit = list("chickpeas" = 2) + result = /obj/item/reagent_containers/food/snacks/hummus + +/singleton/recipe/bagel + appliance = OVEN + fruit = list("poppy" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/doughslice + ) + result = /obj/item/reagent_containers/food/snacks/bagel + +/singleton/recipe/fairy_bread + appliance = MIX + reagents = list(/singleton/reagent/nutriment/sprinkles = 3) + items = list( + /obj/item/reagent_containers/food/snacks/breadslice + ) + result = /obj/item/reagent_containers/food/snacks/fairy_bread diff --git a/code/modules/hydroponics/seed_datums/vegetables.dm b/code/modules/hydroponics/seed_datums/vegetables.dm index 71ba07eb89f..0ecb7ef88f2 100644 --- a/code/modules/hydroponics/seed_datums/vegetables.dm +++ b/code/modules/hydroponics/seed_datums/vegetables.dm @@ -180,6 +180,28 @@ /obj/item/seeds/soyaseed seed_type = "soybean" + +/datum/seed/chickpea + name = "chickpea" + seed_name = "chickpea" + display_name = "chickpeas" + chems = list(/singleton/reagent/nutriment = list(1, 20)) + kitchen_tag = "chickpeas" + +/datum/seed/chickpea/setup_traits() + ..() + set_trait(TRAIT_HARVEST_REPEAT,1) + set_trait(TRAIT_MATURATION, 4) + set_trait(TRAIT_PRODUCTION, 4) + set_trait(TRAIT_YIELD, 3) + set_trait(TRAIT_POTENCY, 5) + set_trait(TRAIT_PRODUCT_ICON, "bean") + set_trait(TRAIT_PRODUCT_COLOUR, "#e0ce25") + set_trait(TRAIT_PLANT_ICON, "bush2") + +/obj/item/seeds/chickpeas + seed_type = "chickpea" + /////////////// // Cabbage // /////////////// diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index 7db91dcf5af..f72aa11baf4 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -105,7 +105,8 @@ /obj/item/seeds/barnacle = 15, /obj/item/seeds/mollusc = 15, /obj/item/seeds/clam/rasval = 15, - /obj/item/seeds/fjylozyn = 1 + /obj/item/seeds/fjylozyn = 1, + /obj/item/seeds/chickpeas = 3 ) /obj/machinery/seed_storage/xenobotany @@ -173,7 +174,8 @@ /obj/item/seeds/whitebeetseed = 3, /obj/item/seeds/wulumunushaseed = 3, /obj/item/seeds/dynseed = 3, - /obj/item/seeds/fjylozyn = 3 + /obj/item/seeds/fjylozyn = 3, + /obj/item/seeds/chickpeas = 3 ) /obj/machinery/seed_storage/attack_hand(mob/user as mob) 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 1727d4225cc..051d341293f 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -612,6 +612,9 @@ nutriment_factor = 1 color = "#FF00FF" taste_description = "sweetness" + condiment_name = "bottle of sprinkles" + condiment_icon_state = "sprinklesbottle" + condiment_center_of_mass = list("x"=16, "y"=10) /singleton/reagent/nutriment/mint name = "Mint" diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index 147cd04df80..cef1226a6b6 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -95,6 +95,11 @@ volume = 40 reagents_to_add = list(/singleton/reagent/spacespice = 40) +/obj/item/reagent_containers/food/condiment/shaker/sprinkles + icon_state = "sprinklesbottle" + volume = 40 + reagents_to_add = list(/singleton/reagent/nutriment/sprinkles = 40) + /obj/item/reagent_containers/food/condiment/flour name = "flour sack" desc = "A big bag of flour. Good for baking!" diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 45749bc5229..69dbdaf7a85 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -5859,3 +5859,43 @@ reagent_data = list(/singleton/reagent/nutriment = list("pickled lettuce" = 4)) bitesize = 2 trash = /obj/item/trash/plate + +/obj/item/reagent_containers/food/snacks/hummus + name = "hummus" + desc = "A tasty spread made from chickpeas and sesame seed paste." + icon_state = "hummus" + filling_color = "#F1DA96" + reagents_to_add = list(/singleton/reagent/nutriment = 4) + reagent_data = list(/singleton/reagent/nutriment = list("smooth chickpeas" = 4, "garlic" = 1)) + bitesize = 3 + trash = /obj/item/trash/snack_bowl + +/obj/item/reagent_containers/food/snacks/fairy_bread + name = "fairy bread" + desc = "A piece of bread covered in sprinkles. Absolutely delicious!" + icon_state = "fairy_bread" + item_state = "toast" + slot_flags = SLOT_MASK + contained_sprite = TRUE + filling_color = "#FEFECC" + reagents_to_add = list(/singleton/reagent/nutriment = 3) + bitesize = 1 + +/obj/item/reagent_containers/food/snacks/bagel + name = "bagel" + desc = "Goes great with cream cheese and smoked salmon." + icon_state = "bagel" + filling_color = "#F1B45E" + reagents_to_add = list(/singleton/reagent/nutriment = 2) + reagent_data = list(/singleton/reagent/nutriment = list("toasty dough" = 2)) + bitesize = 1 + +/obj/item/reagent_containers/food/snacks/chana_masala + name = "chana masala" + desc = "Curried chickpeas on rice." + icon_state = "chana_masala" + filling_color = "#C97F02" + reagents_to_add = list(/singleton/reagent/nutriment = 8, /singleton/reagent/nutriment/rice = 10, /singleton/reagent/spacespice = 2, /singleton/reagent/capsaicin = 2) + reagent_data = list(/singleton/reagent/nutriment = list("spicy chickpeas" = 4)) + bitesize = 2 + trash = /obj/item/trash/plate diff --git a/html/changelogs/geeves-australia.yml b/html/changelogs/geeves-australia.yml new file mode 100644 index 00000000000..f830225dad1 --- /dev/null +++ b/html/changelogs/geeves-australia.yml @@ -0,0 +1,6 @@ +author: lavillastrangiato, Geeves + +delete-after: True + +changes: + - rscadd: "Added chana masala, hummus, bagel, and fairy bread recipes. Added sprinkles as a condiment." \ No newline at end of file diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 2cd8a9369c4..19be35dc11b 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index d2a81522f20..3d1ad829cd1 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -1506,8 +1506,8 @@ "aIh" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/teapot{ - pixel_y = 7; - pixel_x = 2 + pixel_x = 2; + pixel_y = 7 }, /turf/simulated/floor/wood, /area/maintenance/wing/starboard) @@ -32486,8 +32486,8 @@ "pQq" = ( /obj/structure/table/wood, /obj/item/flame/candle{ - pixel_y = 3; - pixel_x = -5 + pixel_x = -5; + pixel_y = 3 }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) @@ -48487,6 +48487,12 @@ pixel_x = 8; pixel_y = 7 }, +/obj/item/reagent_containers/food/condiment/shaker/sprinkles{ + pixel_x = -3 + }, +/obj/item/reagent_containers/food/condiment/shaker/sprinkles{ + pixel_x = 9 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "xzK" = (