Morb0 caf8ac8005 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml # Resources/Textures/Objects/Tools/crowbar.rsi/meta.json # Resources/Textures/Objects/Tools/wrench.rsi/meta.json		2023-12-08 13:54:31 +03:00
..
AdvancedBrute.xml	3 New Brute Chemicals (And Razorium) (#22103)	2023-12-06 22:05:29 -05:00
Botanicals.xml	[Translate] Guidebooks (#1189)	2023-10-05 21:07:09 +03:00
Chemist.xml	[Translate] Guidebooks (#1189)	2023-10-05 21:07:09 +03:00
Cloning.xml	[Translate] Guidebooks (#1189)	2023-10-05 21:07:09 +03:00
Cryogenics.xml	[Translate] Guidebooks (#1189)	2023-10-05 21:07:09 +03:00
Medical.xml	[Translate] Guidebooks (#1189)	2023-10-05 21:07:09 +03:00
MedicalDoctor.xml	[Translate] Guidebooks (#1189)	2023-10-05 21:07:09 +03:00
Medicine.xml	[Translate] Guidebooks (#1189)	2023-10-05 21:07:09 +03:00