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
..
Components	Voice Mask refactor (#30798)	2024-09-26 18:55:59 +02:00
EntitySystems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-26 20:17:14 +03:00
Muting	Moves muted to shared (#25374)	2024-02-21 15:53:46 -05:00
AccentSystem.cs	Improved Spanish accent (#30551)	2024-08-08 13:08:28 +10:00
EmotesMenuSystem.cs	Emotes Menu (#26702)	2024-04-28 21:38:23 -07:00
ListenEvent.cs	IListener and IRadio purge (#11980)	2022-11-15 15:09:27 +11:00
SpeechNoiseSystem.cs	Lower speech noise volume & refactor system (#24579)	2024-01-28 21:49:55 +11:00