Morb0 c44d509701 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs # Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Content.Server/VoiceMask/VoiceMaskerComponent.cs # Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Textures/Interface/Alerts/essence_counter.rsi/essence0.png # Resources/Textures/Interface/Alerts/essence_counter.rsi/essence16.png		2024-03-29 11:43:30 +03:00
..
LateJoinGui.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-03-29 11:43:30 +03:00