diff --git a/code/game/objects/items/food/pastries.dm b/code/game/objects/items/food/pastries.dm index 277e6efaff89..c7af5673a0a9 100644 --- a/code/game/objects/items/food/pastries.dm +++ b/code/game/objects/items/food/pastries.dm @@ -567,9 +567,13 @@ w_class = WEIGHT_CLASS_TINY crafting_complexity = FOOD_COMPLEXITY_3 +//NON-MODULE CHANGE START : Use our own code for macaron randomization +/* /obj/item/food/cookie/macaron/Initialize(mapload) . = ..() icon_state = "[base_icon_state]_[rand(1, 4)]" +*/ +// NON-MODULE CHANGE END /obj/item/food/cookie/thumbprint_cookie name = "thumbprint cookie" diff --git a/maplestation.dme b/maplestation.dme index f073cbd17427..c8529538d58a 100644 --- a/maplestation.dme +++ b/maplestation.dme @@ -6355,10 +6355,14 @@ #include "maplestation_modules\code\modules\flavor_text\flavor_text.dm" #include "maplestation_modules\code\modules\flavor_text\pose_component.dm" #include "maplestation_modules\code\modules\food_and_drinks\food\eggs.dm" +#include "maplestation_modules\code\modules\food_and_drinks\food\pastries.dm" +#include "maplestation_modules\code\modules\food_and_drinks\food\starfruit.dm" #include "maplestation_modules\code\modules\food_and_drinks\recipes\drinks_recipes.dm" #include "maplestation_modules\code\modules\food_and_drinks\recipes\food\egg_recipes.dm" +#include "maplestation_modules\code\modules\food_and_drinks\recipes\food\starfruit_recipes.dm" #include "maplestation_modules\code\modules\hydroponics\hydroponics.dm" #include "maplestation_modules\code\modules\hydroponics\plant_genes.dm" +#include "maplestation_modules\code\modules\hydroponics\grown\starfruit.dm" #include "maplestation_modules\code\modules\jobs\job_types\_job.dm" #include "maplestation_modules\code\modules\jobs\job_types\asset_protection.dm" #include "maplestation_modules\code\modules\jobs\job_types\assistant.dm" diff --git a/maplestation_modules/code/modules/cargo/packs.dm b/maplestation_modules/code/modules/cargo/packs.dm index 0ae6710eaebf..68d4ab146825 100644 --- a/maplestation_modules/code/modules/cargo/packs.dm +++ b/maplestation_modules/code/modules/cargo/packs.dm @@ -303,3 +303,13 @@ /obj/item/mana_battery/mana_crystal/cut, /obj/item/mana_battery/mana_crystal/cut, ) + +/datum/supply_pack/imports/starfruit_seed + name = "Murian Starfruit Seeds" + desc = "A seed of juicy Murian Starfruit, imported from the agricultural world of Cremona's Bounty. \ + Has major significance to the peoples of Mu and is used in a wide variety of drinks and dishes." + cost = PAYCHECK_COMMAND * 5 + contains = list( + /obj/item/seeds/starfruit = 2, + /obj/item/book/manual/starfruit = 1, + ) diff --git a/maplestation_modules/code/modules/food_and_drinks/food/pastries.dm b/maplestation_modules/code/modules/food_and_drinks/food/pastries.dm new file mode 100644 index 000000000000..d05b63e39607 --- /dev/null +++ b/maplestation_modules/code/modules/food_and_drinks/food/pastries.dm @@ -0,0 +1,9 @@ +//Macaron randomness variable + override +/obj/item/food/cookie/macaron + /// Randomize the icon_state between multiple states on initialize + var/randomize_icon_state = TRUE + +/obj/item/food/cookie/macaron/Initialize(mapload) + . = ..() + if(randomize_icon_state) + icon_state = "[base_icon_state]_[rand(1, 4)]" diff --git a/maplestation_modules/code/modules/food_and_drinks/food/starfruit.dm b/maplestation_modules/code/modules/food_and_drinks/food/starfruit.dm new file mode 100644 index 000000000000..111c069015b2 --- /dev/null +++ b/maplestation_modules/code/modules/food_and_drinks/food/starfruit.dm @@ -0,0 +1,272 @@ +/obj/item/food/starfruit_ribs + name = "starfruit glazed ribs" + desc = "Tender BBQ ribs, glazed with a sweet Starfruit sauce. Garinished with a caramelized starfruit on the side. The sweetest least vegan thing this side of the galaxy." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "glazedchops" + w_class = WEIGHT_CLASS_NORMAL + food_reagents = list( + /datum/reagent/consumable/nutriment/protein = 15, + /datum/reagent/consumable/nutriment/vitamin = 5, + /datum/reagent/consumable/bbqsauce = 5, + /datum/reagent/consumable/starfruit_juice = 5, + ) + tastes = list("tender meat" = 2, "sweet sauce" = 1, "sugary glaze" = 1) + foodtypes = MEAT + crafting_complexity = FOOD_COMPLEXITY_4 + +/obj/item/food/meat_platter + name = "BBQ Meat Platter" + desc = "An elaborate BBQ platter adorned with several BBQ favorites on this side of the galaxy. Garnished with some roasted pepper." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "meatdisc" + w_class = WEIGHT_CLASS_NORMAL + food_reagents = list( + /datum/reagent/consumable/nutriment/protein = 30, + /datum/reagent/consumable/nutriment/vitamin = 10, + /datum/reagent/consumable/bbqsauce = 10, + /datum/reagent/consumable/starfruit_juice = 10, + ) + tastes = list("tender meat" = 2, "sweet sauce" = 1, "smokey BBQ" = 1, "sugary glaze" = 1) + foodtypes = MEAT + crafting_complexity = FOOD_COMPLEXITY_5 + +/obj/item/food/starfruit_chicken_alfredo + name = "Starfruit Chicken Alfredo" + desc = "A chicken alfredo dish with a starfruit cream sauce. Not for the faint of heart." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "alfredo" + w_class = WEIGHT_CLASS_NORMAL + food_reagents = list( + /datum/reagent/consumable/nutriment/protein = 15, + /datum/reagent/consumable/nutriment/vitamin = 5, + /datum/reagent/consumable/starfruit_juice = 10, + ) + tastes = list("sweet chicken" = 2, "creamy sauce" = 1, "cursed knowledge" = 1, "tasty noodles" = 1) + foodtypes = MEAT | GRAIN + crafting_complexity = FOOD_COMPLEXITY_3 + +/obj/item/food/starfruit_sushi_roll + name = "starfruit sushi roll" + desc = "A roll of simple sushi with delicious starfruit sashimi. Sliceable into pieces!" + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "sashimiroll" + food_reagents = list( + /datum/reagent/consumable/nutriment = 12, + /datum/reagent/consumable/nutriment/vitamin = 4, + ) + tastes = list("boiled rice" = 2, "starfruit" = 2, "fish" = 2) + foodtypes = SEAFOOD + w_class = WEIGHT_CLASS_SMALL + crafting_complexity = FOOD_COMPLEXITY_3 + +/obj/item/food/starfruit_sushi_roll/make_processable() + AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/starfruit_sushi_slice, 4, screentip_verb = "Chop") + +/obj/item/food/starfruit_sushi_slice + name = "starfruit sushi slice" + desc = "A slice of starfruit sushi with rice, fish, and cradled in a seaweed sheath." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "sashimirollslice" + food_reagents = list( + /datum/reagent/consumable/nutriment = 3, + /datum/reagent/consumable/nutriment/vitamin = 1, + ) + tastes = list("boiled rice" = 2, "starfruit" = 2, "fish" = 2) + foodtypes = SEAFOOD + w_class = WEIGHT_CLASS_SMALL + crafting_complexity = FOOD_COMPLEXITY_3 + +/obj/item/food/starfruit_sashimi + name = "starfruit sashimi" + desc = "Delicately sliced sashimi marinated with a starfruit reduced soy sauce." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "sashimi" + w_class = WEIGHT_CLASS_NORMAL + food_reagents = list( + /datum/reagent/consumable/nutriment = 5, + /datum/reagent/consumable/nutriment/vitamin = 5, + /datum/reagent/consumable/starfruit_juice = 10, + ) + tastes = list("raw fish" = 2, "sweet fish" = 1, "soy sauce" = 1) + foodtypes = SEAFOOD + crafting_complexity = FOOD_COMPLEXITY_2 + +/obj/item/food/eggplant_fry + name = "starfruit eggplant stir fry" + desc = "Eggplant stir fry with a reduced starfruit sauce, carrot, peppers, and cabbage. The starfruit has absolutely covered the dish." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "eggplantfry" + w_class = WEIGHT_CLASS_NORMAL + food_reagents = list( + /datum/reagent/consumable/nutriment = 10, + /datum/reagent/consumable/nutriment/vitamin = 5, + /datum/reagent/consumable/starfruit_juice = 10, + ) + tastes = list("eggplant" = 2, "simmered starfruit" = 1, "sauteed vegetables" = 1) + foodtypes = VEGETABLES + crafting_complexity = FOOD_COMPLEXITY_3 + +/obj/item/food/starfruit_tofu_beef + name = "starfruit tofu beef teriyaki noodles" + desc = "A tofu and beef teriyaki noodle dish with starfruit juice added to the sauce. A deliciously savory mix of fruits, vegetables, meat and tofu." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "tofubeef" + w_class = WEIGHT_CLASS_NORMAL + food_reagents = list( + /datum/reagent/consumable/nutriment = 10, + /datum/reagent/consumable/nutriment/vitamin = 5, + /datum/reagent/consumable/starfruit_juice = 10, + ) + tastes = list("teriyaki noodles" = 2, "sauteed tofu" = 1, "sweet meat" = 1) + foodtypes = VEGETABLES | MEAT | GRAIN + crafting_complexity = FOOD_COMPLEXITY_4 + +/obj/item/food/starfruit_noodles + name = "starfruit noodles" + desc = "Savory boiled pasta with a rich and creamy reduced starfruit meat sauce." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "starfruitplate" + w_class = WEIGHT_CLASS_NORMAL + food_reagents = list( + /datum/reagent/consumable/nutriment = 10, + /datum/reagent/consumable/nutriment/vitamin = 5, + /datum/reagent/consumable/starfruit_juice = 10, + ) + tastes = list("eggplant" = 2, "simmered starfruit" = 1, "sautaed vegetables" = 1) + foodtypes = GRAIN | MEAT + crafting_complexity = FOOD_COMPLEXITY_3 + +/obj/item/food/cake/starfruit + name = "starfruit cake" + desc = "An elaborately decorated cake with a starfruit filling. Pairs well with a starlit latte." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "starcake" + food_reagents = list( + /datum/reagent/consumable/nutriment = 20, + /datum/reagent/consumable/nutriment/vitamin = 10, + ) + tastes = list("cake" = 3, "sweetness" = 2, "unbearable longing" = 2) + foodtypes = GRAIN | DAIRY | FRUIT | SUGAR + slice_type = /obj/item/food/cakeslice/starfruit + crafting_complexity = FOOD_COMPLEXITY_3 + +/obj/item/food/cakeslice/starfruit + name = "starfruit cake slice" + desc = "A slice of starfruit cake, you got a slice with extra frosting! Lucky you!" + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "starcake_slice" + tastes = list("cake" = 3, "astral sweetness" = 2, "unbearable longing" = 2) + foodtypes = GRAIN | DAIRY | FRUIT | SUGAR + crafting_complexity = FOOD_COMPLEXITY_3 + +/obj/item/reagent_containers/condiment/starfruit_jelly + name = "starfruit jelly" + desc = "A jar of super-sweet starfruit jelly." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "spacejam" + list_reagents = list(/datum/reagent/consumable/starfruit_jelly = 50) + fill_icon_thresholds = null + +/obj/item/food/cookie/macaron/starfruit + name = "starfruit macaron" + desc = "A sandwich-like confectionary with a soft cookie shell and a creamy starfruit jelly meringue center." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "macaron_4" + tastes = list("wafer" = 2, "sweet starfruit" = 2, "creamy meringue" = 3) + randomize_icon_state = FALSE + +/obj/item/food/pie/starfruit_cobbler + name = "starfruit cobbler" + desc = "A tasty cobbler packed with sweet starfruit in a buttery pastry crust. Topped with a small amount of sweet cream." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "cobbler" + bite_consumption = 3 + food_reagents = list( + /datum/reagent/consumable/nutriment = 3, + /datum/reagent/consumable/nutriment/vitamin = 5, + ) + tastes = list("pie" = 1, "sugar" = 2, "starfruit" = 1, "cosmic longing" = 1) + foodtypes = GRAIN | FRUIT + +/obj/item/food/starfruit_toast + name = "starfruit jellied toast" + desc = "A slice of toast covered with delicious starfruit jam." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "spacejamtoast" + food_reagents = list( + /datum/reagent/consumable/nutriment = 8, + /datum/reagent/consumable/nutriment/vitamin = 4, + ) + bite_consumption = 3 + tastes = list("toast" = 1, "jelly" = 1, "starfruit jelly" = 1) + foodtypes = GRAIN | BREAKFAST + food_flags = FOOD_FINGER_FOOD + w_class = WEIGHT_CLASS_SMALL + crafting_complexity = FOOD_COMPLEXITY_3 + +/obj/item/food/pie/starfruit_pie + name = "starfruit pie" + desc = "Deceptively simple, yet flavor intensive." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "starfruitpie" + food_reagents = list( + /datum/reagent/consumable/nutriment = 14, + /datum/reagent/consumable/nutriment/vitamin = 6, + ) + tastes = list("starfruit" = 1, "pie" = 1, "cosmic longing" = 1) + foodtypes = GRAIN | FRUIT | SUGAR + slice_type = /obj/item/food/pieslice/starfruit_pie + crafting_complexity = FOOD_COMPLEXITY_3 + +/obj/item/food/pieslice/starfruit_pie + name = "starfruit pie slice" + desc = "Takes you on a journey though space!" + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "starfruitpie_slice" + tastes = list("pie" = 1, "starfruit" = 1, "cosmic longing" = 1) + foodtypes = GRAIN | FRUIT | SUGAR + crafting_complexity = FOOD_COMPLEXITY_3 + +/obj/item/food/starfruit_compote + name = "starfruit compote" + desc = "An irresistibly sweet dish of starfruit boiled down in cognac and sugar." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "compote" + food_reagents = list( + /datum/reagent/consumable/nutriment = 12, + /datum/reagent/consumable/nutriment/vitamin = 6, + ) + tastes = list("starfruit" = 1, "sweet sugar" = 1, "cognac spice" = 1) + bite_consumption = 3 + foodtypes = FRUIT | SUGAR + w_class = WEIGHT_CLASS_SMALL + crafting_complexity = FOOD_COMPLEXITY_3 + +/obj/item/food/starfruit_brulee + name = "starfruit creme brulee" + desc = "A delightful pudding dish made from primarily caramel and egg whites." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "cremebrulee" + food_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/nutriment/vitamin = 2, + ) + tastes = list("starfruit" = 1, "caramel" = 1, "subtle cream" = 1) + foodtypes = FRUIT | SUGAR + w_class = WEIGHT_CLASS_SMALL + crafting_complexity = FOOD_COMPLEXITY_3 + +/obj/item/food/starfruit_cupcake + name = "starfruit cupcake" + desc = "A sweet cupcake with a starfruit frosting." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "cupcakestar" + food_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/nutriment/vitamin = 2, + ) + tastes = list("cake" = 3, "starfruit" = 1) + foodtypes = GRAIN | FRUIT | SUGAR + food_flags = FOOD_FINGER_FOOD + w_class = WEIGHT_CLASS_SMALL + crafting_complexity = FOOD_COMPLEXITY_3 diff --git a/maplestation_modules/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/maplestation_modules/code/modules/food_and_drinks/recipes/drinks_recipes.dm index a5460ac2732d..57e252b51a52 100644 --- a/maplestation_modules/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/maplestation_modules/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -38,3 +38,37 @@ /datum/chemical_reaction/drink/pile_driver results = list(/datum/reagent/consumable/ethanol/piledriver = 2) required_reagents = list(/datum/reagent/consumable/ethanol/rum_coke = 1, /datum/reagent/consumable/ethanol/screwdrivercocktail = 1) + +// block of starfruit +/datum/chemical_reaction/drink/starfruit_soda + results = list(/datum/reagent/consumable/ethanol/starfruit_soda = 5) + required_reagents = list(/datum/reagent/consumable/starfruit_juice = 2, /datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/ethanol/cognac = 1, /datum/reagent/consumable/sodawater = 1) + mix_message = "The ingredients combine into fizzy soda." + +/datum/chemical_reaction/drink/starfruit_lubricant + results = list(/datum/reagent/consumable/ethanol/starfruit_lubricant = 2) + required_reagents = list(/datum/reagent/consumable/starfruit_juice = 1, /datum/reagent/fuel/oil = 1) + mix_message = "The ingredients combine into an oily soda." + +/datum/chemical_reaction/drink/starfruit_latte + results = list(/datum/reagent/consumable/starfruit_latte = 2) + required_reagents = list(/datum/reagent/consumable/starfruit_juice = 1, /datum/reagent/consumable/coffee = 1) + +/datum/chemical_reaction/drink/starbeam_shake + results = list(/datum/reagent/consumable/starbeam_shake = 3) + required_reagents = list(/datum/reagent/consumable/starfruit_juice = 1, /datum/reagent/consumable/vanilla_dream = 1, /datum/reagent/consumable/ice = 1) + +/datum/chemical_reaction/drink/forgotten_star + results = list(/datum/reagent/consumable/ethanol/forgotten_star = 5) + required_reagents = list(/datum/reagent/consumable/starfruit_juice = 1, /datum/reagent/consumable/pineapplejuice = 1, /datum/reagent/consumable/ethanol/white_russian = 1, /datum/reagent/consumable/ethanol/creme_de_coconut = 1, /datum/reagent/consumable/ethanol/bitters = 1) + mix_message = "The ingredients combine into a shooting star." + +/datum/chemical_reaction/drink/astral_flame + results = list(/datum/reagent/consumable/ethanol/astral_flame = 6) + required_reagents = list(/datum/reagent/consumable/starfruit_juice = 1, /datum/reagent/consumable/ethanol/navy_rum = 1, /datum/reagent/consumable/menthol = 1, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/sodawater = 1) + mix_message = "The ingredients morph with an enticing smell." + +/datum/chemical_reaction/drink/space_muse + results = list(/datum/reagent/consumable/ethanol/space_muse = 3) + required_reagents = list(/datum/reagent/consumable/starfruit_juice = 1, /datum/reagent/consumable/ethanol/creme_de_menthe = 1, /datum/reagent/consumable/ethanol/vodka = 1) + mix_message = "The mixture gives a soft crackling snap." diff --git a/maplestation_modules/code/modules/food_and_drinks/recipes/food/starfruit_recipes.dm b/maplestation_modules/code/modules/food_and_drinks/recipes/food/starfruit_recipes.dm new file mode 100644 index 000000000000..5849fd817078 --- /dev/null +++ b/maplestation_modules/code/modules/food_and_drinks/recipes/food/starfruit_recipes.dm @@ -0,0 +1,173 @@ +/datum/crafting_recipe/food/starfruit_ribs + name = "Starfruit Glazed Ribs" + reqs = list( + /obj/item/food/bbqribs = 1, + /obj/item/food/grown/starfruit = 2, + /datum/reagent/consumable/starfruit_juice = 5, + ) + result = /obj/item/food/starfruit_ribs + category = CAT_MEAT + +/datum/crafting_recipe/food/meat_platter + name = "BBQ Meat Platter" + reqs = list( + /obj/item/food/bbqribs = 1, + /obj/item/food/starfruit_ribs = 1, + /obj/item/food/roasted_bell_pepper = 2, + ) + result = /obj/item/food/meat_platter + category = CAT_MEAT + +/datum/crafting_recipe/food/starfruit_chicken_alfredo + name = "Starfruit Chicken Alfredo" + reqs = list( + /obj/item/food/meat/slab/chicken = 1, + /obj/item/food/grown/starfruit = 2, + /datum/reagent/consumable/cream = 10, + /obj/item/food/spaghetti/boiledspaghetti = 1 + ) + result = /obj/item/food/starfruit_chicken_alfredo + category = CAT_MISCFOOD + +/datum/crafting_recipe/food/starfruit_sushi_roll + name = "Starfruit Sushi Roll" + reqs = list( + /obj/item/food/seaweedsheet = 1, + /obj/item/food/boiledrice = 1, + /obj/item/food/starfruit_sashimi = 1, + ) + result = /obj/item/food/starfruit_sushi_roll + category = CAT_SEAFOOD + +/datum/crafting_recipe/food/starfruit_sashimi + name = "Starfruit Sashimi" + reqs = list( + /obj/item/food/fishmeat = 2, + /datum/reagent/consumable/soysauce = 10, + /obj/item/food/grown/starfruit = 1, + ) + result = /obj/item/food/starfruit_sashimi + category = CAT_SEAFOOD + +/datum/crafting_recipe/food/eggplant_fry + name = "Starfruit Eggplant Stir Fry" + reqs = list( + /obj/item/food/grown/eggplant = 1, + /obj/item/food/grown/bell_pepper = 1, + /obj/item/food/grown/cabbage = 1, + /obj/item/food/grown/starfruit = 1, + /obj/item/food/grown/carrot = 1, + ) + result = /obj/item/food/eggplant_fry + category = CAT_MISCFOOD + +/datum/crafting_recipe/food/starfruit_tofu_beef + name = "Starfruit Tofu Beef Teriyaki" + reqs = list( + /obj/item/food/tofu = 1, + /obj/item/food/meat/cutlet = 2, + /obj/item/food/spaghetti/boiledspaghetti = 1, + /datum/reagent/consumable/starfruit_juice = 4, + /datum/reagent/consumable/nutriment/soup/teriyaki = 5, + ) + result = /obj/item/food/starfruit_tofu_beef + category = CAT_MISCFOOD + +/datum/crafting_recipe/food/starfruit_noodles + name = "Starfruit Noodles" + reqs = list( + /obj/item/food/meatball = 2, + /obj/item/food/meat/cutlet = 2, + /obj/item/food/grown/starfruit = 1, + /obj/item/food/spaghetti/pastatomato = 1, + ) + result = /obj/item/food/starfruit_noodles + category = CAT_MISCFOOD + +/datum/crafting_recipe/food/starfruit_cake + name = "Starfruit Cake" + reqs = list( + /obj/item/food/cake/plain = 1, + /obj/item/food/grown/starfruit = 5 + ) + result = /obj/item/food/cake/starfruit + category = CAT_CAKE + +/datum/crafting_recipe/bottled/starfruit_jelly + name = "Starfruit Jelly" + reqs = list( + /obj/item/food/grown/starfruit = 10, + /datum/reagent/water = 25, + ) + result = /obj/item/reagent_containers/condiment/starfruit_jelly + category = CAT_MISCFOOD + +/datum/crafting_recipe/food/macaron/starfruit + name = "Starfruit Macaron" + reqs = list( + /datum/reagent/consumable/eggwhite = 2, + /datum/reagent/consumable/cream = 5, + /datum/reagent/consumable/flour = 5, + /datum/reagent/consumable/starfruit_jelly = 5, + ) + result = /obj/item/food/cookie/macaron/starfruit + category = CAT_PASTRY + +/datum/crafting_recipe/food/starfruit_cobbler + name = "Starfruit Cobbler" + reqs = list( + /obj/item/food/pastrybase = 2, + /obj/item/food/grown/starfruit = 2, + /datum/reagent/consumable/starfruit_jelly = 10, + ) + result = /obj/item/food/pie/starfruit_cobbler + category = CAT_PASTRY + +/datum/crafting_recipe/food/starfruit_toast + name = "Starfruit Jelly Toast" + reqs = list( + /obj/item/food/breadslice/plain = 1, + /datum/reagent/consumable/starfruit_jelly = 5, + ) + result = /obj/item/food/starfruit_toast + category = CAT_BREAD + +/datum/crafting_recipe/food/starfruit_pie + name = "Starfruit Pie" + reqs = list( + /obj/item/food/pie/plain = 1, + /obj/item/food/grown/starfruit = 2, + ) + result = /obj/item/food/pie/starfruit_pie + category = CAT_PASTRY + +/datum/crafting_recipe/food/starfruit_compote + name = "Starfruit Compote" + reqs = list( + /obj/item/food/grown/starfruit = 5, + /datum/reagent/consumable/sugar = 10, + /datum/reagent/consumable/ethanol/cognac = 10, + ) + result = /obj/item/food/starfruit_compote + category = CAT_MISCFOOD + +/datum/crafting_recipe/food/starfruit_brulee + name = "Starfruit Creme Brulee" + reqs = list( + /datum/reagent/consumable/starfruit_juice = 10, + /datum/reagent/consumable/sugar = 10, + /datum/reagent/consumable/salt = 5, + /datum/reagent/consumable/eggyolk = 2, + /datum/reagent/consumable/eggwhite = 4, + ) + result = /obj/item/food/starfruit_brulee + category = CAT_MISCFOOD + +/datum/crafting_recipe/food/starfruit_cupcake + name = "Starfruit Cupcake" + reqs = list( + /obj/item/food/pastrybase = 1, + /obj/item/food/grown/starfruit = 2 + ) + result = /obj/item/food/starfruit_cupcake + category = CAT_PASTRY diff --git a/maplestation_modules/code/modules/hydroponics/grown/starfruit.dm b/maplestation_modules/code/modules/hydroponics/grown/starfruit.dm new file mode 100644 index 000000000000..74d4ac77c78b --- /dev/null +++ b/maplestation_modules/code/modules/hydroponics/grown/starfruit.dm @@ -0,0 +1,33 @@ +// Starfruit +/obj/item/seeds/starfruit + name = "starfruit seed pack" + desc = "These seeds grow into starfruit plants, which bear a sugary and delicious fruit." + icon = 'maplestation_modules/icons/obj/hydroponics/seeds.dmi' + icon_state = "seed-starfruit" + species = "starfruit" + plantname = "Starfruit Plants" + product = /obj/item/food/grown/starfruit + lifespan = 50 + endurance = 15 + growthstages = 4 + growing_icon = 'maplestation_modules/icons/obj/hydroponics/growing.dmi' + icon_grow = "starfruit-grow" + icon_dead = "starfruit-dead" + icon_harvest = "starfruit-harvest" + genes = list(/datum/plant_gene/trait/glow/yellow, /datum/plant_gene/trait/repeated_harvest) + reagents_add = list( + /datum/reagent/consumable/starfruit_juice = 0.3, + /datum/reagent/consumable/nutriment = 0.1, + ) + +/obj/item/food/grown/starfruit + seed = /obj/item/seeds/starfruit + name = "starfruit" + desc = "The Murian Starfruit is an omnipresent sight throughout the Aristocracy of Mu, \ + having major cultural and historical significance following it's heroic deed in saving the initial colonists of what would later become House Gilidan \ + from widespread local crop failure, and allowing them to live off the land for those crucial few autumnal and winter months." + icon = 'maplestation_modules/icons/obj/hydroponics/harvest.dmi' + icon_state = "starfruit" + bite_consumption_mod = 2 + foodtypes = FRUIT | SUGAR + juice_typepath = /datum/reagent/consumable/starfruit_juice diff --git a/maplestation_modules/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/maplestation_modules/code/modules/reagents/chemistry/reagents/drink_reagents.dm index d210dca446a1..eee5bab2b910 100644 --- a/maplestation_modules/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/maplestation_modules/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -343,3 +343,184 @@ SEND_SIGNAL(affected_mob, COMSIG_CARBON_DRINK_CAFFEINE, CAFFEINE_POINTS_ENERGY * seconds_per_tick) if(HAS_TRAIT(affected_mob, TRAIT_CAFFEINE_LOVER)) affected_mob.add_mood_event("caffeine_lover", /datum/mood_event/energy_lover) + +//Starfruit drinks +//All the drinks are good-minimum because it requires a 1k import and then growing + +/datum/reagent/consumable/starfruit_juice + name = "Starfruit Juice" + description = "The raw essence of a starfruit." + color = "#6d3890" + taste_description = "lush cosmic sugar" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/starfruit_soda + name = "Stellar Twist" + description = "A drink overly tired moms could hide in their thermos." + boozepwr = 35 + color = "#434294" + quality = DRINK_GOOD + taste_description = "sweet stellar adventures" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/glass_style/drinking_glass/starfruit_soda + required_drink_type = /datum/reagent/consumable/ethanol/starfruit_soda + name = "Stellar Twist" + desc = "An alcoholic starfruit soda, you can see the carbonation in the glass." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "starsoda" + +/datum/reagent/consumable/ethanol/starfruit_lubricant + name = "Stellar Lubricant" + description = "A drink overly tired moms could hide in their thermos. Now for Synths!" + boozepwr = 35 + color = "#45b33b" + quality = DRINK_GOOD + taste_description = "sweet stellar adventures" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/glass_style/drinking_glass/starfruit_lubricant + required_drink_type = /datum/reagent/consumable/ethanol/starfruit_lubricant + name = "Stellar Lubricant" + desc = "An alcoholic synth friendly starfruit soda, you can see the carbonation in the glass." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "starsodasynth" + +/datum/reagent/consumable/starfruit_latte + name = "Starlit Latte" + description = "A subtly sweet coffee seemingly out of this world." + nutriment_factor = 8 + color = "#361329" + quality = DRINK_GOOD + taste_description = "hauntingly familiar allure" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/glass_style/drinking_glass/starfruit_latte + required_drink_type = /datum/reagent/consumable/starfruit_latte + name = "mug of starlit latte" + desc = "A simple coffee flavored with sweet starfruit juice. It takes you on a journey to a place you’ve never been, yet somehow know by heart." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "starfruit_latte" + +/datum/reagent/consumable/starbeam_shake + name = "Starbeam Shake" + description = "A delightful shake made with a rare starfruit." + color = "#a551be" + nutriment_factor = 0 + quality = DRINK_GOOD + taste_description = "smooth starlight" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/glass_style/drinking_glass/starbeam_shake + required_drink_type = /datum/reagent/consumable/starbeam_shake + name = "starbeam shake" + desc = "A thick and creamy drink that takes you for a journey in the stars." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "voidshake" + +/datum/reagent/consumable/ethanol/forgotten_star + name = "Forgotten Star" + description = "A cosmic cry of a bygone era." + boozepwr = 55 + color = "#434294" + quality = DRINK_GOOD + taste_description = "dreamy, tropical starlit sweetness" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/glass_style/drinking_glass/forgotten_star + required_drink_type = /datum/reagent/consumable/ethanol/forgotten_star + name = "Forgotten Star" + desc = "An alcoholic starfruit cocktail, you can almost make out a distant star system in the glass." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "forgottenstar" + +/datum/reagent/consumable/ethanol/astral_flame + name = "Astral Flame" + description = "Enticing flames." + boozepwr = 55 + color = "#6b3481" + quality = DRINK_GOOD + taste_description = "enticing warmth" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/glass_style/drinking_glass/astral_flame + required_drink_type = /datum/reagent/consumable/ethanol/astral_flame + name = "Astral Flame" + desc = "An alcoholic starfruit mojito, the flame in the glass tempts you closer." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "astralflame" + +/datum/reagent/consumable/ethanol/space_muse + name = "Space Muse" + description = "A snapshot straight from your local telescope." + boozepwr = 35 + color = "#7cb1e2" + quality = DRINK_GOOD + taste_description = "haughty cosmic thought" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/glass_style/drinking_glass/space_muse + required_drink_type = /datum/reagent/consumable/ethanol/space_muse + name = "Space Muse" + desc = "An alcoholic cocktail that draws you in with subtle bites of mint and starfruit." + icon = 'maplestation_modules/icons/obj/food/starfruit.dmi' + icon_state = "spacemuse" + +/datum/reagent/consumable/starfruit_jelly + name = "Starfruit Jelly" + description = "A rare sweet fruit jelly." + nutriment_factor = 10 + color = "#6d3890" + taste_description = "starfruit" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + default_container = /obj/item/reagent_containers/condiment/starfruit_jelly + +//Manual with the drink recipes, to make recipe browsing more interesting +/obj/item/book/manual/starfruit + name = "Starfruit Drinks and Brewing" + icon = 'maplestation_modules/icons/obj/starfruitbook.dmi' + icon_state = "cookbook" + lefthand_file = 'maplestation_modules/icons/mob/inhands/starfruitbook_lhand.dmi' + righthand_file = 'maplestation_modules/icons/mob/inhands/starfruitbook_rhand.dmi' + starting_author = "His Highness, Horatio Gilidan" + starting_title = "Starfruit Drinks and Brewing" + starting_content = {" + + + + + + +

