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

TG Station Bread #15234

Merged
merged 3 commits into from
May 6, 2023
Merged

TG Station Bread #15234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b16ce2
Bread
potato1234x Apr 9, 2023
15d88d2
spawners and yaml linter
potato1234x Apr 9, 2023
218ef96
Merge branch 'master' into cooking-update-bread
metalgearsloth May 6, 2023
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
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/flavors/flavor-profiles.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ flavor-base-shocking = shocking
flavor-base-cheap = cheap
flavor-base-piquant = piquant
flavor-base-sharp = sharp
flavor-base-syrupy = syrupy

# lmao
flavor-base-terrible = terrible
Expand Down Expand Up @@ -127,6 +128,7 @@ flavor-complex-bad-joke = like a bad joke
flavor-complex-memory-leek = like a fork bomb
flavor-complex-gunpowder = like gunpowder
flavor-complex-validhunting = like validhunting
flavor-complex-cobwebs = like cobwebs
flavor-complex-sadness = like sadness
flavor-complex-hope = like hope
flavor-complex-chaos = like chaos
Expand Down
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/reagents/meta/consumable/food/ingredients.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
reagent-name-flour = flour
reagent-desc-flour = Used for baking.

reagent-name-cornmeal = cornmeal
reagent-desc-cornmeal = Used for baking.

reagent-name-oats = oats
reagent-desc-oats = Used for a variety of tasty purposes.

Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
id: ChefvendInventory
startingInventory:
ReagentContainerFlour: 2
ReagentContainerCornmeal: 2
ReagentContainerSugar: 2
ReagentContainerRice: 2
FoodCondimentPacketSalt: 4
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@
- FoodBreadCreamcheeseSlice
- FoodBreadMoldySlice
- FoodBreadGarlicSlice
- FoodBreadCornSlice
- FoodBreadSausageSlice
- FoodBreadButteredToast
- FoodBreadJellySlice
- FoodBreadFrenchToast
- FoodBreadTwoSlice
- FoodCakeBlueberrySlice
- FoodCakePlainSlice
- FoodCakeCarrotSlice
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
- FoodBreadVolcanic
- FoodBreadPlain
- FoodBreadMeat
- FoodBreadCorn
- FoodBreadSausage
- FoodBreadBanana
- FoodBreadTofu
- FoodBreadCreamcheese
Expand Down
Loading