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.

Sign up for GitHub

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

Hazy Food Tweaks Patch #661

Merged
merged 16 commits into from
Nov 8, 2024
+930 −4,099
Merged

Hazy Food Tweaks Patch #661

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ba29267
Recipes, cutlets, and reagents updated
HazelHyena Nov 5, 2024
629d082
WEIRD bugs coming up now.
HazelHyena Nov 5, 2024
3852726
Feature complete, creating PR for easier review/testing
HazelHyena Nov 5, 2024
d756386
Kebabs removed
HazelHyena Nov 6, 2024
2f6f033
McRib fix. I wish YAML showed multiple errors but that's life
HazelHyena Nov 6, 2024
305a8fa
Did you know we just didn't have our own popcorn entity? My bad.
HazelHyena Nov 6, 2024
fc85abb
Bun fixed
HazelHyena Nov 6, 2024
eeaae02
Human burger out
HazelHyena Nov 6, 2024
bd56e36
Weedbutter fix
HazelHyena Nov 6, 2024
4eb8529
Missing entity fixed
HazelHyena Nov 6, 2024
1371719
Now we're making real headway.
HazelHyena Nov 6, 2024
9a769ce
Bacon tweak
HazelHyena Nov 6, 2024
ece0c12
Pizza problem
HazelHyena Nov 7, 2024
0f7eb5d
Ready to roll - pizza problem deferred
HazelHyena Nov 7, 2024
7560b7f
Finished & Migration check is good!
HazelHyena Nov 7, 2024
2daa915
Minor nutrient tweak for fun
HazelHyena Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml
View file
Open in desktop
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also getting rid of this, pep fixed this (why did it add this text from earlier? bleh)

Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@
- FoodMothFleetSalad # Nyanotrasen - Moth Recipes
- FoodMothCottonSalad # Nyanotrasen - Moth Recipes
- FoodMothKachumbariSalad # Nyanotrasen - Moth Recipes
- FoodMealSoftTaco #test to see if this fixes a bug
- FoodMealSoftTaco # test to see if this fixes a bug
- N14FoodMealSoftTaco # will this fix it?
- FoodMealCornInButter
- FoodSoupStew
chance: 0.8
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,4 +919,3 @@
- type: Tag
tags:
- Meat

3 changes: 1 addition & 2 deletions Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
View file
Open in desktop
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops this was the upstream one. I'll fix that now

Original file line number Diff line number Diff line change
Expand Up @@ -713,12 +713,11 @@
name: vegetable soup
parent: FoodBowlBase
id: FoodSoupVegetable
description: A true vegan meal.
description: A rugged wasteland dish, favorite of scavengers and farmers.
components:
- type: FlavorProfile
flavors:
- vegetables
- sadness
- type: Sprite
layers:
- state: bowl
Expand Down
Loading
Loading