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
..
AdminUI	Content update for NetEntities (#18935)	2023-09-11 09:42:41 +10:00
FaxConstants.cs	Improve Paper UI, allow an to entity configure how it's UI looks (#13494)	2023-01-17 19:32:46 +11:00
FaxMachineComponent.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-24 22:01:46 +03:00
FaxSystem.cs	Unrevert audio (#21330)	2023-11-27 22:12:34 +11:00