git.smokeofanarchy.ru Git - space-station-14.git/commit

Debody Food and Drink Systems, Combine Food and Drink into One System. (#39031)

* Shelve

* 22 file diff

* What if it was just better

* Hold that thought

* Near final Commit, then YAML hell

* 95% done with cs

* Working Commit

* Final Commit (Before reviews tear it apart and kill me)

* Add a really stupid comment.

* KILL

* EXPLODE TEST FAILS WITH MY MIND

* I hate it here

* TACTICAL NUCLEAR STRIKE

* Wait what the fuck was I doing?

* Comments

* Me when I'm stupid

* Food doesn't need solutions

* API improvements with some API weirdness

* Move non-API out of API

* Better comment

* Fixes and spelling mistakes

* Final fixes

* Final fixes for real...

* Kill food and drink localization files because I hate them.

* Water droplet fix

* Utensil fixes

* Fix verb priority (It should've been 2)

* A few minor localization fixes

* merge conflict and stuff

* MERGE CONFLICT NUCLEAR WAR!!!

* Cleanup

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

author	Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
	Wed, 6 Aug 2025 16:53:38 +0000 (09:53 -0700)
committer	GitHub <noreply@github.com>
	Wed, 6 Aug 2025 16:53:38 +0000 (12:53 -0400)
commit	91854e077624e19c698268b028a0dd4bd706121e
tree	33e081d59850b7a3a7970f30bd3db38b7662629c	tree \| snapshot
parent	02382045ab6928572a5bc1ae3df7bac6ee4bda90	commit \| diff

Content.Server/Kitchen/EntitySystems/SharpSystem.cs		diff \| blob \| history
Content.Server/NPC/Systems/NPCUtilitySystem.cs		diff \| blob \| history
Content.Server/Nutrition/Components/MessyDrinkerComponent.cs		diff \| blob \| history
Content.Server/Nutrition/EntitySystems/DrinkSystem.cs		diff \| blob \| history
Content.Server/Nutrition/EntitySystems/MessyDrinkerSystem.cs		diff \| blob \| history
Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs		diff \| blob \| history
Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs		diff \| blob \| history
Content.Server/Polymorph/Systems/PolymorphSystem.cs		diff \| blob \| history
Content.Shared/Animals/WoolySystem.cs		diff \| blob \| history
Content.Shared/Damage/Systems/SharedGodmodeSystem.cs		diff \| blob \| history
Content.Shared/Inventory/InventorySystem.Relay.cs		diff \| blob \| history
Content.Shared/Nutrition/Components/DrinkComponent.cs		diff \| blob \| history
Content.Shared/Nutrition/Components/EdibleComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Nutrition/Components/FoodComponent.cs		diff \| blob \| history
Content.Shared/Nutrition/Components/IngestionBlockerComponent.cs		diff \| blob \| history
Content.Shared/Nutrition/Components/OpenableComponent.cs		diff \| blob \| history
Content.Shared/Nutrition/Components/SealableComponent.cs		diff \| blob \| history
Content.Shared/Nutrition/Components/UtensilComponent.cs		diff \| blob \| history
Content.Shared/Nutrition/EntitySystems/FlavorProfileSystem.cs		diff \| blob \| history
Content.Shared/Nutrition/EntitySystems/FoodSystem.cs		diff \| blob \| history
Content.Shared/Nutrition/EntitySystems/IngestionBlockerSystem.cs	[deleted file]	blob \| history
Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs	[new file with mode: 0644]	blob
Content.Shared/Nutrition/EntitySystems/IngestionSystem.Blockers.cs	[new file with mode: 0644]	blob
Content.Shared/Nutrition/EntitySystems/IngestionSystem.Utensils.cs	[new file with mode: 0644]	blob
Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs	[new file with mode: 0644]	blob
Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs		diff \| blob \| history
Content.Shared/Nutrition/EntitySystems/SharedDrinkSystem.cs		diff \| blob \| history
Content.Shared/Nutrition/EntitySystems/UtensilSystem.cs		diff \| blob \| history
Content.Shared/Nutrition/IngestionEvents.cs		diff \| blob \| history
Content.Shared/Nutrition/Prototypes/EdiblePrototype.cs	[new file with mode: 0644]	blob
Content.Shared/Stacks/SharedStackSystem.cs		diff \| blob \| history
Content.Shared/Storage/EntitySystems/SecretStashSystem.cs		diff \| blob \| history
Resources/Locale/en-US/nutrition/components/drink-component.ftl		diff \| blob \| history
Resources/Locale/en-US/nutrition/components/food-component.ftl	[deleted file]	blob \| history
Resources/Locale/en-US/nutrition/components/ingestion-system.ftl	[new file with mode: 0644]	blob
Resources/Locale/en-US/nutrition/components/openable-component.ftl		diff \| blob \| history
Resources/Locale/en-US/nutrition/components/sealable-component.ftl	[new file with mode: 0644]	blob
Resources/Prototypes/Body/Organs/Animal/ruminant.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Head/misc.yml		diff \| blob \| history
Resources/Prototypes/Entities/Effects/puddle.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Materials/materials.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/kudzu.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/chemistry.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Tools/bucket.yml		diff \| blob \| history
Resources/Prototypes/NPCs/utility_queries.yml		diff \| blob \| history
Resources/Prototypes/Nutrition/edible.yml	[new file with mode: 0644]	blob
Resources/Prototypes/tags.yml		diff \| blob \| history