Skip to content

Commit

Permalink
[NO GBP] Adds complexity to foods missing it (tgstation#78546)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

My foods in my last food update were missing the new complexity factor
for some reason. This is just adding that.

## Why It's Good For The Game

More consistency with foods!

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
fix: Added complexity factors to foods that were missing them.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
MidoriWroth authored Sep 27, 2023
1 parent d24cd6e commit 2aaa180
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 0 deletions.
1 change: 1 addition & 0 deletions code/game/objects/items/food/burgers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -688,3 +688,4 @@
tastes = list("juicy meat" = 4, "BBQ sauce" = 3, "onions" = 2, "bun" = 2)
foodtypes = GRAIN | MEAT | VEGETABLES
venue_value = FOOD_PRICE_NORMAL
crafting_complexity = FOOD_COMPLEXITY_3
2 changes: 2 additions & 0 deletions code/game/objects/items/food/cake.dm
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,7 @@
tastes = list("cake" = 2, "cream" = 3, "pineapple" = 4)
foodtypes = GRAIN | DAIRY | SUGAR | FRUIT | PINEAPPLE
slice_type = /obj/item/food/cakeslice/pineapple_cream_cake
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/cakeslice/pineapple_cream_cake
name = "pineapple cream cake slice"
Expand All @@ -702,3 +703,4 @@
)
tastes = list("cake" = 2, "cream" = 3, "pineapple" = 4)
foodtypes = GRAIN | DAIRY | SUGAR | FRUIT | PINEAPPLE
crafting_complexity = FOOD_COMPLEXITY_3
6 changes: 6 additions & 0 deletions code/game/objects/items/food/meatdish.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1017,6 +1017,7 @@
)
tastes = list("meat" = 5, "savory sauce" = 4, "tangy pineapple" = 3, "pepper" = 2)
foodtypes = MEAT | VEGETABLES | FRUIT | PINEAPPLE
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/kebab/pineapple_skewer
name = "pineapple skewer"
Expand All @@ -1029,6 +1030,7 @@
)
tastes = list("juicy meat" = 4, "pineapple" = 3)
foodtypes = MEAT | FRUIT | PINEAPPLE
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/futomaki_sushi_roll
name = "futomaki sushi roll"
Expand All @@ -1042,6 +1044,7 @@
tastes = list("boiled rice" = 4, "fish" = 5, "egg" = 3, "dried seaweed" = 2, "cucumber" = 2)
foodtypes = VEGETABLES | SEAFOOD
w_class = WEIGHT_CLASS_SMALL
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/futomaki_sushi_roll/make_processable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/futomaki_sushi_slice, 4, screentip_verb = "Chop")
Expand All @@ -1058,6 +1061,7 @@
tastes = list("boiled rice" = 4, "fish" = 5, "egg" = 3, "dried seaweed" = 2, "cucumber" = 2)
foodtypes = VEGETABLES | SEAFOOD
w_class = WEIGHT_CLASS_SMALL
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/philadelphia_sushi_roll
name = "Philadelphia sushi roll"
Expand All @@ -1071,6 +1075,7 @@
tastes = list("boiled rice" = 4, "fish" = 5, "creamy cheese" = 3, "dried seaweed" = 2, "cucumber" = 2)
foodtypes = VEGETABLES | SEAFOOD | DAIRY
w_class = WEIGHT_CLASS_SMALL
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/philadelphia_sushi_roll/make_processable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/philadelphia_sushi_slice, 4, screentip_verb = "Chop")
Expand All @@ -1087,3 +1092,4 @@
tastes = list("boiled rice" = 4, "fish" = 5, "creamy cheese" = 3, "dried seaweed" = 2, "cucumber" = 2)
foodtypes = VEGETABLES | SEAFOOD | DAIRY
w_class = WEIGHT_CLASS_SMALL
crafting_complexity = FOOD_COMPLEXITY_3
1 change: 1 addition & 0 deletions code/game/objects/items/food/mexican.dm
Original file line number Diff line number Diff line change
Expand Up @@ -336,3 +336,4 @@
tastes = list("pineapple" = 4, "tomato" = 3, "onion" = 2, "chili" = 2)
foodtypes = VEGETABLES | FRUIT | PINEAPPLE
w_class = WEIGHT_CLASS_SMALL
crafting_complexity = FOOD_COMPLEXITY_3
10 changes: 10 additions & 0 deletions code/game/objects/items/food/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,7 @@
tastes = list("cooked eggplant" = 5, "cheese" = 4, "ground meat" = 3, "veggies" = 2)
foodtypes = VEGETABLES | MEAT | DAIRY
w_class = WEIGHT_CLASS_SMALL
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/moussaka
name = "moussaka"
Expand All @@ -562,6 +563,7 @@
)
tastes = list("cooked eggplant" = 5, "potato" = 1, "baked veggies" = 2, "meat" = 4, "bechamel sauce" = 3)
foodtypes = MEAT | DAIRY | VEGETABLES
crafting_complexity = FOOD_COMPLEXITY_4

