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 |
|
metalgearsloth
|
5a0fc68be2
|
Content update for NetEntities (#18935)
|
2023-09-11 09:42:41 +10:00 |
|
DrSmugleaf
|
c71f97e3a2
|
Refactor actions to be entities with components (#19900)
|
2023-09-08 18:16:05 -07:00 |
|
Morb0
|
5277dceed2
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/CODEOWNERS
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
|
2023-08-24 22:01:46 +03:00 |
|
DrSmugleaf
|
a88e747a0b
|
Refactor serialization copying to use source generators (#19412)
|
2023-08-22 18:14:33 -07:00 |
|
faint
|
076d2e339b
|
Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
# Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
# Content.Client/LateJoin/LateJoinGui.cs
# Content.Client/Power/PowerMonitoringWindow.xaml.cs
# Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png
# RobustToolbox
|
2023-07-10 07:03:24 +03:00 |
|
TemporalOroboros
|
3ac4cf85db
|
Cleaner BoundUserInterfaces (#17736)
|
2023-07-09 02:02:17 +10:00 |
|
Morbo
|
8cdd0cda60
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Server Info/Guidebook/Controls/Controls.xml
|
2023-02-12 03:57:54 +03:00 |
|
Chief-Engineer
|
5c06c4c3ef
|
Add voice changer logs (#14040)
* add set voice log
* add used identity to chat message logs
* please tell me there's a better way
|
2023-02-11 19:26:44 +00:00 |
|
Morb
|
d98e077db8
|
TTS voice mask support (#748)
|
2023-01-15 07:13:18 -08:00 |
|
Leon Friedrich
|
881a2b2ece
|
PopupSystem public methods rejig (#12830)
|
2022-12-19 08:41:47 +11:00 |
|
Flipp Syder
|
0385f1387c
|
Voice mask (#10458)
|
2022-09-29 12:22:27 +10:00 |
|