From d18d89ccb3c848bd36a7fb0c2cde505def7c037e Mon Sep 17 00:00:00 2001 From: k4rlox Date: Tue, 3 Sep 2024 16:30:46 +0300 Subject: [PATCH 1/3] wawawa --- .../recipes/tablecraft/recipes_misc.dm | 45 +++++++++++++++++ .../recipes/tablecraft/recipes_wastefood.dm | 49 ------------------- 2 files changed, 45 insertions(+), 49 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 497347d17cc..29cb0585b52 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -331,3 +331,48 @@ */ +/datum/crafting_recipe/food/sunset/happyshark/jerky + name = "Wasteland Mesquite Smoked Jerky" + time = 40 + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/cutlet = 1, + /obj/item/reagent_containers/food/snacks/grown/coyotetobacco = 1, + /obj/item/reagent_containers/food/snacks/grown/mesquite =1, + /datum/reagent/consumable/sodiumchloride = 1 + ) + result = /obj/item/reagent_containers/food/snacks/sunset/happyshark/jerky + subcategory = CAT_MISCFOOD + + +/datum/crafting_recipe/food/sunset/happyshark/candybar + name = "Trail Goers Sweet Bar" + time = 40 + reqs = list( + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + /obj/item/reagent_containers/food/snacks/grown/pinyon = 1, + /obj/item/reagent_containers/food/snacks/grown/yucca = 2 + ) + result = /obj/item/reagent_containers/food/snacks/sunset/happyshark/candybar + subcategory = CAT_MISCFOOD + + +/datum/crafting_recipe/food/sunset/happyshark/bittercola + name = "Soothing Soda" + time = 40 + reqs = list( + /datum/reagent/consumable/nuka_cola = 10, + /obj/item/reagent_containers/food/snacks/grown/broc = 1, + /obj/item/reagent_containers/food/snacks/grown/xander = 1, + /datum/reagent/consumable/sodawater = 5, + /datum/reagent/consumable/sugar = 5 + ) + result = /obj/item/reagent_containers/food/drinks/sunset/happyshark/bittercola + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/sunset/happyshark/bittercola/alt + reqs = list( + /datum/reagent/consumable/nuka_cola = 10, + /datum/reagent/medicine/healing_powder = 10, + /datum/reagent/consumable/sodawater = 5, + /datum/reagent/consumable/sugar = 5 + ) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_wastefood.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_wastefood.dm index 7fa832a19b0..b1bacd5c3c6 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_wastefood.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_wastefood.dm @@ -103,55 +103,6 @@ // SUNSET EDIT //// HAPPY SHARKY LOCKED FLUFF RECIPES -/datum/crafting_recipe/food/sunset/happyshark/jerky - name = "Happy Sharky Jerky" - time = 40 - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/cutlet = 1, - /obj/item/reagent_containers/food/snacks/grown/coyotetobacco = 1, - /obj/item/reagent_containers/food/snacks/grown/mesquite =1, - /datum/reagent/consumable/sodiumchloride = 1 - ) - result = /obj/item/reagent_containers/food/snacks/sunset/happyshark/jerky - subcategory = CAT_MISCFOOD - always_available = FALSE - - -/datum/crafting_recipe/food/sunset/happyshark/candybar - name = "Happy Sharky Sweet Bar" - time = 40 - reqs = list( - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - /obj/item/reagent_containers/food/snacks/grown/pinyon = 1, - /obj/item/reagent_containers/food/snacks/grown/yucca = 2 - ) - result = /obj/item/reagent_containers/food/snacks/sunset/happyshark/candybar - subcategory = CAT_MISCFOOD - always_available = FALSE - - -/datum/crafting_recipe/food/sunset/happyshark/bittercola - name = "Happy Sharky Bittercola" - time = 40 - reqs = list( - /datum/reagent/consumable/nuka_cola = 10, - /obj/item/reagent_containers/food/snacks/grown/broc = 1, - /obj/item/reagent_containers/food/snacks/grown/xander = 1, - /datum/reagent/consumable/sodawater = 5, - /datum/reagent/consumable/sugar = 5 - ) - result = /obj/item/reagent_containers/food/drinks/sunset/happyshark/bittercola - subcategory = CAT_MISCFOOD - always_available = FALSE - -/datum/crafting_recipe/food/sunset/happyshark/bittercola/alt - reqs = list( - /datum/reagent/consumable/nuka_cola = 10, - /datum/reagent/medicine/healing_powder = 10, - /datum/reagent/consumable/sodawater = 5, - /datum/reagent/consumable/sugar = 5 - ) - /* awaiting assets + code for completion /datum/crafting_recipe/food/pemmican From 47e12de957df11a312626cfe89e7da9eedb34d33 Mon Sep 17 00:00:00 2001 From: k4rlox Date: Tue, 3 Sep 2024 16:52:54 +0300 Subject: [PATCH 2/3] sodafix --- fallout/code/modules/client/loadout/donor.dm | 3 ++- fallout/code/modules/fluff/happyshark_granter.dm | 3 ++- fallout/code/modules/fluff/happyshark_recipe.dm | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fallout/code/modules/client/loadout/donor.dm b/fallout/code/modules/client/loadout/donor.dm index eaa9eb59a50..0233c23fc20 100644 --- a/fallout/code/modules/client/loadout/donor.dm +++ b/fallout/code/modules/client/loadout/donor.dm @@ -22,10 +22,11 @@ ckeywhitelist = list("midgetdragon") // SUNSET EDIT - +/* /datum/gear/donator/exoticjazz name = "Happy Sharky Company Cuisine Book" slot = SLOT_IN_BACKPACK path = /obj/item/book/granter/crafting_recipe/happysharky ckeywhitelist = list ("ExoticJazz") cost = 0 +*/ diff --git a/fallout/code/modules/fluff/happyshark_granter.dm b/fallout/code/modules/fluff/happyshark_granter.dm index 1014ea0fb67..ffd154c7c37 100644 --- a/fallout/code/modules/fluff/happyshark_granter.dm +++ b/fallout/code/modules/fluff/happyshark_granter.dm @@ -3,7 +3,8 @@ /obj/item/book/granter/crafting_recipe/happysharky name = "Happy Sharky Co. Cuisine" desc = "A cook book that teaches you the ways of Happy Sharky Co." - crafting_recipe_types = list(/datum/crafting_recipe/food/sunset/happyshark/jerky, /datum/crafting_recipe/food/sunset/happyshark/candybar, /datum/crafting_recipe/food/sunset/happyshark/bittercola) + crafting_recipe_types = list() icon_state = "book1" oneuse = TRUE remarks = list("The secret ingredients are revealed to you.") + diff --git a/fallout/code/modules/fluff/happyshark_recipe.dm b/fallout/code/modules/fluff/happyshark_recipe.dm index f03fdac3fab..062222c9846 100644 --- a/fallout/code/modules/fluff/happyshark_recipe.dm +++ b/fallout/code/modules/fluff/happyshark_recipe.dm @@ -7,7 +7,7 @@ //Happy Sharky Bittercola: 2 parts Bitter Drink, 2 Parts Nuka Cola, 1 Part Soda water, 1 part sugar //-- - +/* /datum/crafting_recipe/food/sunset/happyshark/jerky name = "Wasteland Mesquite Smoked Jerky" time = 40 @@ -56,3 +56,4 @@ /datum/reagent/consumable/sodawater = 5, /datum/reagent/consumable/sugar = 5 ) +*/ From fcd19a8583de5f78d839bf47ff5d396e8e0fdb36 Mon Sep 17 00:00:00 2001 From: k4rlox Date: Tue, 3 Sep 2024 16:53:07 +0300 Subject: [PATCH 3/3] sodafix2 --- .../modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 29cb0585b52..d97ac592d27 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -368,7 +368,7 @@ ) result = /obj/item/reagent_containers/food/drinks/sunset/happyshark/bittercola subcategory = CAT_MISCFOOD - +/* /datum/crafting_recipe/food/sunset/happyshark/bittercola/alt reqs = list( /datum/reagent/consumable/nuka_cola = 10, @@ -376,3 +376,4 @@ /datum/reagent/consumable/sodawater = 5, /datum/reagent/consumable/sugar = 5 ) +*/