Arthur Asimov
|
f8d4eea0dc
|
Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/GameTicking/GameTicker.StatusShell.cs
# Content.Server/RoundEnd/RoundEndSystem.cs
# Resources/Prototypes/Datasets/Names/Operation_suffix.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Maps/core.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/ServerInfo/Guidebook/Science/Robotics.xml
|
2023-12-03 15:10:26 +03:00 |
|
metalgearsloth
|
269c93245d
|
Unrevert audio (#21330)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
|
2023-11-27 22:12:34 +11:00 |
|
Morb0
|
d2a611fa56
|
Fix secrets detect in packaging
|
2023-11-17 01:52:20 +03:00 |
|
Morb0
|
949df85170
|
Update content package for Secrets
|
2023-11-09 11:58:44 +03:00 |
|
metalgearsloth
|
b9c38879e5
|
Port python packaging to Content.Packaging (#21458)
|
2023-11-07 09:53:59 +11:00 |
|