Morb0
|
e21ee44f9e
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/CODEOWNERS
# Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Maps/aspid.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
|
2023-09-13 16:51:52 +03:00 |
|
DrSmugleaf
|
c71f97e3a2
|
Refactor actions to be entities with components (#19900)
|
2023-09-08 18:16:05 -07:00 |
|
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 |
|