Morb0 8daf4b3f32 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/StatusIcon/antag.yml # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json # Resources/Textures/Structures/stairs.rsi/meta.json		2024-03-21 01:15:13 +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-sync	2024-03-21 01:15:13 +03:00
Cyborgs.xml	Translation fixes (#1801)	2024-01-26 15:08:44 +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