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
..
AdminSystem.cs	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-12-03 15:10:26 +03:00
AdminTestArenaSystem.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
AdminVerbSystem.Antags.cs	Add verb to spawn players on the spot (#22000)	2023-11-30 16:40:07 -05:00
AdminVerbSystem.cs	Add verb to spawn players on the spot (#22000)	2023-11-30 16:40:07 -05:00
AdminVerbSystem.Smites.cs	Remove 700 usages of Component.Owner (#21100)	2023-10-19 12:34:31 -07:00
AdminVerbSystem.Tools.cs	Move ActorComponent to shared (#21293)	2023-10-29 04:21:02 +11:00
BufferingSystem.cs	Remove 700 usages of Component.Owner (#21100)	2023-10-19 12:34:31 -07:00
BwoinkSystem.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
RejuvenateSystem.cs	Toolshed (#17895)	2023-08-02 16:09:08 -05:00