Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NeoDays] "Food" and other mouth stimulators #2241

Merged
merged 10 commits into from
Dec 11, 2023

Conversation

Golfavel
Copy link
Contributor

Summary

Adds and connects various foods and related items

Content of the change

Adds:

  • Candy-coated peanuts
  • Cactus pad
  • Nopalito
  • Buttercream icing
  • Caramel apple
  • Cooking banana
  • Roasted cooking banana
  • Cooked gastropod
  • Garlic clove
  • Dehydrated garlic clove
  • Pineapple chunks
  • Honeydew
  • Empty corn cob
  • Young leaves
  • Passionfruit

Connects:

  • Caviar egg sandwich to egg salad sandwich
  • Chocolate milkshake and deluxe chocolate milkshake with sewage
  • Coconut water to water
  • Chunk of lobster meat to fish
  • Cholla bud to raw burdock
  • Cottage cheese, mascarpone, and mozzarella cheese to mayonnaise
  • Cooked mollusk to cooked gastropod
  • Rehydrated garlic clove to garlic clove
  • Garlic powder to crack
  • Dehydrated corn and mustard powder to canned corn
  • Dehydrated chili pepper to dry meat
  • Rehydrated chili pepper to chilly powder
  • Diet pill to panacea
  • Dry wild rice to canned clams
  • Milkshake, deluxe milkshake, and fortified milk to milk
  • Lulo to orange
  • Hot sauce and marsala to tomato soup
  • Pile of wintergreen leaves, black tea leaves, grape leaves, green tea leaves, and italian seasoning to pile of young leaves

Cleans:

  • Cooked oatmeal
  • Fried sugar
  • Pesto

Moved various nuts to ./food/nuts
Fixed various shelled nuts having wrong id

Testing

Before
neo_mfoodbef
After
neo_mfood_aft
Composer throws no errors and sprites appear as expected

Additional information

fixed: various shelled nut sprites having wrong id
connected: caviar egg sandwich with egg salad sandwich; chocolate milkshake with sewage
connected: cottage cheese to mayonnaise, cooked mollusk to cooked gastropod
cleaned: cooked oatmeal
connected: rehydrated garlic clove to garlic clove, garlic powder to crack, dehydrated corn to canned corn, dehydrated chili pepper to dry meat, rehydrated chili pepper to chilly powder
…hake and deluxe milkshake to milk; deluxe chocolate milkshake to sewage
connected: fortified milk
cleaned: fried sugar
connected: lulo to orange; mascarpone and mozzarella cheese to mayonnaise; mustard powder to canned corn; hot sauce and marsala to tomato soup
…, green tea leaves, and italian seasoning to pile of young leaves

cleaned: pesto
@Fris0uman Fris0uman merged commit b3277b3 into I-am-Erk:master Dec 11, 2023
1 check passed
@Golfavel Golfavel deleted the neo_maxmob branch December 11, 2023 19:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants