VigersRay b1cac7e781 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Chat/Managers/IChatManager.cs # Content.Client/IoC/ClientContentIoC.cs # Content.Server/Administration/Systems/BwoinkSystem.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/GameTicking/GameTicker.Player.cs # Resources/Audio/Machines/attributions.yml # Resources/Locale/en-US/_strings/administration/commands/custom-vote-command.ftl # Resources/Locale/en-US/_strings/discord/vote-notifications.ftl # Resources/Locale/en-US/_strings/npc/firebot.ftl # Resources/Locale/en-US/_strings/paper/syndicate-business-card.ftl # Resources/Locale/en-US/_strings/store/uplink-catalog.ftl # Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml # Resources/Prototypes/Recipes/Crafting/bots.yml # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png		2024-10-02 06:45:10 +03:00
..
Commands	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-14 19:55:44 +03:00
Managers	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 06:45:10 +03:00
Systems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 06:45:10 +03:00
TypingIndicator	Predict typing indicator (#29551)	2024-06-29 13:33:56 +10:00
V2	Chatfactor: Chat Repository, Admin Commands, Chat Created Events (#26113)	2024-04-18 14:59:10 +10: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
SpeakOnUseComponent.cs	SpeakOnUseSystem and phrases for figurines (#30455)	2024-08-03 10:06:04 -04:00
SuicideSystem.cs	Fix suicide logs (#31661)	2024-08-31 18:26:52 +10:00