Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Makes the Happyshark donator recipes avaible for everyone #208

Merged
merged 5 commits into from
Sep 8, 2024
Merged

Makes the Happyshark donator recipes avaible for everyone #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d18d89c
wawawa
K4rlox Sep 3, 2024
47e12de
sodafix
K4rlox Sep 3, 2024
fcd19a8
sodafix2
K4rlox Sep 3, 2024
9d98bea
Merge branch 'master' into donator
xTrainx Sep 5, 2024
9822c1e
Merge branch 'master' into donator
xTrainx Sep 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
*/
49 changes: 0 additions & 49 deletions code/modules/food_and_drinks/recipes/tablecraft/recipes_wastefood.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion fallout/code/modules/client/loadout/donor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
3 changes: 2 additions & 1 deletion fallout/code/modules/fluff/happyshark_granter.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.")

3 changes: 2 additions & 1 deletion fallout/code/modules/fluff/happyshark_recipe.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -56,3 +56,4 @@
/datum/reagent/consumable/sodawater = 5,
/datum/reagent/consumable/sugar = 5
)
*/
Loading