Merge pull request #35018 from DaxDupont/rice-pudding

Rice (pudding) is no longer a salad.
This commit is contained in:
vuonojenmustaturska
2018-01-28 19:33:02 +02:00
committed by CitadelStationBot
parent a8b4b1eb29
commit f005e65ab0
4 changed files with 31 additions and 31 deletions
@@ -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
@@ -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
@@ -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
@@ -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