Morb0 e21ee44f9e Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Resources/Prototypes/Datasets/verbs.yml # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml # Resources/Prototypes/Maps/aspid.yml # Resources/Prototypes/Maps/barratry.yml # Resources/Prototypes/Maps/cluster.yml # Resources/Prototypes/Maps/kettle.yml # Resources/Prototypes/Maps/origin.yml # Resources/ServerInfo/Guidebook/Cargo/Salvage.xml # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json		2023-09-13 16:51:52 +03:00
..
Antagonist	ninja 2 electric boogaloo (#15534)	2023-09-10 16:20:27 +10:00
Cargo	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-13 16:51:52 +03:00
Controls	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-06-26 17:34:49 +03:00
Engineering	Guidebook locale (#1393)	2023-09-07 16:07:33 +03:00
Medical	gbookcommits (#17611)	2023-06-24 14:07:25 -06:00
Science	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-13 05:40:29 +03:00
Security	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-13 16:51:52 +03:00
Service	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-02 15:13:51 +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