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
..
AutoEmoteSystem.cs	Remove 700 usages of Component.Owner (#21100)	2023-10-19 12:34:31 -07:00
ChatSystem.cs	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-12-03 15:10:26 +03:00
ChatSystem.Emote.cs	Fix double-emotes (#19279)	2023-08-18 23:59:23 +10:00
EmoteOnDamageSystem.cs	Refactor: Chat transmission ranges (+ a little preparation for downstream fork functionality) (#16026)	2023-05-04 12:08:08 -07:00