From 24016e0cdf26efe9116428d6ca03d19ee40784be Mon Sep 17 00:00:00 2001 From: Rinary Date: Tue, 23 Jul 2024 22:08:35 +0300 Subject: [PATCH] Fix cargo panel | fix bot craft translate --- .../Cargo/Prototypes/CargoProductPrototype.cs | 4 ++-- .../Steps/ArbitraryInsertConstructionGraphStep.cs | 11 +++++++++++ .../ru-RU/prototypes/catalog/cargo/cargoproduct.ftl | 6 ------ Resources/Prototypes/Catalog/Cargo/cargo_engines.yml | 4 ++-- Resources/Prototypes/Catalog/Cargo/cargo_vending.yml | 4 ++-- .../Prototypes/Catalog/Fills/Crates/engineering.yml | 4 ++-- 6 files changed, 19 insertions(+), 14 deletions(-) delete mode 100644 Resources/Locale/ru-RU/prototypes/catalog/cargo/cargoproduct.ftl diff --git a/Content.Shared/Cargo/Prototypes/CargoProductPrototype.cs b/Content.Shared/Cargo/Prototypes/CargoProductPrototype.cs index 7ed4e025348..af2f6613d63 100644 --- a/Content.Shared/Cargo/Prototypes/CargoProductPrototype.cs +++ b/Content.Shared/Cargo/Prototypes/CargoProductPrototype.cs @@ -38,7 +38,7 @@ public string Name if (IoCManager.Resolve().TryIndex(Product, out EntityPrototype? prototype)) { - _name = Loc.GetString($"cargoproduct-name-{prototype.Name.ToLower().Replace(" ", "-")}"); + _name = prototype.Name; } return _name; @@ -58,7 +58,7 @@ public string Description if (IoCManager.Resolve().TryIndex(Product, out EntityPrototype? prototype)) { - _description = Loc.GetString($"cargoproduct-description-{prototype.Name.ToLower().Replace(" ", "-")}"); + _description = prototype.Description; } return _description; diff --git a/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs b/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs index 7369fbf57d8..1a5a64fb3b4 100644 --- a/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs +++ b/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs @@ -39,7 +39,18 @@ public override ConstructionGuideEntry GenerateGuideEntry() { if (item.TryGetComponent(out var entityTag) && entityManager.System().HasTag(entityTag, Tag)) { + if(item.Name == "левая рука киборга-официанта") + { + nameLocale = "левая рука киборга" + } + else if(item.Name == "голова киборга-уборщика") + { + nameLocale = "голова киборга" + } + else + { nameLocale = item.Name; + } break; } } diff --git a/Resources/Locale/ru-RU/prototypes/catalog/cargo/cargoproduct.ftl b/Resources/Locale/ru-RU/prototypes/catalog/cargo/cargoproduct.ftl deleted file mode 100644 index cd7620ab7b3..00000000000 --- a/Resources/Locale/ru-RU/prototypes/catalog/cargo/cargoproduct.ftl +++ /dev/null @@ -1,6 +0,0 @@ -cargoproduct-name-emitter-crate = ящик с эмиттером -cargoproduct-description-emitter-crate = Эмиттер, использующийся в сингулярном двигателе. -cargoproduct-name-space-heater-crate = упаковка термостата -cargoproduct-description-space-heater-crate = Универсально-сборная упаковка, используемая для сборки термостата. -cargoproduct-name-condiment-station-restock-crate = ящик пополнения Островок соусов -cargoproduct-name-chefvend-restock-crate = ящик пополнения ШефВенд \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml index 390bfc6d724..1955b307ad4 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml @@ -29,9 +29,9 @@ group: market - type: cargoProduct - name: "emitter crate" + name: "ящик с эмиттером" id: EngineSingularityEmitter - description: "Contains an emitter. Used only for dangerous applications." + description: "Эмиттер, использующийся в сингулярном двигателе." icon: sprite: Structures/Power/Generation/Singularity/emitter.rsi state: emitter diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index a0bfd371d27..c8db4e734ae 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -18,7 +18,7 @@ - type: cargoProduct id: CrateVendingMachineRestockChefvend - name: ChefVend restock crate + name: ящик пополнения ШефВенд icon: sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base @@ -59,7 +59,7 @@ - type: cargoProduct id: CrateVendingMachineRestockCondimentStation - name: condiment station restock crate + name: ящик пополнения Островок соусов icon: sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml index 62d07b0beda..4676395a54b 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml @@ -209,8 +209,8 @@ - type: entity id: CrateEngineeringSpaceHeater parent: CrateEngineering - name: space heater crate - description: Contains a space heater for climate control. + name: ящик с термостатом + description: Содержит термостат для климат контроля. components: - type: StorageFill contents: