NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Shared/VoiceMask
History
Exact
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
..
SharedVoiceMaskSystem.cs Merge remote-tracking branch 'upstream/master' into upstream-sync 2024-03-29 11:43:30 +03:00
VoiceMaskSetNameEvent.cs Refactor actions to be entities with components (#19900) 2023-09-08 18:16:05 -07:00