VigersRay 0a91b468b4 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs # Content.Client/Voting/UI/VotePopup.xaml.cs # Content.Client/Voting/VoteManager.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/Power/EntitySystems/BatterySystem.cs # Content.Server/Radio/EntitySystems/RadioSystem.cs # Content.Server/VoiceMask/VoiceMaskComponent.cs # Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Content.Server/VoiceMask/VoiceMaskerComponent.cs # Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs # Content.Server/Voting/Managers/VoteManager.cs # Content.Shared/VendingMachines/SharedVendingMachineSystem.cs # Content.Shared/Voting/MsgVoteData.cs # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Recipes/Crafting/crates.yml # Resources/Prototypes/Recipes/Crafting/improvised.yml		2024-09-26 20:17:14 +03:00
..
Prototypes	Emotes Menu (#26702)	2024-04-28 21:38:23 -07:00
TypingIndicator	Fix typing indicators! (#29492)	2024-07-10 15:51:47 +10:00
V2	Chatfactor: Chat Repository, Admin Commands, Chat Created Events (#26113)	2024-04-18 14:59:10 +10:00
ChatChannel.cs	Коллективный разум (#248)	2024-07-27 12:09:05 +03:00
ChatChannelExtensions.cs	Add admin alerts (#13589)	2023-03-23 11:10:49 -04:00
ChatSelectChannel.cs	Коллективный разум (#248)	2024-07-27 12:09:05 +03:00
EmotesEvents.cs	Emotes Menu (#26702)	2024-04-28 21:38:23 -07:00
MsgChatMessage.cs	Make chat & examine systems use FormattedMessage.EscapeText() (#28431)	2024-05-31 16:05:34 -04:00
MsgDeleteChatMessagesBy.cs	Add admin Erase verb, add checkbox to erase from the ban panel (#20985)	2023-10-14 02:02:56 -07:00
SharedChatEvents.cs	Voice Mask refactor (#30798)	2024-09-26 18:55:59 +02:00
SharedChatSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-28 19:12:01 +03:00
SharedSuicideSystem.cs	Melee Executions (#30104)	2024-08-11 13:05:54 +10:00