Merge pull request #12388 from GhostActual/Recipe-fix

Recipe Fixes
This commit is contained in:
Casey
2022-03-07 03:17:28 -05:00
committed by CHOMPStation2
parent 4b39e66d22
commit 778a42866e
6 changed files with 24 additions and 15 deletions

View File

@@ -1600,16 +1600,6 @@
nutriment_desc = list("noodles" = 2)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/fortunecookie
name = "Fortune cookie"
desc = "A true prophecy in each cookie!"
icon_state = "fortune_cookie"
filling_color = "#E8E79E"
center_of_mass = list("x"=15, "y"=14)
nutriment_amt = 3
nutriment_desc = list("fortune cookie" = 2)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/badrecipe
name = "Burned mess"
desc = "Someone should be demoted from chef for this."
@@ -4230,6 +4220,15 @@
. = ..()
reagents.add_reagent("bean_protein", 6)
/obj/item/weapon/reagent_containers/food/snacks/cookie
name = "chocolate chip cookie"
desc = "Just like your mother used to make."
filling_color = "#DBC94F"
icon_state = "cookie"
nutriment_amt = 5
nutriment_desc = list("sweetness" = 2, "cookie" = 1, "chocolate" = 2)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/sugarcookie
name = "sugar cookie"
desc = "Just like your little sister used to make."
@@ -4239,6 +4238,16 @@
nutriment_desc = list("sweetness" = 4, "cookie" = 1)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/fortunecookie
name = "Fortune cookie"
desc = "A true prophecy in each cookie!"
icon_state = "fortune_cookie"
filling_color = "#E8E79E"
center_of_mass = list("x"=15, "y"=14)
nutriment_amt = 3
nutriment_desc = list("fortune cookie" = 2)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/berrymuffin
name = "berry muffin"
desc = "A delicious and spongy little cake, with berries."

View File

@@ -631,11 +631,11 @@
/obj/item/weapon/reagent_containers/food/snacks/grub_pink
name = "pink candy grub"
desc = "A thoroughly candied grub, it smells of raspberry."
desc = "A thoroughly candied grub, it smells of cherry."
icon = 'icons/obj/food_vr.dmi'
icon_state = "grub_pink"
nutriment_amt = 5
nutriment_desc = list("raspberry" = 4, "goo" = 1)
nutriment_desc = list("cherry" = 4, "goo" = 1)
/obj/item/weapon/reagent_containers/food/snacks/grub_pink/Initialize()
. = ..()

View File

@@ -160,7 +160,7 @@
result = /obj/item/weapon/storage/box/wings/bucket
/datum/recipe/grub_pink
fruit = list("cherry" = 1)
fruit = list("cherries" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/grub
)

View File

@@ -299,7 +299,7 @@
/obj/item/weapon/reagent_containers/food/snacks/dough,
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
)
result = /obj/item/weapon/reagent_containers/food/snacks/cookiesnack
result = /obj/item/weapon/reagent_containers/food/snacks/cookie
result_quantity = 4
reagent_mix = RECIPE_REAGENT_REPLACE
@@ -319,7 +319,6 @@
result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel
result_quantity = 2
/datum/recipe/cracker
appliance = OVEN
reagents = list("sodiumchloride" = 1)

View File

@@ -67,6 +67,7 @@
id = "cookingoilpeanut"
result = "cookingoil"
required_reagents = list("peanutoil" = 10)
inhibitors = list("sugar" = 1, "sodiumchloride" = 1)
catalysts = list("enzyme" = 5)
result_amount = 10

Binary file not shown.

Before

Width:  |  Height:  |  Size: 205 KiB

After

Width:  |  Height:  |  Size: 205 KiB