diff --git a/GainStation13/code/modules/hydroponics/grown/berries.dm b/GainStation13/code/modules/hydroponics/grown/berries.dm new file mode 100644 index 00000000..26326263 --- /dev/null +++ b/GainStation13/code/modules/hydroponics/grown/berries.dm @@ -0,0 +1,25 @@ +/obj/item/seeds/berry/blueberry + name = "pack of blueberry seeds" + desc = "These seeds grow into blueberry bushes." + icon_state = "seed-blueberry" + species = "blueberry" + plantname = "Blueberry Bush" + product = /obj/item/reagent_containers/food/snacks/grown/berries/blueberry + mutatelist = list() + reagents_add = list(/datum/reagent/blueberry_juice = 0.1) + potency = 1 + yield = 1 + production = 10 + rarity = 30 + +/obj/item/reagent_containers/food/snacks/grown/berries/blueberry + seed = /obj/item/seeds/berry/blueberry + name = "bunch of blueberries" + desc = "Taste so good, you might turn blue!" + icon_state = "blueberrypile" + filling_color = "#5d00c7" + foodtype = FRUIT + juice_results = list(/datum/reagent/blueberry_juice = 20) + tastes = list("blueberry" = 1) + distill_reagent = null + wine_power = 50 diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm index 80792538..d0caf71b 100644 --- a/code/modules/hydroponics/grown/berries.dm +++ b/code/modules/hydroponics/grown/berries.dm @@ -14,7 +14,7 @@ icon_grow = "berry-grow" // Uses one growth icons set for all the subtypes icon_dead = "berry-dead" // Same for the dead icon genes = list(/datum/plant_gene/trait/repeated_harvest) - mutatelist = list(/obj/item/seeds/berry/glow, /obj/item/seeds/berry/poison) + mutatelist = list(/obj/item/seeds/berry/glow, /obj/item/seeds/berry/poison, /obj/item/seeds/berry/blueberry) reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1) /obj/item/reagent_containers/food/snacks/grown/berries diff --git a/icons/obj/hydroponics/growing_fruits.dmi b/icons/obj/hydroponics/growing_fruits.dmi index ba076103..65ff027e 100644 Binary files a/icons/obj/hydroponics/growing_fruits.dmi and b/icons/obj/hydroponics/growing_fruits.dmi differ diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi index 32cb2022..13081d25 100644 Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi index 4191f9a5..3bc523e6 100644 Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 80b2bf8f..282e1967 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3112,6 +3112,7 @@ #include "GainStation13\code\modules\food_and_drinks\recipes_bigpizza.dm" #include "GainStation13\code\modules\food_and_drinks\objects\candy_flora.dm" #include "GainStation13\code\modules\food_and_drinks\recipes\recipes_ported.dm" +#include "GainStation13\code\modules\hydroponics\grown\berries.dm" #include "GainStation13\code\modules\mob\living\emote.dm" #include "GainStation13\code\modules\mob\living\emote_modular.dm" #include "GainStation13\code\modules\mob\living\emote_ported.dm"