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
..
Bombs	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Effects	Proto-kinetic crusher (#16277)	2023-05-14 13:15:18 +10:00
Grenades	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-11 14:05:37 +03:00
Guns	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-26 20:17:14 +03:00
Melee	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-14 19:55:44 +03:00
pflash.rsi	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Throwable	Automatic holiday sprites (#22929)	2023-12-24 23:52:43 -07:00