From 08691f8435445641cf1e06e16fa31ba8a6b2d352 Mon Sep 17 00:00:00 2001
From: Morb <14136326+Morb0@users.noreply.github.com>
Date: Wed, 6 Aug 2025 13:11:46 -0700
Subject: [PATCH] typo fixes for key ids (#1629)

---
 .../Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl    | 10 +++++-----
 .../_CP14/Entities/Objects/Keys/Catalog/blacksmith.yml |  4 ++--
 .../_CP14/Entities/Objects/Keys/Catalog/merchant.yml   |  8 ++++----
 .../_CP14/Entities/Objects/Keys/keyrings.yml           |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl
index 1c54034051..4f6d7f15c8 100644
--- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl
+++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl
@@ -2457,11 +2457,11 @@ ent-CP14KeyAlchemy2 = { ent-CP14KeyIronBlank }
     .desc = { ent-CP14KeyIronBlank.desc }
     .suffix = Алхимия 2
 
-ent-CP14KeyTavernBlacksmithAbstract = { ent-CP14KeyIronBlank }
+ent-CP14KeyBlacksmithAbstract = { ent-CP14KeyIronBlank }
     .desc = { ent-CP14KeyIronBlank.desc }
     .suffix = Абстракт. Кузница.
 
-ent-CP14KeyBlacksmith = { ent-CP14KeyIronBlank }
+ent-CP14KeyBlacksmith1 = { ent-CP14KeyIronBlank }
     .desc = { ent-CP14KeyIronBlank.desc }
     .suffix = Кузница 1
 
@@ -2493,15 +2493,15 @@ ent-CP14KeyTavernMerchantShopAbstract = { ent-CP14KeyIronBlank }
     .desc = { ent-CP14KeyIronBlank.desc }
     .suffix = Абстракт. Магазин торговца
 
-ent-CP14KeyMercantShop1 = { ent-CP14KeyIronBlank }
+ent-CP14KeyMerchantShop1 = { ent-CP14KeyIronBlank }
     .desc = { ent-CP14KeyIronBlank.desc }
     .suffix = Магазин торговца 1
 
-ent-CP14KeyMercantShop2 = { ent-CP14KeyIronBlank }
+ent-CP14KeyMerchantShop2 = { ent-CP14KeyIronBlank }
     .desc = { ent-CP14KeyIronBlank.desc }
     .suffix = Магазин торговца 2
 
-ent-CP14KeyMercantShop3 = { ent-CP14KeyIronBlank }
+ent-CP14KeyMerchantShop3 = { ent-CP14KeyIronBlank }
     .desc = { ent-CP14KeyIronBlank.desc }
     .suffix = Магазин торговца 3
 
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/blacksmith.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/blacksmith.yml
index bc34c6b472..5df6fe711e 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/blacksmith.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/blacksmith.yml
@@ -1,6 +1,6 @@
 - type: entity
   parent: CP14KeyIronBlank
-  id: CP14KeyTavernBlacksmithAbstract
+  id: CP14KeyBlacksmithAbstract
   suffix: Abstract Blacksmith
   components:
   - type: CP14AbstractKey
@@ -8,7 +8,7 @@
 
 - type: entity
   parent: CP14KeyIronBlank
-  id: CP14KeyBlacksmith
+  id: CP14KeyBlacksmith1
   suffix: Blacksmith 1
   components:
   - type: CP14Key
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/merchant.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/merchant.yml
index 24f7dc16a4..3e71f6de34 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/merchant.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/merchant.yml
@@ -8,7 +8,7 @@
 
 - type: entity
   parent: CP14KeyCopperBlank
-  id: CP14KeyMercantShopPublic
+  id: CP14KeyMerchantShopPublic
   suffix: Merchant public shop
   components:
   - type: CP14Key
@@ -16,7 +16,7 @@
 
 - type: entity
   parent: CP14KeyIronBlank
-  id: CP14KeyMercantShop1
+  id: CP14KeyMerchantShop1
   suffix: Merchant shop 1
   components:
   - type: CP14Key
@@ -24,7 +24,7 @@
 
 - type: entity
   parent: CP14KeyIronBlank
-  id: CP14KeyMercantShop2
+  id: CP14KeyMerchantShop2
   suffix: Merchant shop 2
   components:
   - type: CP14Key
@@ -32,7 +32,7 @@
 
 - type: entity
   parent: CP14KeyIronBlank
-  id: CP14KeyMercantShop3
+  id: CP14KeyMerchantShop3
   suffix: Merchant shop 3
   components:
   - type: CP14Key
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml
index 3056db1625..584ea84be7 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml
@@ -68,7 +68,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: CP14KeyTavernBlacksmithAbstract
+    - id: CP14KeyBlacksmithAbstract
 
 - type: entity
   parent: CP14BaseKeyRing
@@ -95,7 +95,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: CP14KeyMercantShopPublic
+    - id: CP14KeyMerchantShopPublic
     - id: CP14KeyTavernMerchantShopAbstract
 
 - type: entity