From 2ddf99007faf46151d1b67bde849f8a997e1a4b0 Mon Sep 17 00:00:00 2001 From: Tatu'd Loli <74033030+Succuberry@users.noreply.github.com> Date: Sun, 23 Jun 2024 17:38:57 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=D1=87=D0=B8=D0=BA=20=D0=B2=20=D1=81=D0=BB=D0=BE=D1=82=20=D1=88?= =?UTF-8?q?=D0=B5=D0=B8=20=D0=B8=20=D1=87=D1=83=D1=82=D1=8C-=D1=87=D1=83?= =?UTF-8?q?=D1=82=D1=8C=20ftl=20(#324)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Переводчик в слот шеи и чуть-чуть ftl * Вы ничего не видели * png --- .../ru-RU/_NF/preferences/loadout-groups.ftl | 3 ++ .../_nf/entities/clothing/back/messenger.ftl | 30 ++++++++++++++++++ .../clothing/outerclothing/hardsuits.ftl | 2 ++ .../objects/devices/holoprojectors.ftl | 5 +++ .../_nf/entities/objects/tools/umbrella.ftl | 2 ++ .../entities/objects/devices/translator.ftl | 4 +-- .../Entities/Objects/Devices/translator.yml | 3 ++ .../_NF/Loadouts/Jobs/Contractor/survival.yml | 4 --- .../Devices/translator.rsi/equipped-NECK.png | Bin 0 -> 184 bytes .../Objects/Devices/translator.rsi/meta.json | 4 +++ 10 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/tools/umbrella.ftl create mode 100644 Resources/Textures/Corvax/Objects/Devices/translator.rsi/equipped-NECK.png diff --git a/Resources/Locale/ru-RU/_NF/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/_NF/preferences/loadout-groups.ftl index 1e926785b68..98acaf046cf 100644 --- a/Resources/Locale/ru-RU/_NF/preferences/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/_NF/preferences/loadout-groups.ftl @@ -14,6 +14,9 @@ loadout-group-contractor-face = маски loadout-group-contractor-utility = инструменты loadout-group-contractor-fun = игрушки loadout-group-contractor-trinkets = прочее +loadout-group-contractor-survival-box = аварийные наборы +loadout-group-contractor-encryption-key = ключи шифрования +loadout-group-contractor-implanter = имплантеры # Security diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/clothing/back/messenger.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/clothing/back/messenger.ftl index e2b51c89e1d..9917f1cf016 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/clothing/back/messenger.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/clothing/back/messenger.ftl @@ -50,3 +50,33 @@ ent-ClothingBackpackMessengerJanitor = мессенджер уборщика .desc = Прочная сумка для борьбы с загрязнениями. ent-ClothingBackpackMessengerMime = мессенджер мима .desc = Сумка, предназначенная для тихого и выразительного искусства мимики. +ent-ClothingBackpackMessengerContractor = Сумка авантюриста + .desc = Модная сумка-мессенджер в стильной цветовой гамме. +ent-ClothingBackpackMessenger = Мессенджер + .desc = Модная сумка-мессенджер. +ent-ClothingBackpackMessengerColorWhite = белый мессенджер + .desc = { ent-ClothingBackpackMessengerContractor.desc } +ent-ClothingBackpackMessengerColorBrown = коричневый мессенджер + .desc = { ent-ClothingBackpackMessengerContractor.desc } +ent-ClothingBackpackMessengerColorBrownLight = светло-коричневый мессенджер + .desc = { ent-ClothingBackpackMessengerContractor.desc } +ent-ClothingBackpackMessengerColorPurple = фиолетовый мессенджер + .desc = { ent-ClothingBackpackMessengerContractor.desc } +ent-ClothingBackpackMessengerColorRed = красный мессенджер + .desc = { ent-ClothingBackpackMessengerContractor.desc } +ent-ClothingBackpackMessengerColorGreen = зелёный мессенджер + .desc = { ent-ClothingBackpackMessengerContractor.desc } +ent-ClothingBackpackMessengerColorBlue = синий мессенджер + .desc = { ent-ClothingBackpackMessengerContractor.desc } +ent-ClothingBackpackMessengerColorBlack = чёрный мессенджер + .desc = { ent-ClothingBackpackMessengerContractor.desc } +ent-ClothingBackpackMessengerColorOrange = оранжевый мессенджер + .desc = { ent-ClothingBackpackMessengerContractor.desc } +ent-ClothingBackpackMessengerArcadia = мессенджер аркадии + .desc = { ent-ClothingBackpackMessengerContractor.desc } +ent-ClothingBackpackMessengerChaplain = мессенджер священника + .desc = { ent-ClothingBackpackMessengerContractor.desc } +ent-ClothingBackpackMessengerChiefEngineer = мессенджер старшего инженера + .desc = { ent-ClothingBackpackMessengerContractor.desc } +ent-ClothingBackpackMessengerSr = мессенджер представителя станции + .desc = { ent-ClothingBackpackMessengerContractor.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/hardsuits.ftl index 7193b3cbe8b..83e81022509 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/hardsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/hardsuits.ftl @@ -28,3 +28,5 @@ ent-ClothingOuterHardsuitNfsdCommand = командный скафандр ДС .desc = Среднебронированный патрульный скафандр ДСБФ. ent-ClothingOuterHardsuitScaf = СКУФандр .desc = Зелено-коричневый боевой скафандр. Старый, но не бесполезный. +ent-ClothingOuterHardsuitPrivateSecurity = скафандр частной охраны + .desc = Зелено-коричневый боевой скафандр. Специализированный костюм, обеспечивающий защиту от опасностей космического пространства, используемый сотрудниками частной службы безопасности. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/devices/holoprojectors.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/devices/holoprojectors.ftl index 806f7918f20..fbbfed78490 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/devices/holoprojectors.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/devices/holoprojectors.ftl @@ -3,3 +3,8 @@ ent-HoloprojectorNfsd = проектор голобарьера ДСБФ ent-HoloprojectorNfsdEmpty = { ent-HoloprojectorSecurityEmpty } .suffix = Пустой .desc = { ent-HoloprojectorSecurityEmpty.desc } +ent-HoloGraffitiProjector = проектор голограффити + .desc = Пометьте здесь всё, дайте им знать, что вы были здесь. +ent-HoloprojectorNfsdEmpty = { ent-HoloGraffitiProjector } + .suffix = Пустой + .desc = { ent-HoloGraffitiProjector.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/tools/umbrella.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/tools/umbrella.ftl new file mode 100644 index 00000000000..e1e3404afb5 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/tools/umbrella.ftl @@ -0,0 +1,2 @@ +ent-FlashlightUmbrella = Зонт + .desc = Сохраняет вас сухим и стильным. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/translator.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/translator.ftl index 604df7b5696..0e501cf4133 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/translator.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/translator.ftl @@ -1,5 +1,5 @@ -ent-Translator = universal-translator +ent-Translator = универсальный переводчик .desc = universal-translator-desc ent-EmptyTranslator = { ent-Translator } - .suffix = Empty + .suffix = Пустой .desc = { ent-Translator.desc } diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Devices/translator.yml b/Resources/Prototypes/Corvax/Entities/Objects/Devices/translator.yml index a3ce836021b..21d5a9acec1 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Devices/translator.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Devices/translator.yml @@ -10,6 +10,9 @@ - state: icon map: ["enum.LanguageTranslatorVisuals.Layer"] - type: Appearance + - type: Clothing + slots: + - Neck - type: GenericVisualizer visuals: enum.LanguageTranslatorVisuals.Enabled: diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/survival.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/survival.yml index ea7b9e4268a..44763471e00 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/survival.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/survival.yml @@ -2,7 +2,6 @@ - type: loadout id: ContractorBoxSurvivalNFOxygen equipment: ContractorBoxSurvivalNFOxygen - name: oxygen survival box - type: startingGear id: ContractorBoxSurvivalNFOxygen @@ -13,7 +12,6 @@ - type: loadout id: ContractorBoxSurvivalNFNitrogen equipment: ContractorBoxSurvivalNFNitrogen - name: nitrogen survival box - type: startingGear id: ContractorBoxSurvivalNFNitrogen @@ -25,7 +23,6 @@ - type: loadout id: ContractorBoxSurvivalNFOxygenExtended equipment: ContractorBoxSurvivalNFOxygenExtended - name: extended-oxygen survival box effects: - !type:GroupLoadoutEffect proto: ContractorT1 @@ -40,7 +37,6 @@ - type: loadout id: ContractorBoxSurvivalNFNitrogenExtended equipment: ContractorBoxSurvivalNFNitrogenExtended - name: extended-nitrogen survival box effects: - !type:GroupLoadoutEffect proto: ContractorT1 diff --git a/Resources/Textures/Corvax/Objects/Devices/translator.rsi/equipped-NECK.png b/Resources/Textures/Corvax/Objects/Devices/translator.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..7710a05d4a34c034b60cd66acd3e29cce481050a GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL0?Z7$B>G+w-*e#8XN?e4;(GmYHGT_{i{R7 z?An8xCl2~dUg8T>_9bGQ?P|WvRW(mfoCxgy@uZH#z>O?*=d|A!y#A3E= PD@f4O)z4*}Q$iB}D;hYT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Objects/Devices/translator.rsi/meta.json b/Resources/Textures/Corvax/Objects/Devices/translator.rsi/meta.json index 82d351c1cec..a8d9c5021c2 100644 --- a/Resources/Textures/Corvax/Objects/Devices/translator.rsi/meta.json +++ b/Resources/Textures/Corvax/Objects/Devices/translator.rsi/meta.json @@ -7,6 +7,10 @@ "y": 32 }, "states": [ + { + "name": "equipped-NECK", + "directions": 4 + }, { "name": "icon", "delays": [