cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6803 from Schnayy/CookingUpdate1

Browse Source 
Cooking adjustments
This commit is contained in:
Atermonera
2020-03-10 15:40:04 -07:00
committed by VirgoBot
parent e1afdafafa
commit d39b10b144
7 changed files with 53 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
code/modules/food/food/condiment.dm
View File

@@ -98,6 +98,21 @@
name = "Sugar"
desc = "Tastey space sugar!"
center_of_mass = list("x"=16, "y"=6)
if("peanutbutter")
name = "Peanut Butter"
desc = "A jar of smooth peanut butter."
icon_state = "peanutbutter"
center_of_mass = list("x"=16, "y"=6)
if("mayo")
name = "Mayonnaise"
desc = "A jar of mayonnaise!"
icon_state = "mayo"
center_of_mass = list("x"=16, "y"=6)
if("yeast")
name = "Yeast"
desc = "This is what you use to make bread fluffy."
icon_state = "yeast"
center_of_mass = list("x"=16, "y"=6)
else
name = "Misc Condiment Bottle"
if (reagents.reagent_list.len==1)
@@ -134,6 +149,9 @@
. = ..()
reagents.add_reagent("capsaicin", 50)
/obj/item/weapon/reagent_containers/food/condiment/cornoil
name = "Corn Oil"
/obj/item/weapon/reagent_containers/food/condiment/cornoil/Initialize()
. = ..()
reagents.add_reagent("cornoil", 50)
@@ -146,6 +164,13 @@
. = ..()
reagents.add_reagent("soysauce", 50)
/obj/item/weapon/reagent_containers/food/condiment/yeast
name = "Yeast"
/obj/item/weapon/reagent_containers/food/condiment/yeast/Initialize()
. = ..()
reagents.add_reagent("yeast", 50)
/obj/item/weapon/reagent_containers/food/condiment/small
possible_transfer_amounts = list(1,20)
amount_per_transfer_from_this = 1
@@ -389,4 +414,4 @@
/obj/item/weapon/reagent_containers/food/condiment/flour/Initialize()
. = ..()
reagents.add_reagent("flour", 30)
randpixel_xy()
randpixel_xy()

10
code/modules/food/recipes_microwave.dm
View File

@@ -611,7 +611,7 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/monkeysdelight
/datum/recipe/microwave/baguette
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "yeast" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/dough,
/obj/item/weapon/reagent_containers/food/snacks/dough,
@@ -619,7 +619,7 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/baguette
/datum/recipe/microwave/croissant
reagents = list("sodiumchloride" = 1, "water" = 5, "milk" = 5)
reagents = list("sodiumchloride" = 1, "water" = 5, "milk" = 5, "yeast" = 5)
items = list(/obj/item/weapon/reagent_containers/food/snacks/dough)
result = /obj/item/weapon/reagent_containers/food/snacks/croissant
@@ -631,10 +631,8 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/fishandchips
/datum/recipe/microwave/bread
items = list(
/obj/item/weapon/reagent_containers/food/snacks/dough,
/obj/item/weapon/reagent_containers/food/snacks/egg
)
reagents = list("yeast" = 5)
items = list(/obj/item/weapon/reagent_containers/food/snacks/dough)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread
/datum/recipe/microwave/sandwich