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
..
Antagonist	Add guidebook for revolutionaries (#20957)	2023-10-13 09:36:41 -08:00
Cargo	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-12-03 15:10:26 +03:00
Controls	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-06-26 17:34:49 +03:00
Engineering	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-22 20:22:45 +03:00
Medical	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-08 13:54:31 +03:00
Science	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-12-03 15:10:26 +03:00
Security	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-13 16:51:52 +03:00
Service	[Translate] Guidebooks (#1189)	2023-10-05 21:07:09 +03:00
Chemicals.xml	Guidebook locale (#1393)	2023-09-07 16:07:33 +03:00
Jobs.xml	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-06-26 17:34:49 +03:00
SpaceStation14.xml	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-06-26 17:34:49 +03:00
Survival.xml	Guidebook locale (#1393)	2023-09-07 16:07:33 +03:00
Writing.xml	Translate Upstream #1362 (#1366)	2023-08-27 04:45:39 +03:00