From 249cad63ee3d1cd55a79371b8b6db285040f94e3 Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Fri, 14 Feb 2025 10:51:10 +0200 Subject: [PATCH] fix (#896) --- Resources/Locale/en-US/_CP14/recipe/title.ftl | 2 +- .../ru-RU/_CP14/_PROTO/entities/entities.ftl | 10 +++++----- Resources/Locale/ru-RU/_CP14/recipe/title.ftl | 2 +- .../Locale/ru-RU/_CP14/speech/speech-chatsan.ftl | 16 ---------------- .../Prototypes/Accents/word_replacements.yml | 8 -------- .../Actions/Spells/Water/T1_beer_creation.yml | 2 +- 6 files changed, 8 insertions(+), 32 deletions(-) diff --git a/Resources/Locale/en-US/_CP14/recipe/title.ftl b/Resources/Locale/en-US/_CP14/recipe/title.ftl index d984262e6a..521dc40e6d 100644 --- a/Resources/Locale/en-US/_CP14/recipe/title.ftl +++ b/Resources/Locale/en-US/_CP14/recipe/title.ftl @@ -1 +1 @@ -cp14-recipe-title-meat = Different meat +cp14-recipe-title-meat = various pieces of raw meat diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index 87979653e3..9d17470020 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -755,19 +755,19 @@ ent-CP14BaseMobGroupSpawner = пульсирующий разлом демипл ent-CP14MobGroupSpawnerZombie = { ent-CP14BaseMobGroupSpawner } .desc = { ent-CP14BaseMobGroupSpawner.desc } - .suffix = 1-3 Zombie + .suffix = 1-3 Зомби ent-CP14MobGroupSpawnerHydras = { ent-CP14BaseMobGroupSpawner } .desc = { ent-CP14BaseMobGroupSpawner.desc } - .suffix = 1-3 Hydras + .suffix = 1-3 Гидры ent-CP14MobGroupSpawnerMosquito = { ent-CP14BaseMobGroupSpawner } .desc = { ent-CP14BaseMobGroupSpawner.desc } - .suffix = 2-3 Mosquito + .suffix = 2-3 Москитов ent-CP14MobGroupSpawnerRabbits = { ent-CP14BaseMobGroupSpawner } .desc = { ent-CP14BaseMobGroupSpawner.desc } - .suffix = 2-3 Rabbits + .suffix = 2-3 Кроликов ent-CP14SpawnPointGuardCommander = командир стражи .desc = { ent-CP14SpawnPointJobBase.desc } @@ -1762,7 +1762,7 @@ ent-CP14Crayon = мелок ent-CP14CrayonWhite = белый мелок .desc = { ent-CP14Crayon.desc } -ent-CP14CrayonRainbow = магический радуждный мелок +ent-CP14CrayonRainbow = магический радужный мелок .desc = { ent-CP14Crayon.desc } ent-CP14CrayonBlack = черный мелок diff --git a/Resources/Locale/ru-RU/_CP14/recipe/title.ftl b/Resources/Locale/ru-RU/_CP14/recipe/title.ftl index 93914deba8..cb97c4fa1b 100644 --- a/Resources/Locale/ru-RU/_CP14/recipe/title.ftl +++ b/Resources/Locale/ru-RU/_CP14/recipe/title.ftl @@ -1 +1 @@ -cp14-recipe-title-meat = Разное мясо +cp14-recipe-title-meat = разные кусочки сырого мяса diff --git a/Resources/Locale/ru-RU/_CP14/speech/speech-chatsan.ftl b/Resources/Locale/ru-RU/_CP14/speech/speech-chatsan.ftl index 915492e5ab..47f0add1f5 100644 --- a/Resources/Locale/ru-RU/_CP14/speech/speech-chatsan.ftl +++ b/Resources/Locale/ru-RU/_CP14/speech/speech-chatsan.ftl @@ -170,19 +170,3 @@ cp14-chatsan-word-85 = лкм cp14-chatsan-replacement-85 = левая рука cp14-chatsan-word-86 = пкм cp14-chatsan-replacement-86 = правая рука -cp14-chatsan-word-87 = мм -cp14-chatsan-replacement-87 = меди -cp14-chatsan-word-88 = см -cp14-chatsan-replacement-88 = серебра -cp14-chatsan-word-89 = зм -cp14-chatsan-replacement-89 = золота -cp14-chatsan-word-90 = пм -cp14-chatsan-replacement-90 = платины -cp14-chatsan-word-91 = cp -cp14-chatsan-replacement-91 = меди -cp14-chatsan-word-92 = sp -cp14-chatsan-replacement-92 = серебра -cp14-chatsan-word-93 = gp -cp14-chatsan-replacement-93 = золота -cp14-chatsan-word-94 = pp -cp14-chatsan-replacement-94 = платины diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml index b9bb32d690..51c61f17bb 100644 --- a/Resources/Prototypes/Accents/word_replacements.yml +++ b/Resources/Prototypes/Accents/word_replacements.yml @@ -468,14 +468,6 @@ cp14-chatsan-word-84: cp14-chatsan-replacement-84 cp14-chatsan-word-85: cp14-chatsan-replacement-85 cp14-chatsan-word-86: cp14-chatsan-replacement-86 - cp14-chatsan-word-87: cp14-chatsan-replacement-87 - cp14-chatsan-word-88: cp14-chatsan-replacement-88 - cp14-chatsan-word-89: cp14-chatsan-replacement-89 - cp14-chatsan-word-90: cp14-chatsan-replacement-90 - cp14-chatsan-word-91: cp14-chatsan-replacement-91 - cp14-chatsan-word-92: cp14-chatsan-replacement-92 - cp14-chatsan-word-93: cp14-chatsan-replacement-93 - cp14-chatsan-word-94: cp14-chatsan-replacement-94 #CP14-ChatSanitize-End chatsan-word-1: chatsan-replacement-1 chatsan-word-2: chatsan-replacement-2 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_beer_creation.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_beer_creation.yml index 742491d7a1..d97dee5c5b 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_beer_creation.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_beer_creation.yml @@ -62,7 +62,7 @@ drop: maxVol: 10 reagents: - - ReagentId: Beer + - ReagentId: CP14DwarfBeer Quantity: 10 - type: entity