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
..
AnimalHusbandrySystem.cs	Add a system for modifying entity names without causing conflicts (#27863)	2024-06-16 15:38:53 -04:00
CreamPieSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-13 04:35:52 +03:00
DrinkSystem.cs	Several small SFX tweaks (#28897)	2024-10-16 20:38:02 -05:00
FatExtractorSystem.cs	Reduce network burden of the hunger system (#32986)	2024-12-18 14:06:02 +01:00
FlavorProfileSystem.cs	Revert 'Revert 'Solution Entities'' (#23168)	2023-12-29 08:47:43 -04:00
FoodSequenceSystem.cs	Add extradimensional orange, holymelon, meatwheat, worldpeas mutations (#27624)	2024-09-14 00:02:54 +10:00
FoodSystem.cs	Several small SFX tweaks (#28897)	2024-10-16 20:38:02 -05: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	Fix vape use without check if doafter cancelled (#33245)	2024-11-10 21:17:03 -06: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