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
..
Commands	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-14 19:55:44 +03:00
Managers	Куча мелких фиксов (#642)	2024-11-19 18:23:16 +03:00
Systems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-16 23:44:23 +03:00
TypingIndicator	Predict typing indicator (#29551)	2024-06-29 13:33:56 +10:00
V2	Toolshed refactor (#33598)	2024-12-21 17:45:48 +11:00
AnnounceOnSpawnComponent.cs	nar'sie fake (#20299)	2023-12-06 20:24:33 -05:00
AutoEmoteComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
ChatUser.cs	Fix erase verb not removing chat messages in some cases (#21355)	2023-11-05 19:19:59 -07:00
EmoteOnDamageComponent.cs	Use new ComponentPauseGenerator (#25183)	2024-02-26 14:36:19 +11:00
SpeakOnTriggerComponent.cs	Figures can now be activated remotely (#32769)	2024-12-16 19:52:09 +01:00
SuicideSystem.cs	Убрал возможность по мете использовать призрака.	2024-12-12 02:24:54 +03:00