From bb4a7a689950031480d9e61500cff2d4b72a7993 Mon Sep 17 00:00:00 2001 From: Thedragmeme <81540056+Draggeru@users.noreply.github.com> Date: Fri, 22 Nov 2024 11:09:56 -0600 Subject: [PATCH 1/3] Adds new drinks and foods, giving starfruit functionality (#4580) * Update TGS DMAPI * bonz * what the FUCK is oat meal * My hubris knows no bounds * Drinks finished * Food coded * most but not all works * there is no war in basingse * add recipie bookkk * ckeys * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: CRITAWAKETS * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: CRITAWAKETS * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: CRITAWAKETS * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: CRITAWAKETS * recipioee * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: CRITAWAKETS * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: CRITAWAKETS * Update modular_nova/modules/cargo/code/packs.dm * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * capitalization consistency and fixes * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm --------- Co-authored-by: novasector-ci[bot] <181600888+novasector-ci[bot]@users.noreply.github.com> Co-authored-by: CRITAWAKETS Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> --- .../icons/mob/inhands/starfruitbook_lhand.dmi | Bin 0 -> 332 bytes .../icons/mob/inhands/starfruitbook_rhand.dmi | Bin 0 -> 334 bytes .../master_files/icons/obj/food/starfruit.dmi | Bin 0 -> 15389 bytes .../master_files/icons/obj/starfruitbook.dmi | Bin 0 -> 458 bytes modular_nova/modules/cargo/code/packs.dm | 1 + .../modules/hydroponics/grown/starfruit.dm | 675 ++++++++++++++++++ .../donator/personal/donator_personal.dm | 171 +++++ 7 files changed, 847 insertions(+) create mode 100644 modular_nova/master_files/icons/mob/inhands/starfruitbook_lhand.dmi create mode 100644 modular_nova/master_files/icons/mob/inhands/starfruitbook_rhand.dmi create mode 100644 modular_nova/master_files/icons/obj/food/starfruit.dmi create mode 100644 modular_nova/master_files/icons/obj/starfruitbook.dmi diff --git a/modular_nova/master_files/icons/mob/inhands/starfruitbook_lhand.dmi b/modular_nova/master_files/icons/mob/inhands/starfruitbook_lhand.dmi new file mode 100644 index 0000000000000000000000000000000000000000..bbb4a225d567792b3c9141c3b31354d9174ad5fe GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|el>na*S0HU1m5|jpL(9&Sn_IL- zL|wFW%HD|y$`<*GO8Sd(+}%V?t_%OX4OGWi666=m;PC858jzD+6%tY6l3JWxlvz-c znV-kNP%$Sste~j$`na*S0Jrr=b6GP6|3-s> ai6P?~=Yh#eD-HuKWAJqKb6Mw<&;$U7Uva$v literal 0 HcmV?d00001 diff --git a/modular_nova/master_files/icons/obj/food/starfruit.dmi b/modular_nova/master_files/icons/obj/food/starfruit.dmi new file mode 100644 index 0000000000000000000000000000000000000000..7cab6449e6997a0326b0796cdf18b72db7f82d69 GIT binary patch literal 15389 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 Zrpv>8@(v~j_;0^}jD&)Cji^!3{{b=BD0%<@ literal 0 HcmV?d00001 diff --git a/modular_nova/master_files/icons/obj/starfruitbook.dmi b/modular_nova/master_files/icons/obj/starfruitbook.dmi new file mode 100644 index 0000000000000000000000000000000000000000..9f16da9ce0a74e7abf543f9e4eb578b27e8f4624 GIT binary patch literal 458 zcmV;*0X6=KP)IIB!N3 zG!=D}d=w|SDmcZzHLL&t00DGTPE!Ct=GbNc003%wR9JLGWpiV4X>fFDZ*Bkpc$`yK zaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+ zIX^!;35b=rI8!oz zlG_r4APhtaa#afg`v1S$5N+!W0biTfJ-Z8&2=Rvl0Ap23*&|S$rb#Kq0;gBeXoje| z`c4a=+rSTKBP_rjXd@6%@*?a`G`BfM`+N5&{{Zx09q+9cTs@|gkT*^QfV&5Nul!m}@h&0T|dFbbWH+g^u2EoAs#sB~S07*qoM6N<$f=r9D Axc~qF literal 0 HcmV?d00001 diff --git a/modular_nova/modules/cargo/code/packs.dm b/modular_nova/modules/cargo/code/packs.dm index 8fec2c2f507..673b8f487b1 100644 --- a/modular_nova/modules/cargo/code/packs.dm +++ b/modular_nova/modules/cargo/code/packs.dm @@ -716,4 +716,5 @@ cost = CARGO_CRATE_VALUE * 5 contains = list( /obj/item/seeds/starfruit = 2, + /obj/item/book/manual/starfruit = 1, ) diff --git a/modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm b/modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm index 163c63e3c99..66047f17feb 100644 --- a/modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm +++ b/modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm @@ -29,3 +29,678 @@ bite_consumption_mod = 2 foodtypes = FRUIT | SUGAR juice_typepath = /datum/reagent/consumable/starfruit_juice + +//Starfruit drinks +//All the drinks are very good because this shit cost 1k minimum to get the 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/reagent/consumable/ethanol/starfruit_soda //starfruit juice 2, rum 2, cognac 1, soda water 1 + name = "Stellar Twist" + description = "A drink over tired moms could hide in their thermos." + boozepwr = 35 + color = "#434294" + quality = DRINK_VERYGOOD + 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 carbination in the glass" + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "starsoda" + +/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/consumable/ethanol/synthanol = 1, + ) + mix_message = "The ingredients combine into a fizzy soda." + +/datum/reagent/consumable/ethanol/starfruit_lubricant //starfruit juice 1, Synthanol 1 + name = "Stellar Lubricant" + description = "A drink over tired moms could hide in their thermos. Now for Synths!" + boozepwr = 35 + color = "#45b33b" + quality = DRINK_VERYGOOD + 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 carination in the glass." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "starsodasynth" + +/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/reagent/consumable/starfruit_latte //starfruit juice 1, coffee 1 + name = "Starlit Latte" + description = "A subtly sweet coffee seemingly out of this world." + nutriment_factor = 8 + color = "#361329" + quality = DRINK_VERYGOOD + 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 coffe flavored with sweet starfruit juice. It takes you on a journey to a place you’ve never been, yet somehow know by heart." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "starfruit_latte" + +/datum/chemical_reaction/drink/starbeam_shake //starfruit juice 1 , vanilla dream 1 , ice 1 + 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/reagent/consumable/starbeam_shake + name = "starbeam shake" + description = "A delightful shake made with a rare starfruit." + color = "#a551be" + nutriment_factor = 0 + quality = DRINK_VERYGOOD + 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 = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "voidshake" + +/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/reagent/consumable/ethanol/forgotten_star //starfruit juice 1, creme de coconut 1, white russian 1, pineapple juice 1, bitters 1 + name = "Forgotten Star" + description = "A cosmic cry of a bygone era." + boozepwr = 55 + color = "#434294" + quality = DRINK_VERYGOOD + 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 coctail, you can almost make out a distant star system in the glass." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "forgottenstar" + +/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 into a an enticing smell" + +/datum/reagent/consumable/ethanol/astral_flame //starfruit juice 1, navy rum 1, lime juice 1, soda water 1, menthol 1 + name = "Astral Flame" + description = "Enticing flames." + boozepwr = 55 + color = "#6b3481" + quality = DRINK_VERYGOOD + 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 = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "astralflame" + +/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." + +/datum/reagent/consumable/ethanol/space_muse //starfruit juice 1, creme de menthe, 1 vodka + name = "Space Muse" + description = "A snapshot straight from your local telescope." + boozepwr = 35 + color = "#7cb1e2" + quality = DRINK_VERYGOOD + 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 coctail that draws you in with sybtle bites of mint and starfruit." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "spacemuse" + +//Starfruit dishes + +/datum/crafting_recipe/food/glazed_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/glazed_ribs + category = CAT_MEAT + +/obj/item/food/glazed_ribs + name = "starfruit glazed ribs" + desc = "Tender BBQ ribs, glazed with a sweet Starfruit sauce. Garinished with a carmalized starfruit on the side. The sweetest least vegan thing this side of the frontier." + icon = 'modular_nova/master_files/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 + +/datum/crafting_recipe/food/meatplatter + name = "BBQ Meat Platter" + reqs = list( + /obj/item/food/bbqribs, + /obj/item/food/glazed_ribs, + /obj/item/food/roasted_bell_pepper = 2, + ) + result = /obj/item/food/meatplatter + category = CAT_MEAT + +/obj/item/food/meatplatter + name = "BBQ meat platter" + desc = "An elaborate BBQ platter adorned with several BBQ favorites on this side of the galaxy. Garnished with some rosted pepper." + icon = 'modular_nova/master_files/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 + +/datum/crafting_recipe/food/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/chicken_alfredo + category = CAT_MISCFOOD + +/obj/item/food/chicken_alfredo + name = "starfruit chicken alfredo" + desc = "A chicken alfredo dish with a starfruit cream sauce. Not for the faint of heart." + icon = 'modular_nova/master_files/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 + +/datum/crafting_recipe/food/starfruitsushiroll + 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/starfruitsushiroll + category = CAT_SEAFOOD + +/obj/item/food/starfruitsushiroll + name = "starfruit sushi roll" + desc = "A roll of simple sushi with delicious starfruit sashimi. Sliceable into pieces!" + icon = 'modular_nova/master_files/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/starfruitsushiroll/make_processable() + AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/starfruitsushislice, 4, screentip_verb = "Chop") + +/obj/item/food/starfruitsushislice + name = "starfruit sushi slice" + desc = "A slice of starfruit sushi with rice, fish, and cradled in a seaweed sheat." + icon = 'modular_nova/master_files/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 + +/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 + +/obj/item/food/starfruit_sashimi + name = "starfruit sashimi" + desc = "Delicately slished sashimi made with a starfruit reduced soy sauce." + icon = 'modular_nova/master_files/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 + +/datum/crafting_recipe/food/eggplantfry + name = "Starfruit Eggplant Stir Fry" + reqs = list( + /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, + /obj/item/food/grown/eggplant = 2, + ) + result = /obj/item/food/eggplantfry + category = CAT_MISCFOOD + +/obj/item/food/eggplantfry + 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 = 'modular_nova/master_files/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, "sautaed vegetables" = 1) + foodtypes = VEGETABLES + crafting_complexity = FOOD_COMPLEXITY_3 + +/datum/crafting_recipe/food/tofubeef + name = "Starfruit Tofu Beef Ramen" + reqs = list( + /obj/item/food/tofu = 1, + /obj/item/food/meat/cutlet = 2, + /obj/item/food/grown/starfruit = 1, + /obj/item/food/spaghetti/boiledspaghetti = 1, + ) + result = /obj/item/food/tofubeef + category = CAT_MISCFOOD + +/obj/item/food/tofubeef + name = "starfruit tofu beef ramen" + desc = "A delightful ramen dish steeped in beef, tofu and starfruit. The uncanny combination of ingredients results in a suprisingly tangy dish with a subtly sweet aftertaste." + icon = 'modular_nova/master_files/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("noodles" = 2, "boiled starfruit" = 1, "sweet ramen" = 1) + foodtypes = VEGETABLES | MEAT | GRAIN + crafting_complexity = FOOD_COMPLEXITY_3 + +/datum/crafting_recipe/food/starfruitplate + name = "Starfruit Noodle Pasta" + 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/starfruitplate + category = CAT_MISCFOOD + +/obj/item/food/starfruitplate + name = "starfruit noodle pasta" + desc = "Savory boiled pasta with a rich and creamy reduced starfruit meat sauce." + icon = 'modular_nova/master_files/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("sweet spagetti" = 2, "simmered starfruit" = 1, "savory meat" = 1) + foodtypes = GRAIN | MEAT + crafting_complexity = FOOD_COMPLEXITY_3 + +/datum/crafting_recipe/food/starfruitcake + 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 + +/obj/item/food/cake/starfruit + name = "starfruit cake" + desc = "An elaborately decorated cake with a starfruit filling. Pairs well with a starlit latte." + icon = 'modular_nova/master_files/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 = 'modular_nova/master_files/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 + +/datum/reagent/consumable/starfruitjelly + 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/starfruitjelly + +/obj/item/reagent_containers/condiment/starfruitjelly + name = "starfruit jelly" + desc = "A jar of super-sweet starfruit jelly." + icon = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "spacejam" + list_reagents = list(/datum/reagent/consumable/starfruitjelly = 50) + fill_icon_thresholds = null + +/datum/crafting_recipe/bottled/starfruitjelly + name = "Starfruit Jelly" + reqs = list( + /obj/item/food/grown/starfruit = 10, + /datum/reagent/water = 25, + ) + result = /obj/item/reagent_containers/condiment/starfruitjelly + category = CAT_MISCFOOD + +/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 = 'modular_nova/master_files/icons/obj/food/starfruit.dmi' + icon_state = "macaron_4" + tastes = list("wafer" = 2, "sweet starfruit" = 2, "creamy meringue" = 3) + +/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/starfruitjelly = 5, + ) + result = /obj/item/food/cookie/macaron/starfruit + category = CAT_PASTRY + +/datum/crafting_recipe/food/starfruitcobbler + name = "Starfruit Cobbler" + reqs = list( + /obj/item/food/pastrybase = 2, + /obj/item/food/grown/starfruit = 2, + /datum/reagent/consumable/starfruitjelly = 10, + ) + result = /obj/item/food/pie/starfruitcobbler + category = CAT_PASTRY + +/obj/item/food/pie/starfruitcobbler + 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 = 'modular_nova/master_files/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 + +/datum/crafting_recipe/food/starfruit_toast + name = "Starfruit Jellied Toast" + reqs = list( + /obj/item/food/breadslice/plain = 1, + /datum/reagent/consumable/starfruitjelly = 5, + ) + result = /obj/item/food/starfruit_toast + category = CAT_BREAD + +/obj/item/food/starfruit_toast + name = "starfruit jellied toast" + desc = "A slice of toast covered with delicious starfruit jam." + icon = 'modular_nova/master_files/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 + +/datum/crafting_recipe/food/starfruitpie + name = "Starfruit Pie" + reqs = list( + /obj/item/food/pie/plain = 1, + /obj/item/food/grown/starfruit = 2, + ) + result = /obj/item/food/pie/starfruitpie + category = CAT_PASTRY + +/obj/item/food/pie/starfruitpie + name = "starfruit pie" + desc = "Deceptively simple, yet flavor intensive." + icon = 'modular_nova/master_files/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/starfruitpie + crafting_complexity = FOOD_COMPLEXITY_3 + +/obj/item/food/pieslice/starfruitpie + name = "starfruit pie slice" + desc = "Takes you on a journey though space!" + icon = 'modular_nova/master_files/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 + +/datum/crafting_recipe/food/starfruitcompote + 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/starfruitcompote + category = CAT_MISCFOOD + +/obj/item/food/starfruitcompote + name = "starfruit compote" + desc = "An irresistibly sweet dish of starfruit boiled down in cognac and sugar." + icon = 'modular_nova/master_files/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 + +/datum/crafting_recipe/food/starfruitbrulee + 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/starfruitbrulee + category = CAT_MISCFOOD + +/obj/item/food/starfruitbrulee + name = "starfruit creme brulee" + desc = "A delightful pudding dish made from primarily caramel, starfruit, and egg whites." + icon = 'modular_nova/master_files/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 + +/datum/crafting_recipe/food/starcupcake + name = "Starfruit Cupcake" + reqs = list( + /obj/item/food/pastrybase = 1, + /obj/item/food/grown/starfruit = 2 + ) + result = /obj/item/food/starcupcake + category = CAT_PASTRY + +/obj/item/food/starcupcake + name = "starfruit cupcake" + desc = "A sweet cupcake with a starfruit frosting." + icon = 'modular_nova/master_files/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 + +/obj/item/book/manual/starfruit + name = "Starfruit preperation and you!" + icon = 'modular_nova/master_files/icons/obj/starfruitbook.dmi' + icon_state = "cookbook" + lefthand_file = 'modular_nova/master_files/icons/mob/inhands/starfruitbook_lhand.dmi' + righthand_file = 'modular_nova/master_files/icons/mob/inhands/starfruitbook_rhand.dmi' + starting_author = "Artic Deep Beverage Research Division" + starting_title = "Starfruit preperation and you!" + starting_content = {" + + + + + + +

Artic Starfruit Beverage Recipies:

+ +Starfruit Soda: Two parts starfruit juice, two parts rum, one part cognac, one part soda water
+ +Starfruit Lubricant: One part starfruit juice, one part synthanol
+ +Starlit Latte: One part starfruit juice, one part coffee
+ +Starbeam Shake: One part starfruit juice, one part vanilla dream, one part ice
+ +Forgotten Star: One part starfruit juice, one part creme de coconut, one part white russian, one part pineapple juice, one part bitters + +Astral Flame: One Part Starfruit juice, one part navy rum,one part lime juice,one part soda water, one part menthol + +Space Muse: One part starfruit juice, one part creme de menthe, one part vodka + + +"} diff --git a/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm b/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm index 022890c535c..76688431b4e 100644 --- a/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm +++ b/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm @@ -91,3 +91,174 @@ name = "Holocigar" item_path = /obj/item/holocigarette/masvedishcigar // Asked it to be public, and as such has no whitelist. +<<<<<<< HEAD +======= + +/datum/loadout_item/suit/lt3_armor + name = "Silver Jacket Mk II" + item_path = /obj/item/clothing/suit/armor/skyy + ckeywhitelist = list("lt3") + restricted_roles = list(JOB_HEAD_OF_PERSONNEL, JOB_NT_REP) + +/datum/loadout_item/suit/lt3_jacket + name = "Silver Jacket" + item_path = /obj/item/clothing/suit/jacket/skyy + ckeywhitelist = list("lt3") + +/datum/loadout_item/under/miscellaneous/lt3_jeans + name = "Silver Jeans" + item_path = /obj/item/clothing/under/pants/skyy + ckeywhitelist = list("lt3") + +/datum/loadout_item/gloves/lt3_gloves + name = "Charcoal Fingerless Gloves" + item_path = /obj/item/clothing/gloves/skyy + ckeywhitelist = list("lt3") + +/datum/loadout_item/toys/switchcomb + name = "Switchblade Comb" + item_path = /obj/item/hairbrush/switchblade + ckeywhitelist = list("stonetear") + +/datum/loadout_item/suit/colorblockhoodie + name = "Color-Block Hoodie" + item_path = /obj/item/clothing/suit/hooded/colorblockhoodie + ckeywhitelist = list("lolpopomg101") + +/datum/loadout_item/inhand/officialcat + name = "Official Cat Stamp" + item_path = /obj/item/stamp/cat + ckeywhitelist = list("kathrinbailey") + +/datum/loadout_item/inhand/sqn_box + name = "A curious box of things." + item_path = /obj/item/storage/box/donator/sqn + ckeywhitelist = list("sqnztb") + +/datum/loadout_item/under/jumpsuit/noble_gambeson + name = "Noble Gambeson" + item_path = /obj/item/clothing/under/rank/civilian/chaplain/divine_archer/noble + ckeywhitelist = list("grasshand") + +/datum/loadout_item/shoes/noble_boots + name = "Noble Boots" + item_path = /obj/item/clothing/shoes/jackboots/noble + ckeywhitelist = list("grasshand") + +/datum/loadout_item/suit/nobility_dresscoat + name = "Nobility Dresscoat" + item_path = /obj/item/clothing/suit/toggle/labcoat/vic_dresscoat_donator + ckeywhitelist = list("nikotheguydude") + +/datum/loadout_item/suit/anubite_headpiece + name = "Anubite Headpiece" + item_path = /obj/item/clothing/head/anubite + ckeywhitelist = list("vexcint") + +/datum/loadout_item/under/formal/dragon_maid + name = "Dragon Maid Uniform" + item_path = /obj/item/clothing/under/costume/dragon_maid + ckeywhitelist = list("sigmaralkahest") + +/datum/loadout_item/head/catear_headphone + name = "Cat-Ear Headphones" + item_path = /obj/item/instrument/piano_synth/headphones/catear_headphone + ckeywhitelist = list("dtfe") + +/datum/loadout_item/neck/trenchcoat + name = "Secure Trenchcoat" + item_path = /obj/item/clothing/neck/trenchcoat + ckeywhitelist = list("Smol42") + +/datum/loadout_item/under/jumpsuit/old_qm_jumpskirt + name = "Old Quartermaster's Jumpskirt" + item_path = /obj/item/clothing/under/rank/cargo/qm/skirt/old + ckeywhitelist = list("jasohavents") + +/datum/loadout_item/pocket_items/toaster_implant + name = "Toaster Implant" + item_path = /obj/item/implanter/toaster + ckeywhitelist = list("jasohavents") + +/datum/loadout_item/under/miscellaneous/rem + name = "M.I.A. Limiter" + item_path = /obj/item/clothing/under/rem + ckeywhitelist = list("ignari") + +/datum/loadout_item/shoes/rem + name = "M.I.A. Heels" + item_path = /obj/item/clothing/shoes/rem_shoes + ckeywhitelist = list("ignari") + +/datum/loadout_item/under/miscellaneous/bwake + name = "Compression Bodysuit" + item_path = /obj/item/clothing/under/bwake + ckeywhitelist = list("ignari") + +/datum/loadout_item/inhand/pet/mrfluff_mothroach + name = "Mr. Fluff" + item_path = /obj/item/clothing/head/mob_holder/pet/donator/centralsmith + ckeywhitelist = list("centralsmith") + +/datum/loadout_item/under/jumpsuit/techpants + name = "Techwear Pants" + item_path = /obj/item/clothing/under/techpants + ckeywhitelist = list("alvcyktor", "snakebittenn") + +/datum/loadout_item/inhand/drop_pouch + name = "Drop Pouch" + item_path = /obj/item/storage/backpack/satchel/drop_pouch + ckeywhitelist = list("alvcyktor", "snakebittenn") + +/datum/loadout_item/inhand/melonseva + name = "Sundowner SEVA" + item_path = /obj/item/clothing/suit/hooded/seva/melon + ckeywhitelist = list("deadmonwonderland") + restricted_roles = list(JOB_SHAFT_MINER) + + +/datum/loadout_item/suit/desminus + name = "Jómsvíking Coat" + item_path = /obj/item/clothing/suit/toggle/desminus + ckeywhitelist = list("desminus", "junglerat", "deadmonwonderland") + +/datum/loadout_item/suit/desminus2 + name = "Elderwood Garment" + item_path = /obj/item/clothing/suit/toggle/desminus2 + ckeywhitelist = list("desminus", "junglerat", "deadmonwonderland") + +/datum/loadout_item/pocket_items/akarimod + name = "Akari's MOD Refitter" + item_path = /obj/item/mod/skin_applier/akari + ckeywhitelist = list("samman166", "cainedclxvi") + +/datum/loadout_item/pocket_items/mrsanderp_cookbook + name = "Riva Family Cookbook" + item_path = /obj/item/book/granter/crafting_recipe/mrsanderp_donator_cookbook + ckeywhitelist = list("mrsanderp") + +/datum/loadout_item/under/jumpsuit/half_leotard + name = "One-Sleeved Leotard" + item_path = /obj/item/clothing/under/pants/half_leotard_cosmiclaer + ckeywhitelist = list("cosmiclaer") + +/datum/loadout_item/under/jumpsuit/shendyt + name = "Shendyt" + item_path = /obj/item/clothing/under/costume/shendyt + ckeywhitelist = list("hyperhazel") + +/datum/loadout_item/pocket_items/jumperbox + name = "Jumper Conversation Kit Box" + item_path = /obj/item/mod/skin_applier/jumper + ckeywhitelist = list("bonkaitheroris") + +/datum/loadout_item/pocket_items/starfruit_seed + name = "Primidine Starfruit Seed" + item_path = /obj/item/seeds/starfruit + ckeywhitelist = list("snailomi", "thedragmeme", "DayDream21", "Sketchy_Axoltol", "Tesla825") + +/datum/loadout_item/suit/butter + name = "Butter Costume" + item_path = /obj/item/clothing/suit/costume/butter + ckeywhitelist = list("drpmstr", "pyritechimera") +>>>>>>> 1dc08386261 (Adds new drinks and foods, giving starfruit functionality (#4580)) From 3ea25ed01d9bf8bbb05272e2217494673d338f96 Mon Sep 17 00:00:00 2001 From: StealsThePRs Date: Fri, 22 Nov 2024 20:10:03 +0300 Subject: [PATCH 2/3] [MIRROR] Adds new drinks and foods, giving starfruit functionality From 01eef98bbb6c092e78c8d1dc4710a4255c81de39 Mon Sep 17 00:00:00 2001 From: Feenie <62373791+FeenieRU@users.noreply.github.com> Date: Sun, 24 Nov 2024 14:07:11 +0300 Subject: [PATCH 3/3] fix conflict --- .../donator/personal/donator_personal.dm | 171 ------------------ 1 file changed, 171 deletions(-) diff --git a/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm b/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm index 76688431b4e..022890c535c 100644 --- a/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm +++ b/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm @@ -91,174 +91,3 @@ name = "Holocigar" item_path = /obj/item/holocigarette/masvedishcigar // Asked it to be public, and as such has no whitelist. -<<<<<<< HEAD -======= - -/datum/loadout_item/suit/lt3_armor - name = "Silver Jacket Mk II" - item_path = /obj/item/clothing/suit/armor/skyy - ckeywhitelist = list("lt3") - restricted_roles = list(JOB_HEAD_OF_PERSONNEL, JOB_NT_REP) - -/datum/loadout_item/suit/lt3_jacket - name = "Silver Jacket" - item_path = /obj/item/clothing/suit/jacket/skyy - ckeywhitelist = list("lt3") - -/datum/loadout_item/under/miscellaneous/lt3_jeans - name = "Silver Jeans" - item_path = /obj/item/clothing/under/pants/skyy - ckeywhitelist = list("lt3") - -/datum/loadout_item/gloves/lt3_gloves - name = "Charcoal Fingerless Gloves" - item_path = /obj/item/clothing/gloves/skyy - ckeywhitelist = list("lt3") - -/datum/loadout_item/toys/switchcomb - name = "Switchblade Comb" - item_path = /obj/item/hairbrush/switchblade - ckeywhitelist = list("stonetear") - -/datum/loadout_item/suit/colorblockhoodie - name = "Color-Block Hoodie" - item_path = /obj/item/clothing/suit/hooded/colorblockhoodie - ckeywhitelist = list("lolpopomg101") - -/datum/loadout_item/inhand/officialcat - name = "Official Cat Stamp" - item_path = /obj/item/stamp/cat - ckeywhitelist = list("kathrinbailey") - -/datum/loadout_item/inhand/sqn_box - name = "A curious box of things." - item_path = /obj/item/storage/box/donator/sqn - ckeywhitelist = list("sqnztb") - -/datum/loadout_item/under/jumpsuit/noble_gambeson - name = "Noble Gambeson" - item_path = /obj/item/clothing/under/rank/civilian/chaplain/divine_archer/noble - ckeywhitelist = list("grasshand") - -/datum/loadout_item/shoes/noble_boots - name = "Noble Boots" - item_path = /obj/item/clothing/shoes/jackboots/noble - ckeywhitelist = list("grasshand") - -/datum/loadout_item/suit/nobility_dresscoat - name = "Nobility Dresscoat" - item_path = /obj/item/clothing/suit/toggle/labcoat/vic_dresscoat_donator - ckeywhitelist = list("nikotheguydude") - -/datum/loadout_item/suit/anubite_headpiece - name = "Anubite Headpiece" - item_path = /obj/item/clothing/head/anubite - ckeywhitelist = list("vexcint") - -/datum/loadout_item/under/formal/dragon_maid - name = "Dragon Maid Uniform" - item_path = /obj/item/clothing/under/costume/dragon_maid - ckeywhitelist = list("sigmaralkahest") - -/datum/loadout_item/head/catear_headphone - name = "Cat-Ear Headphones" - item_path = /obj/item/instrument/piano_synth/headphones/catear_headphone - ckeywhitelist = list("dtfe") - -/datum/loadout_item/neck/trenchcoat - name = "Secure Trenchcoat" - item_path = /obj/item/clothing/neck/trenchcoat - ckeywhitelist = list("Smol42") - -/datum/loadout_item/under/jumpsuit/old_qm_jumpskirt - name = "Old Quartermaster's Jumpskirt" - item_path = /obj/item/clothing/under/rank/cargo/qm/skirt/old - ckeywhitelist = list("jasohavents") - -/datum/loadout_item/pocket_items/toaster_implant - name = "Toaster Implant" - item_path = /obj/item/implanter/toaster - ckeywhitelist = list("jasohavents") - -/datum/loadout_item/under/miscellaneous/rem - name = "M.I.A. Limiter" - item_path = /obj/item/clothing/under/rem - ckeywhitelist = list("ignari") - -/datum/loadout_item/shoes/rem - name = "M.I.A. Heels" - item_path = /obj/item/clothing/shoes/rem_shoes - ckeywhitelist = list("ignari") - -/datum/loadout_item/under/miscellaneous/bwake - name = "Compression Bodysuit" - item_path = /obj/item/clothing/under/bwake - ckeywhitelist = list("ignari") - -/datum/loadout_item/inhand/pet/mrfluff_mothroach - name = "Mr. Fluff" - item_path = /obj/item/clothing/head/mob_holder/pet/donator/centralsmith - ckeywhitelist = list("centralsmith") - -/datum/loadout_item/under/jumpsuit/techpants - name = "Techwear Pants" - item_path = /obj/item/clothing/under/techpants - ckeywhitelist = list("alvcyktor", "snakebittenn") - -/datum/loadout_item/inhand/drop_pouch - name = "Drop Pouch" - item_path = /obj/item/storage/backpack/satchel/drop_pouch - ckeywhitelist = list("alvcyktor", "snakebittenn") - -/datum/loadout_item/inhand/melonseva - name = "Sundowner SEVA" - item_path = /obj/item/clothing/suit/hooded/seva/melon - ckeywhitelist = list("deadmonwonderland") - restricted_roles = list(JOB_SHAFT_MINER) - - -/datum/loadout_item/suit/desminus - name = "Jómsvíking Coat" - item_path = /obj/item/clothing/suit/toggle/desminus - ckeywhitelist = list("desminus", "junglerat", "deadmonwonderland") - -/datum/loadout_item/suit/desminus2 - name = "Elderwood Garment" - item_path = /obj/item/clothing/suit/toggle/desminus2 - ckeywhitelist = list("desminus", "junglerat", "deadmonwonderland") - -/datum/loadout_item/pocket_items/akarimod - name = "Akari's MOD Refitter" - item_path = /obj/item/mod/skin_applier/akari - ckeywhitelist = list("samman166", "cainedclxvi") - -/datum/loadout_item/pocket_items/mrsanderp_cookbook - name = "Riva Family Cookbook" - item_path = /obj/item/book/granter/crafting_recipe/mrsanderp_donator_cookbook - ckeywhitelist = list("mrsanderp") - -/datum/loadout_item/under/jumpsuit/half_leotard - name = "One-Sleeved Leotard" - item_path = /obj/item/clothing/under/pants/half_leotard_cosmiclaer - ckeywhitelist = list("cosmiclaer") - -/datum/loadout_item/under/jumpsuit/shendyt - name = "Shendyt" - item_path = /obj/item/clothing/under/costume/shendyt - ckeywhitelist = list("hyperhazel") - -/datum/loadout_item/pocket_items/jumperbox - name = "Jumper Conversation Kit Box" - item_path = /obj/item/mod/skin_applier/jumper - ckeywhitelist = list("bonkaitheroris") - -/datum/loadout_item/pocket_items/starfruit_seed - name = "Primidine Starfruit Seed" - item_path = /obj/item/seeds/starfruit - ckeywhitelist = list("snailomi", "thedragmeme", "DayDream21", "Sketchy_Axoltol", "Tesla825") - -/datum/loadout_item/suit/butter - name = "Butter Costume" - item_path = /obj/item/clothing/suit/costume/butter - ckeywhitelist = list("drpmstr", "pyritechimera") ->>>>>>> 1dc08386261 (Adds new drinks and foods, giving starfruit functionality (#4580))