Makes the Happyshark donator recipes avaible for everyone (#208)

Foundation-19 · Sep 8, 2024 · 400e133 · 400e133
1 parent d4cfbc6
commit 400e133
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 52 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
@@ -331,3 +331,49 @@
 */
 
 
+/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
@@ -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

diff --git 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
@@ -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
@@ -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
 	)
+*/