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
..
SharedVendingMachineSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-26 20:17:14 +03:00
SharedVendingMachineSystem.Restock.cs	Add BreakOnDropItem, update do afters, remove unnecessary declarations (#30361)	2024-08-08 13:39:46 +02:00
VendingMachineComponent.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-26 20:17:14 +03:00
VendingMachineInterfaceState.cs	Predict vending machine BUI (#32376)	2024-09-23 12:10:22 +10:00
VendingMachineInventoryPrototype.cs	Make all prototype types partial (#21374)	2023-11-01 19:56:23 -07:00
VendingMachineRestockComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00