Commit Graph

70 Commits

Author SHA1 Message Date
Ed
230ea9be46 Metamorphosis - FoodSequence 3 (#31012)
* setup some data

* cheeseburger recipe

* Update FoodSequenceSystem.cs

* finalize cheseburger recipe

* remove fun

* return old taco sprites

* full foodsequence data refactor

* return tacos

* well done

* add cutlets to burger

* chickenburger recipe

* +2 burger recipes

* more fun

* Update brain.png

* some slice produce added

* documentation

* watermelon

* skewer work

* flipping

* tomato

* skewer watermelon

* Update skewer.yml

* oopsie, ok, im go to sleep

* fix checks

* Update produce.yml

* screwed

* cheeeeeeeese

* all cooked meat added

* produce added

* aaaaand suppermatter

* key to Tag

* More

* proto string remove

* raw snail

* fix

* Update FoodMetamorphableByAddingComponent.cs

* fixes

* fix3

* fififififx
2024-09-08 02:22:27 -04:00
IProduceWidgets
c8e59ebdd5 Add Snails (#30765)
* add snails

* scuffix

* migrate

* mo-grate

* oopsied the ftls

* Revert "oopsied the ftls"

This reverts commit 0d3c6c17f31ec904679d6a48799cea71e77c1f99.

* the curse of staging the wrong file, resolved.

* Snoth

* fix my dumbs

* reviews 1

* anti space technology

* salt hurty

* spelling

* Its a slotherhouse out here

* sequencing

* cooked snail

* volfix

* speed reversal
2024-09-03 12:33:44 +02:00
lzk
2871e69268 Moff cooking. Part one. (#30668)
* yml part

* guidebook

* commit

* some fixes

* a little

* change
2024-08-26 12:46:16 +10:00
themias
6ba7d268b0 Uplink: Combat Bakery Kit (#31179)
* save

* sprites

* mime survival kit has baguette

* add weapon/uplink

* cherry-pick croissant changes

* uplink

* Switch baguette to slashing damage

* fixes

* update attribution

* fix typos

* review comments

* reduce TC cost

* switch to regular box

* fix regular baguette rotation
2024-08-19 12:57:29 -06:00
Goldminermac
864956c66b Pancakes Fix (#31123)
* Edited blueberry pancake textures to seem more blueberry-stained

* Added new blueberry pancake sprites to allow stacking up to 9

* Added more sprites for chocolate pancakes so they can stack up to 9

* Fixed up the blueberry pancake sprites to be more consistent

* Updated the stack components of blueberry and chocolate pancakes in the yml prototype file.

* Updates the stack size in the consumable stacks yaml file.

* Added the new pancake sprites to the sprite meta json file.

* Removed an unnecessary space from the baked food YAML file

* Updated branch and fully resolved merge conflict

* Decreased the copy-pastiness of some of the blueberry sprites to make them less repetitive

* Diversified the textures some more for good measure.

* Fixed some missing rims around the pancakes because I'm bored
2024-08-18 20:42:58 -06:00
themias
ef3de39364 Add croissant recipe (#30825)
* Add croissant recipe

* comma

* fix description

* fix merge error
2024-08-18 00:09:42 +10:00
Ed
e659eb992f Custom Taco & Kebabs - FoodSequence 2 (#30905)
* control layer ordering

* sprite update

* taco!

* taco naming gen

* fix separator naming

* some proto fixes

* default naming separation

* fix taco naming

* rat update

* hamsterburger

* organs taco

* remove from spawners

* fixes

* fix separators and lemons

* Update food-sequence.ftl

* randomization offset

* fix

* kebabs refactor

* fix

* skewer weapon

* Update food_single.yml

* Update migration.yml

* suppermatter

* hamlet centered

* hamsburger

* Update dead-0.png

* 20 -> 4 burger layers max

* Update burger.yml

* canReact: false

* capfruit update

* Update burger.yml

* Update burger.yml

* Update produce.yml

* some fixes

* Update Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* chicken

* Update food-sequence.ftl

* documentation

* fixes

* Update meat.yml

* Update meat.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-08-14 15:04:00 +02:00
Ed
4d75cb54c8 Custom burgers - FoodSequence system (#30755)
* setup foodsequence

* name generation and max layers limit

* move to nutrition

* move code to serverside

* move to appearance data

* marked fields as required

* Update foodsequence.yml

* b

* burgeers!

* Update produce.yml

* Update meat.yml

* Update burger.yml

* fix duplicate naming

* Update Resources/Locale/en-US/nutrition/components/food-sequence.ftl

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>

* merge flavor profiles

* make food trash List<>

* merge trash

* Update FoodComponent.cs

* Update FoodComponent.cs

* organs and cannabis support

---------

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
2024-08-10 22:31:32 +03:00
themias
8ebe105458 Add butter slices (#30789) 2024-08-09 09:32:42 +10:00
mkanke-real
e1f3bdc748 Add spicy rock pizza (#30116)
* Added all the parts to implement spicy rock pizza

* Added sprites for pizza

* Fixed coma formatting in meta.json for pizzas

* Fix formatting and rebalance reagent quantities in pizza.yml

* Flipped Uranium and Radium values to be the correct ratio

* Updated meta.json file to have credit for sprite
2024-07-23 16:22:11 -07:00
DrEnzyme
659010993f Add bagels (#24799)
Bagels are made by using a rolling pin on a dough slice to make a dough rope, then cooking the dough rope in a microwave for 5 seconds. There are two types: a normal bagel and a poppyseed bagel. The poppyseed bagel requires a poppy and a dough rope and has a small (5u) quantity of Bicaridine inside of it in addition to its nutriment.

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2024-06-23 12:33:12 -07:00
Redfire1331
68c414e8ed made cup ramen eatable with anything with the fork component (#27826)
* made cup ramen eatable with anything with the fork component

* removed extra png

* made cupramen fillable with water, and made hot ramen dry ramen.

---------

Co-authored-by: redfire1331 <Redfire1331@users.noreply.github.com>
2024-06-20 22:34:46 +10:00
potato1234_x
e2741498b8 Add fill levels to bowls (#25639)
* fills

* contrast
2024-02-29 16:41:14 -05:00
Tayrtahn
41cf3e5599 Add open/closed/fill states and sprites (#24600)
This adds visual differences to the sprites of many of the game's drinks when they are opened, as well as visual fill levels for most see-through drink containers. Condiment packets are visibly torn open in the corner when opened. Glue, lube, and condiment bottles are visibly opened too. I also noticed that the soda bottles were all completely opaque, so I fixed that while I was at it. Oh, and I updated the wine bottle sprite to say 14 instead of 13, 'cause yeah.

As a result of the way fill levels take on the color of the contained liquid, many of the drinks have changed slightly in appearance. This can be adjusted in the future by modifying the colors of the reagents, but seems outside the scope of this already large PR. This also means that if you refill the bottles with a different liquid, they'll take on the new color appropriately.
2024-02-04 12:13:47 -08:00
deltanedas
604748534e Add carp pocket (#24888)
* texture

* add the item

* add it to present and salv loot

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-02-03 19:12:56 +11:00
Tayrtahn
765ea789cc Add Stonk Pockets (#24876)
* Added stonk pockets

* Give me a little credit

* Update Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json

* Update Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-02-03 12:55:02 +11:00
SlamBamActionman
e36844de47 Remove gondola donkpocket & change berry box description (#24655)
* Remove gondola & change berry box description

* Removed map gondolas

* Revert "Removed map gondolas"

This reverts commit 42fcfb85f16e778df135d2a68b9cea08d794e28b.

* Updated migration.yml to remove FoodBoxDonkpocketGondola

* Replacing is better than removing

* Changed description slightly
2024-02-02 09:27:52 +11:00
Nim
6a0c800492 Add snake kebab (#24341)
* add snake kebab

* fix sprite

* just meat
2024-01-20 18:38:10 -05:00
TurboTrackerss14
c32d19cf5c Add Mothroach Burger (#24156)
* Add Mothroach Burger

* append copyright

* fix whitespace and metajson ordering
2024-01-17 01:46:33 -07:00
Velcroboy
ff75b1be56 Salami does melee dmg (#23041)
* Add melee dmg to salami

* Bump up dmg to 6, 1 more than a punch

* Add in-hand and wielded sprites, and adjust swing angle

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-27 19:59:14 -07:00
Velcroboy
a4ed13af4a Remove duplicate milks (#22721)
* Remove duplicate milks

* Migration

* Inventories

* Guidebook

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-18 15:51:39 -07:00
Nim
460bfdc73c Space cobra 1.1 (#20298)
* space cobra again

* didn't see

* fix

* Dirty

* space spider

* license

* component

* sprite update

* visibility

* fix

* fix visibility
2023-12-06 20:25:57 -05:00
DoubleRiceEddiedd
33fb768791 New mutation species plant, Lemoon Tree (#22023)
* Adding Lemoon as lemon's mutation

* Adding lemoon cake

* remove tag that forget to delete
2023-11-30 16:44:23 -05:00
Velcroboy
808555ade6 Adds slices for banana cream pie and mime tart (#21043) 2023-11-19 12:15:02 -08:00
phunnyguy
c92b99f6ba Tortilla dough, Taco shells, and Tacos (#20797)
LGTM!
2023-10-18 14:03:23 -07:00
deltanedas
6af7c90b73 make tinned foods use openable (#19884)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-06 17:35:32 -07:00
deltanedas
0d22d2d1f2 rouny meat and steak (#20526)
* lost friendship flavor

* add rouny steak

* rouny special meat

* rouny meat textures

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-28 00:07:08 -04:00
Арт
0c9c68027a Added corn in butter (#19448)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-20 19:51:08 +10:00
Velcroboy
1de23dc4d0 Adds Ganja Brownies (#19222) 2023-09-06 21:21:14 -04:00
potato1234_x
149e58d30a revamp getmore inventory (#19372) 2023-08-23 17:49:25 -04:00
Interrobang01
3457729ba4 Added Mustard (#18930) 2023-08-09 19:38:36 -06:00
deathride58
a32fbb37ce Chevre and chevre accessories - Adds chevre, crostini, and chevre chaud to the game (#17968) 2023-07-11 21:00:30 -06:00
lzk
335ee13caf Taco! (#17635) 2023-06-26 13:05:07 +10:00
SonicHDC
7c609c913e Dumplings (#16966) 2023-06-15 12:45:30 +10:00
Velcroboy
74c1a17888 Removes duplicate fortune cookie (#16304)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-05-11 00:20:27 +10:00
deltanedas
21166406d8 condiment rework (#16247)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-05-10 21:36:47 +10:00
potato1234_x
c2a5ca96e8 TG Station Burgers (#15217)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-05-06 17:43:09 +10:00
potato1234_x
aded6efc0a TG Station Bread (#15234)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-05-06 17:41:32 +10:00
lapatison
1a466388c1 [Frozen] Soups tweaks (#15110)
Co-authored-by: Moony <moony@hellomouse.net>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-05-06 17:36:33 +10:00
potato1234_x
24e6088dd7 Salt & Pepper Shakers (#15808) 2023-04-29 18:42:44 +10:00
lapatison
ccbf8b5748 Watermelon and grapes (#14587) 2023-03-25 08:15:21 -04:00
lapatison
71393c5d19 Soybean and rice plants, tofu, tofu bread recipe (#13989) 2023-03-05 22:52:03 -04:00
Fluffiest Floofers
adf9ccbe8a Cabbage, Red Onion and related salads. (#14161)
* Cabbage

That's it, just cabbage.

* Up RestockSeed Cargo price.

2000 -> 2100

* Coleslawn, Caesar and Kimchi.

Requires red onions so I also added it to the list.

* Update Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

Fix kimchi's incorrect name.

Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>

---------

Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
2023-02-18 17:52:58 -06:00
metalgearsloth
945101e5e4 Fix a bunch of invalid rsi files (#13104) 2022-12-20 09:36:59 +01:00
Pieter-Jan Briers
14f8b4e6d5 Use new validate-rsis for workflow (#12997)
* Use new validate-rsis for workflow

* A

* Add python deps

* --ignore-installed

* Make it only work on RSI changes again.

* Fix a bunch of RSIs.
2022-12-20 06:31:17 +01:00
Nemanja
635142aa1c ian fortnite burger (#11435) 2022-09-20 19:16:59 -07:00
CormosLemming
e227f208bc Changes popcorn sprite to have the number fourteen instead of thirteen. (#10134) 2022-07-30 19:56:04 -07:00
CrudeWax
c210239f45 Fishy swarmers: Carp content and Space Dragon! (#7395)
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-06-16 14:14:06 +10:00
Pieter-Jan Briers
63b9cd0b92 Adds suppermatter (#7633)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-12 19:44:17 +10:00
Peptide90
3b54566e5b Changs chinese food vending machine (#7754)
* new chinese food items from paradise

* made soy sauce salty

* new snacks based on the new assets

* chang assets 1

* chang vending machine

* rsi animation and fix

* rsi path fix

* misc changes

* fortune cookie snacks complete with fortunes

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

darn Americans

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2022-05-11 00:17:24 -07:00