Murian Starfruit Beverage Recipes from all around the Nations of Mu, provided by the Heart of Cremona:

+ +Starfruit Soda: An alcoholic soda with a distinctly fruity taste and a common fixture in most Gilidan bars. Distinctly enjoyed by young adults and old moms alike.
+Two parts starfruit juice, two parts rum, one part cognac, one part soda water.
+ +Starfruit Lubricant: A drink commonly enjoyed by the synthetic diaspora of Mu, it's surprisingly drinkable to organics, provided you can stand the oily taste.
+One part starfruit juice, one part synthetic oil.
+ +Starlit Latte: A classic recipe from the sailors of Aquatia as a replacement to goat locker coffee, this latte doesn't actually use any dairy products. \ +The natural creaminess of starfruit juice is enough to dilute the bitterness of coffee to a pleasant sensation.
+One part starfruit juice, one part coffee.
+ +Starbeam Shake: A fruity yet aromatically deep milkshake, this one is extremely popular with children and adults alike. \ +Notably brought all of the suitors to the yard during the Celestium Succession Crisis.
+One part starfruit juice, one part vanilla dream, one part ice.
+ +Forgotten Star: An extremely rich alcoholic drink from the beaches of Agrosia, a somewhat spiced up take on the Piña Colada. It evokes memories of nice vacations.
+One part starfruit juice, one part creme de coconut, one part white russian, one part pineapple juice, one part bitters. + +Astral Flame: A strong drink with the fire of Solara. It's both warming and with a minty aftertaste to bring an edge to the flames.
+One Part starfruit juice, one part navy rum, one part lime juice, one part soda water, one part menthol. + +Space Muse: A simple yet complex drink, often seen in the hands of the intelligentsia of Equitas. Originally a poor man's drink, it's now associated with the nobility.
+One part starfruit juice, one part creme de menthe, one part vodka. + + +"} diff --git a/maplestation_modules/icons/mob/inhands/starfruitbook_lhand.dmi b/maplestation_modules/icons/mob/inhands/starfruitbook_lhand.dmi new file mode 100644 index 000000000000..bbb4a225d567 Binary files /dev/null and b/maplestation_modules/icons/mob/inhands/starfruitbook_lhand.dmi differ diff --git a/maplestation_modules/icons/mob/inhands/starfruitbook_rhand.dmi b/maplestation_modules/icons/mob/inhands/starfruitbook_rhand.dmi new file mode 100644 index 000000000000..750c7861b656 Binary files /dev/null and b/maplestation_modules/icons/mob/inhands/starfruitbook_rhand.dmi differ diff --git a/maplestation_modules/icons/obj/food/starfruit.dmi b/maplestation_modules/icons/obj/food/starfruit.dmi new file mode 100644 index 000000000000..7cab6449e699 Binary files /dev/null and b/maplestation_modules/icons/obj/food/starfruit.dmi differ diff --git a/maplestation_modules/icons/obj/hydroponics/growing.dmi b/maplestation_modules/icons/obj/hydroponics/growing.dmi new file mode 100644 index 000000000000..93658e0a1a59 Binary files /dev/null and b/maplestation_modules/icons/obj/hydroponics/growing.dmi differ diff --git a/maplestation_modules/icons/obj/hydroponics/harvest.dmi b/maplestation_modules/icons/obj/hydroponics/harvest.dmi new file mode 100644 index 000000000000..06cc9486789a Binary files /dev/null and b/maplestation_modules/icons/obj/hydroponics/harvest.dmi differ diff --git a/maplestation_modules/icons/obj/hydroponics/seeds.dmi b/maplestation_modules/icons/obj/hydroponics/seeds.dmi new file mode 100644 index 000000000000..07980e3ecdf4 Binary files /dev/null and b/maplestation_modules/icons/obj/hydroponics/seeds.dmi differ diff --git a/maplestation_modules/icons/obj/starfruitbook.dmi b/maplestation_modules/icons/obj/starfruitbook.dmi new file mode 100644 index 000000000000..9f16da9ce0a7 Binary files /dev/null and b/maplestation_modules/icons/obj/starfruitbook.dmi differ