diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index da8fb24767d..f6834297892 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -965,6 +965,16 @@ I said no! ) result = /obj/item/weapon/ruinedvirusdish +/datum/recipe/onionrings + fruit = list("onion" = 1) + reagents = list("flour" = 5) + result = /obj/item/weapon/reagent_containers/food/snacks/onionrings + +/datum/recipe/onionsoup + fruit = list("onion" = 1) + reagents = list("water" = 10) + result = /obj/item/weapon/reagent_containers/food/snacks/onionsoup + ////////////////////////////////////////// // bs12 food port stuff ////////////////////////////////////////// diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index 9d83ea0be83..60a6b39da68 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -706,6 +706,24 @@ set_trait(TRAIT_PLANT_ICON,"bush2") set_trait(TRAIT_WATER_CONSUMPTION, 6) +/datum/seed/onion + name = "onion" + seed_name = "onion" + display_name = "onions" + chems = list("nutriment" = list(1,10)) + kitchen_tag = "onion" + +/datum/seed/onion/New() + ..() + set_trait(TRAIT_MATURATION,10) + set_trait(TRAIT_PRODUCTION,1) + set_trait(TRAIT_YIELD,4) + set_trait(TRAIT_POTENCY,10) + set_trait(TRAIT_PRODUCT_ICON,"onion") + set_trait(TRAIT_PRODUCT_COLOUR,"#E0C367") + set_trait(TRAIT_PLANT_ICON,"carrot") + set_trait(TRAIT_WATER_CONSUMPTION, 6) + /datum/seed/soybean name = "soybean" seed_name = "soybean" @@ -910,6 +928,7 @@ /datum/seed/citrus/lemon/New() ..() set_trait(TRAIT_PRODUCES_POWER,1) + set_trait(TRAIT_PRODUCT_ICON,"lemon") set_trait(TRAIT_PRODUCT_COLOUR,"#F0E226") set_trait(TRAIT_FLESH_COLOUR,"#F0E226") set_trait(TRAIT_IDEAL_LIGHT, 6) diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm index 5870a546af7..719373f5d36 100644 --- a/code/modules/hydroponics/seed_packets.dm +++ b/code/modules/hydroponics/seed_packets.dm @@ -237,6 +237,9 @@ var/global/list/plant_seed_sprites = list() /obj/item/seeds/lemonseed seed_type = "lemon" +/obj/item/seeds/onionseed + seed_type = "onion" + /obj/item/seeds/orangeseed seed_type = "orange" diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index 48b26fd777d..9d612f508dd 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -60,6 +60,7 @@ /obj/item/seeds/limeseed = 3, /obj/item/seeds/mtearseed = 2, /obj/item/seeds/orangeseed = 3, + /obj/item/seeds/onionseed = 3, /obj/item/seeds/peanutseed = 3, /obj/item/seeds/plumpmycelium = 3, /obj/item/seeds/poppyseed = 3, diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index f748c748d38..3533ad5b0c3 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -1959,6 +1959,34 @@ reagents.add_reagent("tomatojuice", 10) bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/onionsoup + name = "Onion Soup" + desc = "A soup with layers." + icon_state = "onionsoup" + trash = /obj/item/trash/snack_bowl + filling_color = "#E0C367" + center_of_mass = list("x"=16, "y"=7) + nutriment_amt = 5 + nutriment_desc = list("onion" = 2, "soup" = 2) + +/obj/item/weapon/reagent_containers/food/snacks/onionsoup/New() + ..() + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/onionrings + name = "Onion Soup" + desc = "Crispy rings." + icon_state = "onionrings" + trash = /obj/item/trash/plate + filling_color = "#E0C367" + center_of_mass = list("x"=16, "y"=7) + nutriment_amt = 5 + nutriment_desc = list("onion" = 2) + +/obj/item/weapon/reagent_containers/food/snacks/onionrings/New() + ..() + bitesize = 2 + /obj/item/weapon/reagent_containers/food/snacks/rofflewaffles name = "Roffle Waffles" desc = "Waffles from Roffle. Co." diff --git a/html/changelogs/SunnyDaff-OnionFoodandPlantTweaks.yml b/html/changelogs/SunnyDaff-OnionFoodandPlantTweaks.yml new file mode 100644 index 00000000000..76a1d70eb9c --- /dev/null +++ b/html/changelogs/SunnyDaff-OnionFoodandPlantTweaks.yml @@ -0,0 +1,7 @@ +author: SunnyDaff +delete-after: True + + - rscadd: Added new food items. + - rscadd: Added Onions. + - tweak: Changed Apple and Lemon Sprite + diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index b7579ead3e4..14f54fb5dcf 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/hydroponics_products.dmi b/icons/obj/hydroponics_products.dmi index 3bb6cd589cf..9fdc7c763f3 100644 Binary files a/icons/obj/hydroponics_products.dmi and b/icons/obj/hydroponics_products.dmi differ diff --git a/icons/obj/seeds.dmi b/icons/obj/seeds.dmi index b55b4cd39ef..380cae9e9ce 100644 Binary files a/icons/obj/seeds.dmi and b/icons/obj/seeds.dmi differ