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	Add tooltips to the agent ID job icons and improve status icon prototypes (#28575)	2024-08-09 16:14:07 +10:00
Systems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-26 20:17:14 +03:00
AccessReaderChangeEvent.cs	Pathfinder hotfixes (#8201)	2022-05-16 13:21:00 +10:00
AccessWireAction.cs	Random spontaneous cleanup PR (#25131)	2024-02-13 16:48:39 -05:00
AddAccessLogCommand.cs	Access logs tweaks and fixes (#23096)	2023-12-28 19:32:46 -05:00
LogWireAction.cs	Fix ACC wire light not appearing (#30453)	2024-07-29 23:04:17 -04:00