fish-station/Content.Server/Nutrition/EntitySystems
Vigers Ray 10888fd269 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Client/GameTicking/Managers/ClientGameTicker.cs
#	Content.Server/Administration/Systems/BwoinkSystem.cs
#	Content.Server/Cargo/Systems/CargoSystem.Orders.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Power/EntitySystems/PowerNetSystem.cs
#	Content.Server/Shuttles/Systems/ArrivalsSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/StationEvents/Components/PowerGridCheckRuleComponent.cs
#	Content.Server/StationEvents/Events/PowerGridCheckRule.cs
#	Content.Server/Zombies/ZombieSystem.Transform.cs
#	Content.Shared/CCVar/CCVars.Game.cs
#	Content.Shared/GameTicking/SharedGameTicker.cs
#	Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-wizard.ftl
#	Resources/Locale/en-US/_strings/guidebook/cooking.ftl
#	Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
#	Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/GameRules/midround.yml
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Prototypes/Guidebook/antagonist.yml
#	Resources/ServerInfo/Guidebook/Jobs.xml
#	Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
#	Resources/migration.yml
2025-02-26 22:01:48 +03:00
..
AnimalHusbandrySystem.cs Свиноматерь (#928) 2024-12-26 06:40:12 +03:00
CreamPieSystem.cs Merge remote-tracking branch 'space-wizards/master' 2025-02-26 22:01:48 +03:00
DrinkSystem.cs Fix borgs being able to drink from buckets and spray bottles. (#32964) 2024-12-23 13:54:18 -06:00
FatExtractorSystem.cs Seperate EMAG into EMAG and Authentication Disruptor (#34337) 2025-01-29 23:05:47 -05:00
FlavorProfileSystem.cs Revert 'Revert 'Solution Entities'' (#23168) 2023-12-29 08:47:43 -04:00
FoodSequenceSystem.cs Fix dev server crashes caused by putting pills in drinks, depositing spesos, making burgers (#33431) 2025-02-13 15:31:38 -05:00
FoodSystem.cs Merge remote-tracking branch 'refs/remotes/wizards/master' 2025-01-14 18:46:45 +03:00
IngestionBlockerSystem.cs Fix masks not toggling voice mask component (#22506) 2023-12-14 20:39:11 -05:00
SliceableFoodSystem.cs Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084) 2024-09-02 13:26:04 +02:00
SmokingSystem.Cigar.cs Decouple interactions from hands, cleanup old events, add new fears (#28393) 2024-05-31 13:26:19 -07:00
SmokingSystem.cs Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084) 2024-09-02 13:26:04 +02:00
SmokingSystem.SmokingPipe.cs Update SmokingSystem.SmokingPipe.cs to not use Component.Owner (#29967) 2024-07-13 14:06:54 +10:00
SmokingSystem.Vape.cs Seperate EMAG into EMAG and Authentication Disruptor (#34337) 2025-01-29 23:05:47 -05:00
TrashOnSolutionEmptySystem.cs Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084) 2024-09-02 13:26:04 +02:00
UtensilSystem.cs Fix utensils not being thrown away (#33326) 2024-11-15 21:39:19 -06:00