cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 15:47:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] More Food Sorting (#5236)

Browse Source 
* More Food Sorting (#58649)

* Organizing

Moves the following:
Enchiladas, from MEAT, to MEXICAN
Meat Bun, from PASTRIES, to MEAT
Hotdog, from PASTRIES, to SANDWICHES
Melon Bowl, from MISC, to SALADS
Oatmeal, from SALAD, to SOUPS (And changes the object path to match.)

Does the traitorous task of adding the GRAIN tag to Enchiladas. May god have mercy on my soul.

* Adds a trailing new line

Co-authored-by: Winter Flare <7543955+Owai-Seek@ users.noreply.github.com>

* More Food Sorting

Co-authored-by: Winter Flare <7543955+Owai-Seek@users.noreply.github.com>
Co-authored-by: Winter Flare <7543955+Owai-Seek@ users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-04-27 00:56:40 +01:00
committed by GitHub
co-authored by Winter Flare
parent 07be2a3adc
commit 896c19face
13 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/food/meat.dm
+10 -10
View File
@@ -326,6 +326,16 @@
w_class = WEIGHT_CLASS_SMALL
burns_on_grill = TRUE
/obj/item/food/meatbun
name = "meat bun"
desc = "Has the potential to not be Dog."
icon_state = "meatbun"
food_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("bun" = 3, "meat" = 2)
foodtypes = GRAIN | MEAT | VEGETABLES
w_class = WEIGHT_CLASS_SMALL
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/monkeycube
name = "monkey cube"
desc = "Just add water!"
@@ -404,16 +414,6 @@
tastes = list("buzzing" = 1, "honey" = 1, "regret" = 1)
spawned_mob = /mob/living/simple_animal/hostile/poison/bees
/obj/item/food/enchiladas
name = "enchiladas"
desc = "Viva La Mexico!"
icon_state = "enchiladas"
bite_consumption = 4
food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/capsaicin = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1)
foodtypes = MEAT
w_class = WEIGHT_CLASS_SMALL
/obj/item/food/stewedsoymeat
name = "stewed soy meat"
desc = "Even non-vegetarians will LOVE this!"
code/game/objects/items/food/mexican.dm
+10
View File
@@ -96,6 +96,16 @@
foodtypes = MEAT | DAIRY | GRAIN
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/enchiladas
name = "enchiladas"
desc = "Viva La Mexico!"
icon_state = "enchiladas"
bite_consumption = 4
food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/capsaicin = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1)
foodtypes = MEAT | GRAIN
w_class = WEIGHT_CLASS_SMALL
/obj/item/food/stuffedlegion
name = "stuffed legion"
desc = "The former skull of a damned human, filled with goliath meat. It has a decorative lava pool made of ketchup and hotsauce."
code/game/objects/items/food/pastries.dm
-24
View File
@@ -617,30 +617,6 @@
foodtypes = GRAIN
w_class = WEIGHT_CLASS_TINY
/obj/item/food/hotdog
name = "hotdog"
desc = "Fresh footlong ready to go down on."
icon_state = "hotdog"
bite_consumption = 3
food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/consumable/ketchup = 3, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("bun" = 3, "meat" = 2)
foodtypes = GRAIN | MEAT | VEGETABLES
w_class = WEIGHT_CLASS_SMALL
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/hotdog/debug
eat_time = 0
/obj/item/food/meatbun
name = "meat bun"
desc = "Has the potential to not be Dog."
icon_state = "meatbun"
food_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("bun" = 3, "meat" = 2)
foodtypes = GRAIN | MEAT | VEGETABLES
w_class = WEIGHT_CLASS_SMALL
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/khachapuri
name = "khachapuri"
desc = "Bread with egg and cheese?"
code/game/objects/items/food/salad.dm
-8
View File
@@ -35,14 +35,6 @@
tastes = list("leaves" = 1, "potato" = 1, "meat" = 1, "valids" = 1)
foodtypes = VEGETABLES | MEAT | FRIED | JUNKFOOD | FRUIT
/obj/item/food/salad/oatmeal
name = "oatmeal"
desc = "A nice bowl of oatmeal."
icon_state = "oatmeal"
food_reagents = list(/datum/reagent/consumable/nutriment = 11, /datum/reagent/consumable/milk = 10, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("oats" = 1, "milk" = 1)
foodtypes = DAIRY | GRAIN | BREAKFAST
/obj/item/food/salad/fruit
name = "fruit salad"
desc = "Your standard fruit salad."
code/game/objects/items/food/sandwichtoast.dm
+14
View File
@@ -104,3 +104,17 @@
tastes = list("bread" = 2)
foodtypes = GRAIN
w_class = WEIGHT_CLASS_SMALL
/obj/item/food/hotdog
name = "hotdog"
desc = "Fresh footlong ready to go down on."
icon_state = "hotdog"
bite_consumption = 3
food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/consumable/ketchup = 3, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("bun" = 3, "meat" = 2)
foodtypes = GRAIN | MEAT | VEGETABLES
w_class = WEIGHT_CLASS_SMALL
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/hotdog/debug
eat_time = 0
code/game/objects/items/food/soup.dm
+9
View File
@@ -216,6 +216,7 @@
tastes = list("sweet potato" = 1)
foodtypes = VEGETABLES | SUGAR
venue_value = FOOD_PRICE_NORMAL
/obj/item/food/soup/beet/red
name = "red beet soup"
desc = "Quite a delicacy."
@@ -279,3 +280,11 @@
tastes = list("chicken" = 2, "creamy curry" = 4, "earthy heat" = 1)
foodtypes = VEGETABLES | MEAT | DAIRY
venue_value = FOOD_PRICE_NORMAL
/obj/item/food/soup/oatmeal
name = "oatmeal"
desc = "A nice bowl of oatmeal."
icon_state = "oatmeal"
food_reagents = list(/datum/reagent/consumable/nutriment = 11, /datum/reagent/consumable/milk = 10, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("oats" = 1, "milk" = 1)
foodtypes = DAIRY | GRAIN | BREAKFAST
code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+11 -10
View File
@@ -135,16 +135,6 @@
result = /obj/item/food/bearsteak
subcategory = CAT_MEAT
/datum/crafting_recipe/food/enchiladas
name = "Enchiladas"
reqs = list(
/obj/item/food/meat/cutlet = 2,
/obj/item/food/grown/chili = 2,
/obj/item/food/tortilla = 2
)
result = /obj/item/food/enchiladas
subcategory = CAT_MEAT
/datum/crafting_recipe/food/stewedsoymeat
name = "Stewed soymeat"
reqs = list(
@@ -182,6 +172,17 @@
result = /obj/item/food/rawkhinkali
subcategory = CAT_MEAT
/datum/crafting_recipe/food/meatbun
name = "Meat bun"
reqs = list(
/datum/reagent/consumable/soysauce = 5,
/obj/item/food/bun = 1,
/obj/item/food/meatball = 1,
/obj/item/food/grown/cabbage = 1
)
result = /obj/item/food/meatbun
subcategory = CAT_MEAT
/datum/crafting_recipe/food/pigblanket
name = "Pig in a Blanket"
reqs = list(
code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm
+10
View File
@@ -92,6 +92,16 @@
result = /obj/item/food/taco/plain
subcategory = CAT_MEXICAN
/datum/crafting_recipe/food/enchiladas
name = "Enchiladas"
reqs = list(
/obj/item/food/meat/cutlet = 2,
/obj/item/food/grown/chili = 2,
/obj/item/food/tortilla = 2
)
result = /obj/item/food/enchiladas
subcategory = CAT_MEXICAN
/datum/crafting_recipe/food/stuffedlegion
name = "Stuffed legion"
time = 40
code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
-13
View File
@@ -86,19 +86,6 @@
result = /obj/item/food/eggplantparm
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/melonfruitbowl
name ="Melon fruit bowl"
reqs = list(
/obj/item/food/grown/watermelon = 1,
/obj/item/food/grown/apple = 1,
/obj/item/food/grown/citrus/orange = 1,
/obj/item/food/grown/citrus/lemon = 1,
/obj/item/food/grown/banana = 1,
/obj/item/food/grown/ambrosia = 1
)
result = /obj/item/food/melonfruitbowl
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/melonkeg
name ="Melon keg"
reqs = list(
code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
-20
View File
@@ -445,26 +445,6 @@
////////////////////////////////////////////OTHER////////////////////////////////////////////
/datum/crafting_recipe/food/hotdog
name = "Hot dog"
reqs = list(
/datum/reagent/consumable/ketchup = 5,
/obj/item/food/bun = 1,
/obj/item/food/sausage = 1
)
result = /obj/item/food/hotdog
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/meatbun
name = "Meat bun"
reqs = list(
/datum/reagent/consumable/soysauce = 5,
/obj/item/food/bun = 1,
/obj/item/food/meatball = 1,
/obj/item/food/grown/cabbage = 1
)
result = /obj/item/food/meatbun
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/khachapuri
name = "Khachapuri"
code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
+9 -6
View File
@@ -47,14 +47,17 @@
result = /obj/item/food/soup/monkeysdelight
subcategory = CAT_SALAD
/datum/crafting_recipe/food/oatmeal
name = "Oatmeal"
/datum/crafting_recipe/food/melonfruitbowl
name ="Melon fruit bowl"
reqs = list(
/datum/reagent/consumable/milk = 10,
/obj/item/reagent_containers/glass/bowl = 1,
/obj/item/food/grown/oat = 1
/obj/item/food/grown/watermelon = 1,
/obj/item/food/grown/apple = 1,
/obj/item/food/grown/citrus/orange = 1,
/obj/item/food/grown/citrus/lemon = 1,
/obj/item/food/grown/banana = 1,
/obj/item/food/grown/ambrosia = 1
)
result = /obj/item/food/salad/oatmeal
result = /obj/item/food/melonfruitbowl
subcategory = CAT_SALAD
/datum/crafting_recipe/food/fruitsalad
code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
+9 -1
View File
@@ -52,5 +52,13 @@
result = /obj/item/food/notasandwich
subcategory = CAT_SANDWICH
/datum/crafting_recipe/food/hotdog
name = "Hot dog"
reqs = list(
/datum/reagent/consumable/ketchup = 5,
/obj/item/food/bun = 1,
/obj/item/food/sausage = 1
)
result = /obj/item/food/hotdog
subcategory = CAT_SANDWICH
code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
+10
View File
@@ -319,3 +319,13 @@
)
result = /obj/item/food/soup/indian_curry
subcategory = CAT_SOUP
/datum/crafting_recipe/food/oatmeal
name = "Oatmeal"
reqs = list(
/datum/reagent/consumable/milk = 10,
/obj/item/reagent_containers/glass/bowl = 1,
/obj/item/food/grown/oat = 1
)
result = /obj/item/food/soup/oatmeal
subcategory = CAT_SOUP