/obj/item/food/moussaka/make_processable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/moussaka_slice, 4, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut")
Expand All @@ -577,6 +579,7 @@
)
tastes = list("cooked eggplant" = 5, "potato" = 1, "baked veggies" = 2, "meat" = 4, "bechamel sauce" = 3)
foodtypes = MEAT | DAIRY | VEGETABLES
crafting_complexity = FOOD_COMPLEXITY_4

/obj/item/food/candied_pineapple
name = "candied pineapple"
Expand All @@ -591,6 +594,7 @@
foodtypes = FRUIT | SUGAR
food_flags = FOOD_FINGER_FOOD
w_class = WEIGHT_CLASS_TINY
crafting_complexity = FOOD_COMPLEXITY_1

/obj/item/food/candied_pineapple/Initialize(mapload)
. = ..()
Expand All @@ -608,6 +612,7 @@
tastes = list("dough" = 2)
foodtypes = GRAIN
w_class = WEIGHT_CLASS_TINY
crafting_complexity = FOOD_COMPLEXITY_1

/obj/item/food/raw_pita_bread/make_grillable()
AddComponent(/datum/component/grillable, /obj/item/food/pita_bread, rand(15 SECONDS, 30 SECONDS), TRUE, TRUE)
Expand All @@ -627,6 +632,7 @@
tastes = list("pita bread" = 2)
foodtypes = GRAIN
w_class = WEIGHT_CLASS_TINY
crafting_complexity = FOOD_COMPLEXITY_2

/obj/item/food/tzatziki_sauce
name = "tzatziki sauce"
Expand All @@ -639,6 +645,7 @@
tastes = list("garlic" = 4, "cucumber" = 2, "olive oil" = 2)
foodtypes = VEGETABLES
w_class = WEIGHT_CLASS_TINY
crafting_complexity = FOOD_COMPLEXITY_2

/obj/item/food/tzatziki_and_pita_bread
name = "tzatziki and pita bread"
Expand All @@ -651,6 +658,7 @@
tastes = list("pita bread" = 4, "tzatziki sauce" = 2, "olive oil" = 2)
foodtypes = VEGETABLES | GRAIN
w_class = WEIGHT_CLASS_TINY
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/grilled_beef_gyro
name = "grilled beef gyro"
Expand All @@ -664,6 +672,7 @@
tastes = list("pita bread" = 4, "tender meat" = 2, "tzatziki sauce" = 2, "mixed veggies" = 2)
foodtypes = VEGETABLES | GRAIN | MEAT
w_class = WEIGHT_CLASS_TINY
crafting_complexity = FOOD_COMPLEXITY_4

