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	Code cleanup: radio jammer (#29052)	2024-06-20 01:13:40 +10:00
EntitySystems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-26 20:17:14 +03:00
RadioEvent.cs	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00