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
..
AnomalousResearch.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-04-19 02:54:06 +03:00
APE.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-04-19 02:54:06 +03:00
ArtifactReports.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-04-19 02:54:06 +03:00
Cyborgs.xml	Guidebook entry for Cyborgs (#21832)	2023-11-27 22:18:21 -05:00
MachineUpgrading.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-04-29 14:53:32 +03:00
Robotics.xml	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-12-03 15:10:26 +03:00
ScannersAndVessels.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-04-19 02:54:06 +03:00
Science.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-18 13:22:26 +03:00
Technologies.xml	Translate Upstream #1512 (#1513)	2023-10-18 23:56:11 +03:00
TraversalDistorter.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync2	2023-04-19 02:54:06 +03:00
Xenoarchaeology.xml	[Translate] Guidebooks additions (#1184)	2023-07-28 14:19:46 +03:00