/obj/item/food/vegetarian_gyro
name = "vegetarian gyro"
Expand All @@ -676,3 +685,4 @@
tastes = list("pita bread" = 4, "cucumber" = 2, "tzatziki sauce" = 2, "mixed veggies" = 2)
foodtypes = VEGETABLES | GRAIN
w_class = WEIGHT_CLASS_TINY
crafting_complexity = FOOD_COMPLEXITY_4
4 changes: 4 additions & 0 deletions code/game/objects/items/food/pastries.dm
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,7 @@
foodtypes = GRAIN | SUGAR | DAIRY
food_flags = FOOD_FINGER_FOOD
w_class = WEIGHT_CLASS_SMALL
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/cookie/snickerdoodle
name = "snickerdoodle"
Expand All @@ -550,6 +551,7 @@
foodtypes = GRAIN | SUGAR | DAIRY
food_flags = FOOD_FINGER_FOOD
w_class = WEIGHT_CLASS_SMALL
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/cookie/macaron
name = "macaron"
Expand All @@ -561,6 +563,7 @@
foodtypes = GRAIN | SUGAR | DAIRY
food_flags = FOOD_FINGER_FOOD
w_class = WEIGHT_CLASS_TINY
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/cookie/macaron/Initialize(mapload)
. = ..()
Expand All @@ -575,3 +578,4 @@
foodtypes = GRAIN | SUGAR | FRUIT
food_flags = FOOD_FINGER_FOOD
w_class = WEIGHT_CLASS_SMALL
crafting_complexity = FOOD_COMPLEXITY_3
6 changes: 6 additions & 0 deletions code/game/objects/items/food/spaghetti.dm
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@
)
tastes = list("noodles" = 5, "meat" = 3, "egg" = 4, "dried seaweed" = 2)
foodtypes = GRAIN | MEAT | VEGETABLES
crafting_complexity = FOOD_COMPLEXITY_4

/obj/item/food/spaghetti/kitakata_ramen
name = "kitakata ramen"
Expand All @@ -191,6 +192,7 @@
)
tastes = list("noodles" = 5, "meat" = 4, "mushrooms" = 3, "onion" = 2)
foodtypes = GRAIN | MEAT | VEGETABLES
crafting_complexity = FOOD_COMPLEXITY_4

/obj/item/food/spaghetti/kitsune_udon
name = "kitsune udon"
Expand All @@ -204,6 +206,7 @@
)
tastes = list("noodles" = 5, "tofu" = 4, "sugar" = 3, "soy sauce" = 2)
foodtypes = GRAIN | VEGETABLES
crafting_complexity = FOOD_COMPLEXITY_4

/obj/item/food/spaghetti/nikujaga
name = "nikujaga"
Expand All @@ -217,6 +220,7 @@
)
tastes = list("noodles" = 5, "meat" = 4, "potato" = 3, "onion" = 2, "mixed veggies" = 2)
foodtypes = GRAIN | VEGETABLES | MEAT
crafting_complexity = FOOD_COMPLEXITY_4

/obj/item/food/spaghetti/pho
name = "pho"
Expand All @@ -230,6 +234,7 @@
)
tastes = list("noodles" = 5, "meat" = 4, "cabbage" = 3, "onion" = 2, "herbs" = 2)
foodtypes = GRAIN | VEGETABLES | MEAT
crafting_complexity = FOOD_COMPLEXITY_4

/obj/item/food/spaghetti/pad_thai
name = "pad thai"
Expand All @@ -243,3 +248,4 @@
)
tastes = list("noodles" = 5, "fried tofu" = 4, "lime" = 2, "peanut" = 3, "onion" = 2)
foodtypes = GRAIN | VEGETABLES | NUTS | FRUIT
crafting_complexity = FOOD_COMPLEXITY_4
3 changes: 3 additions & 0 deletions code/game/objects/items/food/vegetables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@
tastes = list("fried eggplant" = 4, "garlic" = 2, "olive oil" = 3)
foodtypes = VEGETABLES
w_class = WEIGHT_CLASS_SMALL
crafting_complexity = FOOD_COMPLEXITY_2

/obj/item/food/baba_ghanoush
name = "baba ghanoush"
Expand All @@ -188,6 +189,7 @@
tastes = list("mashed eggplant" = 5, "pita bread" = 4, "garlic" = 3, "olive oil" = 4, "lemon juice" = 2)
foodtypes = VEGETABLES | GRAIN
w_class = WEIGHT_CLASS_SMALL
crafting_complexity = FOOD_COMPLEXITY_2

/obj/item/food/falafel
name = "falafel"
Expand All @@ -200,3 +202,4 @@
tastes = list("fava beans" = 5, "garlic" = 3, "onion" = 2, "fresh herbs" = 4)
foodtypes = VEGETABLES
w_class = WEIGHT_CLASS_SMALL
crafting_complexity = FOOD_COMPLEXITY_3

0 comments on commit 2aaa180

Please sign in to comment.