Vigers Ray 0619ac9206 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # .github/workflows/build-test-debug.yml # Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs # Content.Server/Zombies/ZombieSystem.cs # Content.Shared/Nutrition/EntitySystems/HungerSystem.cs # Resources/Locale/en-US/_strings/atmos/gases.ftl # Resources/Locale/en-US/_strings/components/atmos-monitoring-component.ftl # Resources/Locale/en-US/_strings/tools/components/tool-component.ftl # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Research/industrial.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Prototypes/ai_factions.yml # Resources/toolshedEngineCommandPerms.yml		2024-12-21 18:51:37 +03:00
..
HungerSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-21 18:51:37 +03:00
OpenableSystem.cs	Fix drinking from openable containers (#29010)	2024-06-14 22:20:42 -07:00
PressurizedSolutionSystem.cs	Use non-generic TryComp() for metadata & transform (#28133)	2024-05-20 22:40:35 -07:00
SealableSystem.cs	scoopable ash and foam, solution transfer prediction (#25832)	2024-04-01 17:27:39 +11:00
ShakeableSystem.cs	Add ability to shake fizzy drinks so they spray in peoples' faces (#25574)	2024-04-18 11:49:58 +10:00
SharedCreamPieSystem.cs	ayo (#545)	2024-10-30 10:42:02 +03:00
SharedDrinkSystem.cs	Use non-generic TryComp() for metadata & transform (#28133)	2024-05-20 22:40:35 -07:00
SharedFoodSequenceSystem.cs	Custom burgers - FoodSequence system (#30755)	2024-08-10 22:31:32 +03:00
SharedUtensilSystem.cs	Fix clientside storage Whitelists (#24063)	2024-02-02 00:33:57 +11:00
ThirstSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-21 18:51:37 +03:00