From dec7632cc513b964fdd0cda8b5edc0ccd024f1e4 Mon Sep 17 00:00:00 2001 From: AnderFan Date: Sat, 9 Mar 2024 19:41:34 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D1=84=D0=B0?= =?UTF-8?q?=D0=B9=D0=BB=D1=8B-=D0=B4=D1=83=D0=B1=D0=BB=D1=91=D1=80=D1=8B?= =?UTF-8?q?=20=D1=83=D1=80=D0=B8=D1=81=D1=82=D0=BE=D0=B2=20=D0=B0=D1=80?= =?UTF-8?q?=D0=BA=D0=B0=D0=BD=D1=8B=20=D0=B8=20=D0=BD=D0=B8=D0=B0=D0=BD?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prototypes/{adt/demon => entities}/mobs/player/demon.ftl | 0 .../prototypes/{adt/demon => entities}/mobs/species/demon.ftl | 0 .../ru-RU/ss14-ru/prototypes/adt/demon/mobs/player/demon.ftl | 2 -- .../ru-RU/ss14-ru/prototypes/adt/demon/mobs/species/demon.ftl | 4 ---- .../ss14-ru/prototypes/adt/moth/entities/mobs/player/moth.ftl | 2 -- .../prototypes/adt/moth/entities/mobs/species/moth.ftl | 4 ---- .../ru-RU/ss14-ru/prototypes/entities/mobs/species/demon.ftl | 3 +++ .../ru-RU/ss14-ru/prototypes/entities/mobs/species/drask.ftl | 2 ++ .../ss14-ru/prototypes/entities/mobs/species/gingerbread.ftl | 2 ++ .../ru-RU/ss14-ru/prototypes/entities/mobs/species/kobalt.ftl | 4 ++-- .../ru-RU/ss14-ru/prototypes/entities/mobs/species/ursus.ftl | 2 ++ 11 files changed, 11 insertions(+), 14 deletions(-) rename Resources/Locale/en-US/ss14-ru/prototypes/{adt/demon => entities}/mobs/player/demon.ftl (100%) rename Resources/Locale/en-US/ss14-ru/prototypes/{adt/demon => entities}/mobs/species/demon.ftl (100%) delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/adt/demon/mobs/player/demon.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/adt/demon/mobs/species/demon.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/adt/moth/entities/mobs/player/moth.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/adt/moth/entities/mobs/species/moth.ftl diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/adt/demon/mobs/player/demon.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/demon.ftl similarity index 100% rename from Resources/Locale/en-US/ss14-ru/prototypes/adt/demon/mobs/player/demon.ftl rename to Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/demon.ftl diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/adt/demon/mobs/species/demon.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/species/demon.ftl similarity index 100% rename from Resources/Locale/en-US/ss14-ru/prototypes/adt/demon/mobs/species/demon.ftl rename to Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/species/demon.ftl diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/demon/mobs/player/demon.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/demon/mobs/player/demon.ftl deleted file mode 100644 index 57847303219..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/demon/mobs/player/demon.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-MobDemon = Urisst' Mzhand Demon - .desc = { ent-BaseMobDemon.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/demon/mobs/species/demon.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/demon/mobs/species/demon.ftl deleted file mode 100644 index d07b87e90b4..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/demon/mobs/species/demon.ftl +++ /dev/null @@ -1,4 +0,0 @@ -ent-BaseMobDemon = Urisst' Mzhand Demon - .desc = { ent-BaseMobSpecies.desc } -ent-MobDemonDummy = Urist McHands - .desc = A dummy reptilian meant to be used in character setup. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/moth/entities/mobs/player/moth.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/moth/entities/mobs/player/moth.ftl deleted file mode 100644 index 920f7bc3868..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/moth/entities/mobs/player/moth.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-MobMoth = Урист МакНиан - .desc = { ent-BaseMobMoth.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/moth/entities/mobs/species/moth.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/moth/entities/mobs/species/moth.ftl deleted file mode 100644 index 4dc67e686e5..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/moth/entities/mobs/species/moth.ftl +++ /dev/null @@ -1,4 +0,0 @@ -ent-BaseMobMoth = Урист МакНиан - .desc = { ent-BaseMobSpecies.desc } -ent-MobMothDummy = Urist McFluff - .desc = A dummy moth meant to be used in character setup. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/demon.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/demon.ftl index 228243752cb..9e9cb9c5a4c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/demon.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/demon.ftl @@ -1,3 +1,6 @@ ent-BaseMobDemon = Урист МакАркана .desc = { ent-BaseMobSpeciesOrganic.desc } .suffix = Аркана +ent-MobDemonDummy = { ent-BaseSpeciesDummy } + .desc = { ent-BaseSpeciesDummy.desc } + diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/drask.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/drask.ftl index 404e41dc42a..1d985504e9a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/drask.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/drask.ftl @@ -1,3 +1,5 @@ ent-BaseMobDrask = Урист МакДраск .desc = { ent-BaseMobSpeciesOrganic.desc } .suffix = Драск +ent-MobDraskDummy = { ent-BaseSpeciesDummy } + .desc = { ent-BaseSpeciesDummy.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/gingerbread.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/gingerbread.ftl index 6156aa9544f..1d8de290988 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/gingerbread.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/gingerbread.ftl @@ -1,3 +1,5 @@ ent-BaseMobGingerbread = Урист МакПряник .desc = { ent-BaseMobSpeciesOrganic.desc } .suffix = Пряник +ent-MobGingerbreadDummy = { ent-BaseSpeciesDummy } + .desc = { ent-BaseSpeciesDummy.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/kobalt.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/kobalt.ftl index fa899d72f03..f843e077d1f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/kobalt.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/kobalt.ftl @@ -1,4 +1,4 @@ ent-BaseMobKobolt = Урист МакКобольд .desc = { ent-BaseMobSpecies.desc } -ent-MobKoboltDummy = Urist McHands - .desc = A dummy reptilian meant to be used in character setup. +ent-MobKoboltDummy = Урист МакКобольд + .desc = { ent-BaseSpeciesDummy.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/ursus.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/ursus.ftl index e4f039c2e36..bbd2be219ef 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/ursus.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/ursus.ftl @@ -1,3 +1,5 @@ ent-BaseMobUrsus = Урист МакУрса .desc = { ent-BaseMobSpeciesOrganic.desc } .suffix = Урса +ent-MobUrsusDummy = { ent-MobHumanDummy } + .desc = { ent-MobHumanDummy.desc }