shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5151 from Citadel-Station-13/upstream-merge-35018

Browse Source 
[MIRROR] Rice (pudding) is no longer a salad.
This commit is contained in:
LetterJay
2018-01-28 15:16:52 -06:00
committed by GitHub
parent a05921f657 b967511ac8
commit b690ac4af1
4 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm
+11
View File
@@ -40,3 +40,14 @@
)
result = /obj/item/reagent_containers/food/snacks/benedict
subcategory = CAT_EGG
/datum/crafting_recipe/food/eggbowl
name = "Egg bowl"
reqs = list(
/obj/item/reagent_containers/food/snacks/salad/boiledrice = 1,
/obj/item/reagent_containers/food/snacks/boiledegg = 1,
/obj/item/reagent_containers/food/snacks/grown/carrot = 1,
/obj/item/reagent_containers/food/snacks/grown/corn = 1
)
result = /obj/item/reagent_containers/food/snacks/salad/eggbowl
subcategory = CAT_EGG
code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+10 -1
View File
@@ -187,4 +187,13 @@
/obj/item/reagent_containers/food/snacks/deadmouse = 2
)
result = /obj/item/reagent_containers/food/snacks/kebab/rat/double
category = CAT_MEAT
category = CAT_MEAT
/datum/crafting_recipe/food/ricepork
name = "Rice and pork"
reqs = list(
/obj/item/reagent_containers/food/snacks/salad/boiledrice = 1,
/obj/item/reagent_containers/food/snacks/meat/cutlet = 2
)
result = /obj/item/reagent_containers/food/snacks/salad/ricepork
subcategory = CAT_MEAT
code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+10
View File
@@ -335,3 +335,13 @@
)
result = /obj/item/reagent_containers/food/snacks/branrequests
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/ricepudding
name = "Rice pudding"
reqs = list(
/datum/reagent/consumable/milk = 5,
/datum/reagent/consumable/sugar = 5,
/obj/item/reagent_containers/food/snacks/salad/boiledrice = 1
)
result = /obj/item/reagent_containers/food/snacks/salad/ricepudding
subcategory = CAT_MISCFOOD
code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
-30
View File
@@ -94,33 +94,3 @@
)
result = /obj/item/reagent_containers/food/snacks/salad/citrusdelight
subcategory = CAT_SALAD
/datum/crafting_recipe/food/ricepork
name = "Rice and pork"
reqs = list(
/obj/item/reagent_containers/food/snacks/salad/boiledrice = 1,
/obj/item/reagent_containers/food/snacks/meat/cutlet = 2
)
result = /obj/item/reagent_containers/food/snacks/salad/ricepork
subcategory = CAT_SALAD
/datum/crafting_recipe/food/eggbowl
name = "Egg bowl"
reqs = list(
/obj/item/reagent_containers/food/snacks/salad/boiledrice = 1,
/obj/item/reagent_containers/food/snacks/boiledegg = 1,
/obj/item/reagent_containers/food/snacks/grown/carrot = 1,
/obj/item/reagent_containers/food/snacks/grown/corn = 1
)
result = /obj/item/reagent_containers/food/snacks/salad/eggbowl
subcategory = CAT_SALAD
/datum/crafting_recipe/food/ricepudding
name = "Rice pudding"
reqs = list(
/datum/reagent/consumable/milk = 5,
/datum/reagent/consumable/sugar = 5,
/obj/item/reagent_containers/food/snacks/salad/boiledrice = 1
)
result = /obj/item/reagent_containers/food/snacks/salad/ricepudding
subcategory = CAT_SALAD