Commit graph

4 commits

Author SHA1 Message Date
Morbo
ca189b0db4 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Shared/CCVar/CCVars.cs
2023-03-21 02:50:29 +03:00
deltanedas
abfac96631
fix voice mask working in pockets (#14743)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-03-19 16:41:25 -07:00
Morb
d98e077db8
TTS voice mask support (#748) 2023-01-15 07:13:18 -08:00
Flipp Syder
0385f1387c
Voice mask (#10458) 2022-09-29 12:22:27 +10:00