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
..
SurveillanceCameraMicrophoneSystem.cs	Replace obsolete EntityWhitelist IsValid usages part 2 (#28506)	2024-06-03 17:40:03 -04:00
SurveillanceCameraMonitorSystem.cs	upstream	2024-09-16 12:40:23 +03:00
SurveillanceCameraRouterSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-28 19:12:01 +03:00
SurveillanceCameraSpeakerSystem.cs	Voice Mask refactor (#30798)	2024-09-26 18:55:59 +02:00
SurveillanceCameraSystem.cs	upstream	2024-09-16 12:40:23 +03:00