Merge branch 'master' into ed-cla-test2

This reverts commit ca288f1288.

Content.Shared/Localizations/ContentLocalizationManager.cs

@@ -9,7 +9,7 @@ namespace Content.Shared.Localizations
     {
         [Dependency] private readonly ILocalizationManager _loc = default!;
 
-        // If you want to change your codebase's language, do it here.
+        // If you want to change your codebase language, do it here.
         //public const string Culture = "en-US";
         public const string Culture = "ru-RU";
 

Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml

@@ -28,4 +28,4 @@
     - CP14EnergyCrystalSmall
   equipment:
     belt1: CP14WalletFilledTest
-    keys: CP14KeyRingInnkeeper
+    #keys: CP14KeyRingInnkeeper