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
..
AccessOverriderSystem.cs	Resolve all non-obsoleting warnings in content (#27934)	2024-05-11 20:13:58 -07:00
AccessSystem.cs	Dewarns access (#16666)	2023-07-23 14:19:51 +10:00
AgentIDCardSystem.cs	Fix agent ID card unlimited range (#32445)	2024-09-25 17:41:34 +02:00
IdCardConsoleSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-04 09:41:27 +03:00
IdCardSystem.cs	feat: now when research is unlocked in console, approver of reasearch is radio-ed too (#31170)	2024-09-03 23:01:38 +10:00
PresetIdCardSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-04 09:41:27 +03:00