# 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 |
||
|---|---|---|
| .. | ||
| Pair | ||
| Tests | ||
| AssemblyInfo.cs | ||
| Content.IntegrationTests.csproj | ||
| DummyParallaxManager.cs | ||
| GlobalUsings.cs | ||
| PoolManager.cs | ||
| PoolManager.Cvars.cs | ||
| PoolManager.Prototypes.cs | ||
| PoolManagerTestEventHandler.cs | ||
| PoolSettings.cs | ||
| PoolTestLogHandler.cs | ||
| TestPrototypesAttribute.cs | ||