From 3ec612d134fe0ddd171b5991a3d9baf51def6401 Mon Sep 17 00:00:00 2001 From: Evgencheg <73418250+Evgencheg@users.noreply.github.com> Date: Sat, 5 Oct 2024 13:33:45 +0300 Subject: [PATCH] Fixes (#244) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * фиксы * миграции * Update languages.yml --- .../chat/managers/custom-chat-manager.ftl | 47 +++++++++++++--- .../deltav/prototypes/access/accesses.ftl | 2 +- .../catalog/fills/crates/security.ftl | 4 -- .../deltav/catalog/fills/crates/armory.ftl | 10 ++-- Resources/Locale/nl-NL/gereedschap.ftl | 10 ---- .../chat/managers/custom-chat-manager.ftl | 47 +++++++++++++--- Resources/Locale/ru-RU/corvax/chat/emotes.ftl | 3 -- .../deltav/prototypes/access/accesses.ftl | 2 +- Resources/Locale/ru-RU/language/languages.ftl | 2 +- .../entities/clothing/outerclothing/NPZ.ftl | 2 +- .../catalog/fills/crates/security.ftl | 4 -- .../Migrations/LostParadiseMigrations.yml | 9 ++++ .../Catalog/Cargo/cargo_security.yml | 38 ++++++------- .../Catalog/Fills/Crates/security.yml | 38 ++++++------- .../VendingMachines/Inventories/cart.yml | 36 +++---------- Resources/Prototypes/Datasets/tips.yml | 2 +- .../Prototypes/DeltaV/Voice/speech_emotes.yml | 22 ++++---- .../Markings/kemonomimi_ears.yml | 6 ++- .../Markings/kemonomimi_tails.yml | 11 +++- .../Nyanotrasen/Voice/speech_emotes.yml | 10 ++-- Resources/Prototypes/Voice/disease_emotes.yml | 16 +++--- Resources/Prototypes/Voice/speech_emotes.yml | 53 ++++++++----------- .../Entities/Objects/Devices/TacticalShop.yml | 2 +- .../Roles/Jobs/Command/adjutant.yml | 3 -- .../_LostParadise/Traits/languages.yml | 28 ++++++++-- Tools/ss14_ru/yamlextractor.py | 1 - 26 files changed, 234 insertions(+), 174 deletions(-) delete mode 100644 Resources/Locale/nl-NL/gereedschap.ftl diff --git a/Resources/Locale/en-US/_LostParadise/chat/managers/custom-chat-manager.ftl b/Resources/Locale/en-US/_LostParadise/chat/managers/custom-chat-manager.ftl index aa1434fd4f3..082dfc0f106 100644 --- a/Resources/Locale/en-US/_LostParadise/chat/managers/custom-chat-manager.ftl +++ b/Resources/Locale/en-US/_LostParadise/chat/managers/custom-chat-manager.ftl @@ -1,8 +1,43 @@ chat-speech-verb-tajaran-1 = мяукает chat-speech-verb-tajaran-2 = мурлычет -chat-emote-name-buzz = Жужжит -chat-emote-name-beep = Бип -chat-emote-name-chime = Звонит -chat-emote-name-buzztwo = Двойное жужжание! -chat-emote-name-ping = Пинг -chat-emote-name-robotbeep = Издает роботизированные звуки +chat-emote-msg-robotbeep = бипает +chat-emote-msg-boop = бупает +chat-emote-msg-scream = кричит! +chat-emote-msg-laugh = смеётся +chat-emote-msg-honk = хонкает +chat-emote-msg-sigh = вздыхает +chat-emote-msg-whistle = свистит +chat-emote-msg-crying = плачет +chat-emote-msg-squish = хлюпает +chat-emote-msg-chitter = щебечет +chat-emote-msg-squeak = пищит +chat-emote-msg-click = клацает +chat-emote-msg-clap = хлопает! +chat-emote-msg-snap = щёлкает пальцами +chat-emote-msg-salute = салютует +chat-emote-msg-gasp = задыхается. +chat-emote-msg-buzz = жужжит! +chat-emote-msg-chirp = щебечет! +chat-emote-msg-beep = пищит. +chat-emote-msg-chime = издаёт звон. +chat-emote-msg-buzzestwo = издаёт бип-буп. +chat-emote-msg-ping = издаёт пинг. +chat-emote-msg-whine = скулит +chat-emote-msg-sneeze = чихает +chat-emote-msg-cough = кашляет +chat-emote-msg-catmeow = мяукает +chat-emote-msg-meow = мяукает +chat-emote-msg-cathisses = шипит +chat-emote-msg-hisses = шипит +chat-emote-msg-monkeyscreeches = визжит +chat-emote-msg-yawn = зевает +chat-emote-msg-snore = храпит +chat-emote-msg-purrs = мурлыкает +chat-emote-msg-mews = мавает +chat-emote-msg-snarl = ворчит +chat-emote-msg-bark = лает +chat-emote-msg-harpycaw = каркает +chat-emote-msg-harpyrev = ревет +chat-emote-msg-harpybang = бабахает +chat-emote-msg-harpypew = стреляет +chat-emote-msg-harpyring = звенит diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl index 3ebfe8bf1b1..1ea79f2c16d 100644 --- a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl @@ -1,6 +1,6 @@ id-card-access-level-orders = Orders id-card-access-level-mantis = Mantis -id-card-access-level-chief-justice = Chief Justice +id-card-access-level-cj = Chief Justice id-card-access-level-prosecutor = Prosecutor id-card-access-level-justice = Justice id-card-access-level-corpsman = Corpsman diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/security.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/security.ftl index 6040be0f867..dbb6a4a9b38 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/security.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/security.ftl @@ -14,7 +14,3 @@ ent-CrateSecurityBiosuit = security bio suit crate .desc = Contains 2 biohazard suits to ensure that no disease will distract you from your duties. Requires Security access to open. ent-CrateSecurityTrackingMindshieldImplants = implanter crate .desc = Contains 4 MindShield implants and 4 tracking implant. Requires Security access to open. -ent-CrateSecurityShanlinTacsuit = shanlin tacsuit crate - .desc = Contains a single CSA-51a Shanlin tacsuit. Requires Security access to open. -ent-CrateSecurityGuanYuTacsuit = shanlin tacsuit crate - .desc = Contains a single CSA-80UA Guan-Yu tacsuit. Requires Security access to open. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/catalog/fills/crates/armory.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/catalog/fills/crates/armory.ftl index 4834d7b0641..47798297283 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/catalog/fills/crates/armory.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/catalog/fills/crates/armory.ftl @@ -1,10 +1,10 @@ -ent-CrateArmoryGrand = { ent-CrateWeaponSecure } +ent-CrateArmoryGrand = Ящик с Марк 1 .desc = { ent-CrateWeaponSecure.desc } -ent-CrateArmoryUniversal = { ent-CrateWeaponSecure } +ent-CrateArmoryUniversal = Ящик с МК32 "Универсал" .desc = { ent-CrateWeaponSecure.desc } -ent-CrateArmoryAdjutant = { ent-CrateWeaponSecure } +ent-CrateArmoryAdjutant = Ящик с Адъютантами .desc = { ent-CrateWeaponSecure.desc } -ent-CrateArmoryEnergyGun = { ent-CrateWeaponSecure } +ent-CrateArmoryEnergyGun = Ящик с энергетическими винтовками .desc = { ent-CrateWeaponSecure.desc } -ent-CrateArmoryEnergyGunMini = { ent-CrateWeaponSecure } +ent-CrateArmoryEnergyGunMini = Ящик с миниатюрными энергетическими пистолетами .desc = { ent-CrateWeaponSecure.desc } diff --git a/Resources/Locale/nl-NL/gereedschap.ftl b/Resources/Locale/nl-NL/gereedschap.ftl deleted file mode 100644 index e9d8697102b..00000000000 --- a/Resources/Locale/nl-NL/gereedschap.ftl +++ /dev/null @@ -1,10 +0,0 @@ -ent-Wrench = moersleutel - .desc = Een veelgebruikt stuk gereedschap voor montage en demontage. - .suffix = Test - -ent-Crowbar = koevoet - .desc = Een multifunctioneel stuk gereedschap om deuren open te wrikken en interdimensionale indringers te bestrijden. - -ent-CrowbarRed = - .desc = Een multifunctioneel stuk gereedschap om deuren open te wrikken en interdimensionale indringers te bestrijden. Deze is bedoeld voor Noodgevallen. - .suffix = Noodgeval diff --git a/Resources/Locale/ru-RU/_LostParadise/chat/managers/custom-chat-manager.ftl b/Resources/Locale/ru-RU/_LostParadise/chat/managers/custom-chat-manager.ftl index aa1434fd4f3..082dfc0f106 100644 --- a/Resources/Locale/ru-RU/_LostParadise/chat/managers/custom-chat-manager.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/chat/managers/custom-chat-manager.ftl @@ -1,8 +1,43 @@ chat-speech-verb-tajaran-1 = мяукает chat-speech-verb-tajaran-2 = мурлычет -chat-emote-name-buzz = Жужжит -chat-emote-name-beep = Бип -chat-emote-name-chime = Звонит -chat-emote-name-buzztwo = Двойное жужжание! -chat-emote-name-ping = Пинг -chat-emote-name-robotbeep = Издает роботизированные звуки +chat-emote-msg-robotbeep = бипает +chat-emote-msg-boop = бупает +chat-emote-msg-scream = кричит! +chat-emote-msg-laugh = смеётся +chat-emote-msg-honk = хонкает +chat-emote-msg-sigh = вздыхает +chat-emote-msg-whistle = свистит +chat-emote-msg-crying = плачет +chat-emote-msg-squish = хлюпает +chat-emote-msg-chitter = щебечет +chat-emote-msg-squeak = пищит +chat-emote-msg-click = клацает +chat-emote-msg-clap = хлопает! +chat-emote-msg-snap = щёлкает пальцами +chat-emote-msg-salute = салютует +chat-emote-msg-gasp = задыхается. +chat-emote-msg-buzz = жужжит! +chat-emote-msg-chirp = щебечет! +chat-emote-msg-beep = пищит. +chat-emote-msg-chime = издаёт звон. +chat-emote-msg-buzzestwo = издаёт бип-буп. +chat-emote-msg-ping = издаёт пинг. +chat-emote-msg-whine = скулит +chat-emote-msg-sneeze = чихает +chat-emote-msg-cough = кашляет +chat-emote-msg-catmeow = мяукает +chat-emote-msg-meow = мяукает +chat-emote-msg-cathisses = шипит +chat-emote-msg-hisses = шипит +chat-emote-msg-monkeyscreeches = визжит +chat-emote-msg-yawn = зевает +chat-emote-msg-snore = храпит +chat-emote-msg-purrs = мурлыкает +chat-emote-msg-mews = мавает +chat-emote-msg-snarl = ворчит +chat-emote-msg-bark = лает +chat-emote-msg-harpycaw = каркает +chat-emote-msg-harpyrev = ревет +chat-emote-msg-harpybang = бабахает +chat-emote-msg-harpypew = стреляет +chat-emote-msg-harpyring = звенит diff --git a/Resources/Locale/ru-RU/corvax/chat/emotes.ftl b/Resources/Locale/ru-RU/corvax/chat/emotes.ftl index 71085c91a0a..fce348ac2d4 100644 --- a/Resources/Locale/ru-RU/corvax/chat/emotes.ftl +++ b/Resources/Locale/ru-RU/corvax/chat/emotes.ftl @@ -1,6 +1,3 @@ -# Имена -chat-emote-name-howl = Выть -chat-emote-name-growl = Рычать # Сообщение chat-emote-msg-howl = воет chat-emote-msg-growl = рычит diff --git a/Resources/Locale/ru-RU/deltav/prototypes/access/accesses.ftl b/Resources/Locale/ru-RU/deltav/prototypes/access/accesses.ftl index 58d3bccd77a..27a4c3e8695 100644 --- a/Resources/Locale/ru-RU/deltav/prototypes/access/accesses.ftl +++ b/Resources/Locale/ru-RU/deltav/prototypes/access/accesses.ftl @@ -1,6 +1,6 @@ id-card-access-level-orders = Заказы id-card-access-level-mantis = Мантис -id-card-access-level-chief-justice = Верховный судья +id-card-access-level-cj = Верховный судья id-card-access-level-prosecutor = Прокурор id-card-access-level-justice = Суд id-card-access-level-corpsman = Полевой Врач diff --git a/Resources/Locale/ru-RU/language/languages.ftl b/Resources/Locale/ru-RU/language/languages.ftl index bb6632aba64..5320603551a 100644 --- a/Resources/Locale/ru-RU/language/languages.ftl +++ b/Resources/Locale/ru-RU/language/languages.ftl @@ -32,7 +32,7 @@ language-Elyran-description = Влияние всех трёх этих языков прослеживается в его грамматике и словарном составе. language-Canilunzt-name = Канилунц language-Canilunzt-description = Гортанный язык, на котором говорят и используют обитатели системы Ваззенда, состоящий из рычания, лая, тявканья и интенсивного использования движений ушей и хвоста, вулпканины говорят на этом языке с легкостью. -language-Moffic-name = Мольный +language-Moffic-name = Ткачий language-Moffic-description = Язык народа мотыльков граничит с полной неразборчивостью. language-RobotTalk-name = Робоязык language-RobotTalk-description = Язык, состоящий из резких бинарных звуков - чириканья, свиста, шипения и завывания. Органические языки не могут говорить на нем без помощи специальных переводчиков. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/NPZ.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/NPZ.ftl index 4e270d4cd67..1b936a7b61b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/NPZ.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/NPZ.ftl @@ -17,4 +17,4 @@ ent-LPPClothingOuterCoatNPZ = Куртка с символикой НПЗ ent-LPPClothingOuterArmorNPZ = Бронежилет с символикой НПЗ .desc = Бронежилет с опознавательными элементами НПЗ. ent-LPPClothingOuterNPZRepresentative = Тренч представителя НПЗ - .desc =Кожаный тренч с пуленепробиваемым жилетом. Оно кричит- "Стильно!". + .desc = Кожаный тренч с пуленепробиваемым жилетом. Оно кричит - "Стильно!". diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/security.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/security.ftl index d2928df4fcb..051cdf471b6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/security.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/security.ftl @@ -14,7 +14,3 @@ ent-CrateSecurityBiosuit = Ящик биозащитных костюмов СБ .desc = Содержит 2 костюма биологической защиты, чтобы никакая зараза не отвлекала вас от исполнения своего долга. Чтобы открыть, необходим уровень доступа Служба безопасности. ent-CrateSecurityTrackingMindshieldImplants = Ящик имплантеров .desc = { ent-CrateSecgear.desc } -ent-CrateSecurityShanlinTacsuit = Ящик скафандров NTSA - .desc = Содержит один скафандр NTSA-122. Требует доступ службы безопасности для открытия. -ent-CrateSecurityGuanYuTacsuit = Ящик скафандров NTSA - .desc = Содержит один скафандр NTSA-126. Требует доступ службы безопасности для открытия. diff --git a/Resources/Migrations/LostParadiseMigrations.yml b/Resources/Migrations/LostParadiseMigrations.yml index 8f2ec6981ce..b04a05cfcf7 100644 --- a/Resources/Migrations/LostParadiseMigrations.yml +++ b/Resources/Migrations/LostParadiseMigrations.yml @@ -52,3 +52,12 @@ LPPOrangefox: PlushieOrangeFox LPPPinkfox: PlushiePinkFox LPPPurplefox: PlushiePurpleFox LPPRedfox: PlushieRedFox +LockerExpeditorFilled: LPPLockerExpeditorFilled +LPPHandcuffsSpac: null +ClothingLPPKblindfoldTeal: LPPClothingKblindfoldTeal +FluffyApple: LPPFluffyApple +FluffyLatte: LPPFluffyLatte +FluffyMango: LPPFluffyMango +FluffyStan: LPPFluffyStan +FluffyWatermelon: LPPFluffyWatermelon +RingBox: LPPRingBox diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml index 4133d78d163..64d59925a46 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml @@ -78,22 +78,22 @@ category: cargoproduct-category-name-security group: market -- type: cargoProduct - id: SecurityShanlinTacsuit - icon: - sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi - state: icon - product: CrateSecurityShanlinTacsuit - cost: 17500 - category: cargoproduct-category-name-security - group: market - -- type: cargoProduct - id: SecurityGuanYuTacsuit - icon: - sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/juggernaut.rsi - state: icon - product: CrateSecurityGuanYuTacsuit - cost: 30000 - category: cargoproduct-category-name-security - group: market +#- type: cargoProduct +# id: SecurityShanlinTacsuit +# icon: +# sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi +# state: icon +# product: CrateSecurityShanlinTacsuit +# cost: 17500 +# category: cargoproduct-category-name-security +# group: market +# +#- type: cargoProduct +# id: SecurityGuanYuTacsuit +# icon: +# sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/juggernaut.rsi +# state: icon +# product: CrateSecurityGuanYuTacsuit +# cost: 30000 +# category: cargoproduct-category-name-security +# group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml index e0728a14613..5b174fd3b92 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml @@ -114,24 +114,24 @@ - id: TrackingImplanter amount: 4 -- type: entity - id: CrateSecurityShanlinTacsuit - parent: CrateSecgear - name: shanlin tacsuit crate - description: Contains a single CSA-51a Shanlin tacsuit. Requires Security access to open. - components: - - type: StorageFill - contents: - - id: ClothingOuterHardsuitSyndieReverseEngineered - -- type: entity - id: CrateSecurityGuanYuTacsuit - parent: CrateSecgear - name: shanlin tacsuit crate - description: Contains a single CSA-80UA Guan-Yu tacsuit. Requires Security access to open. - components: - - type: StorageFill - contents: - - id: ClothingOuterHardsuitJuggernautReverseEngineered +#- type: entity +# id: CrateSecurityShanlinTacsuit +# parent: CrateSecgear +# name: shanlin tacsuit crate +# description: Contains a single CSA-51a Shanlin tacsuit. Requires Security access to open. +# components: +# - type: StorageFill +# contents: +# - id: ClothingOuterHardsuitSyndieReverseEngineered +# +#- type: entity +# id: CrateSecurityGuanYuTacsuit +# parent: CrateSecgear +# name: shanlin tacsuit crate +# description: Contains a single CSA-80UA Guan-Yu tacsuit. Requires Security access to open. +# components: +# - type: StorageFill +# contents: +# - id: ClothingOuterHardsuitJuggernautReverseEngineered # Cosmetic Crates diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml index b1dd76f2c3e..3db0ba9a6b3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml @@ -3,23 +3,11 @@ startingInventory: PassengerPDA: 5 ClearPDA: 5 - # Basic Department PDAs - SecurityPDA: 2 - SecurityCadetPDA: 4 - MedicalPDA: 2 - MedicalInternPDA: 4 - EngineerPDA: 2 - TechnicalAssistantPDA: 4 - SciencePDA: 2 - ResearchAssistantPDA: 4 - CargoPDA: 2 - SalvagePDA: 2 - # HOP's service department - ServiceWorkerPDA: 4 - ChefPDA: 2 - BotanistPDA: 2 - BartenderPDA: 2 - JanitorPDA: 2 + ServiceWorkerPDA: 1 + ChefPDA: 1 + BotanistPDA: 1 + BartenderPDA: 1 + JanitorPDA: 1 LibrarianPDA: 1 LawyerPDA: 1 ReporterPDA: 1 @@ -28,18 +16,10 @@ ClownPDA: 1 MimePDA: 1 MusicianPDA: 1 - ClothingHeadsetGrey: 5 + ClothingHeadsetGrey: 4 ClothingHeadsetService: 4 - ClothingHeadsetCargo: 2 - ClothingHeadsetEngineering: 2 - ClothingHeadsetMedical: 2 - ClothingHeadsetScience: 2 + EncryptionKeyService: 4 + EncryptionKeyCommon: 4 RubberStampApproved: 1 RubberStampDenied: 1 Paper: 10 - EncryptionKeyCargo: 2 - EncryptionKeyEngineering: 2 - EncryptionKeyMedical: 2 - EncryptionKeyScience: 2 - EncryptionKeySecurity: 2 - EncryptionKeyService: 4 diff --git a/Resources/Prototypes/Datasets/tips.yml b/Resources/Prototypes/Datasets/tips.yml index bf61ac0d0ba..cbdcc923111 100644 --- a/Resources/Prototypes/Datasets/tips.yml +++ b/Resources/Prototypes/Datasets/tips.yml @@ -23,7 +23,7 @@ - "Химикаты не вступают в реакцию, находясь в буфере ChemMaster." - "Не злите бармена, бросая его стаканы! Вежливо поставьте их на стол, нажав Q." - "По умолчанию вы можете удерживать ПРОБЕЛ, чтобы замедлить движение шаттла при пилотировании, чтобы обеспечить точные движения или даже полную остановку." - - "Дексалин, Дексалин Плюс и Эпинефрин при метаболизме выведут токсин сердцееда из вашего кровотока." + - "Дексалин, Дексалин Плюс и Эпинефрин при метаболизме выведут Токсин Хартбрейкер из вашего кровотока." - "Каждый член экипажа имеет в своем ящике для выживания экстренный медикамент, содержащий эпинефрин и транексамовую кислоту." - "ДАМ является высокоприоритетной целью и легко саботируется. Убедитесь, что вы установили Сингулярность или Солнечные панели так, чтобы не остаться без энергии, если он взорвется." - "Во время теслалуза убедитесь, что избавились от всех электронных предметов, чтобы не стать мишенью." diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml index 1d5ea2a780c..199a0a63884 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml @@ -1,7 +1,7 @@ - type: emote id: HarpyRing category: Vocal - chatMessages: [ звенит ] + chatMessages: [ chat-emote-msg-harpypew ] chatTriggers: - rings - звенит @@ -10,7 +10,7 @@ - type: emote id: HarpyPew category: Vocal - chatMessages: [ стреляет ] + chatMessages: [ chat-emote-msg-harpyring ] chatTriggers: - pews - pewpews @@ -20,7 +20,7 @@ - type: emote id: HarpyBang category: Vocal - chatMessages: [ бабахает ] + chatMessages: [ chat-emote-msg-harpybang ] chatTriggers: - bangs - бабахает @@ -31,16 +31,16 @@ - type: emote id: HarpyRev category: Vocal - chatMessages: [ шумит ] + chatMessages: [ chat-emote-msg-harpyrev ] chatTriggers: - revs - - шумит - - шумит. + - ревет + - ревет. - type: emote id: HarpyCaw category: Vocal - chatMessages: [ каркает ] + chatMessages: [ chat-emote-msg-harpycaw ] chatTriggers: - caws - каркает @@ -51,7 +51,7 @@ - type: emote id: Bark category: Vocal - chatMessages: [ лает ] + chatMessages: [ chat-emote-msg-bark ] chatTriggers: - barks - лает @@ -63,7 +63,7 @@ - type: emote id: Snarl category: Vocal - chatMessages: [ ворчит ] + chatMessages: [ chat-emote-msg-snarl ] chatTriggers: - snarls - snarls. @@ -73,7 +73,7 @@ - type: emote id: Whine category: Vocal - chatMessages: [ скулит ] + chatMessages: [ chat-emote-msg-whine ] chatTriggers: - whines - скулит @@ -82,7 +82,7 @@ - type: emote id: Howl category: Vocal - chatMessages: [ воет ] + chatMessages: [ chat-emote-msg-howl ] chatTriggers: - howls - воет diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_ears.yml index 66b4b5242c5..073fd91722a 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_ears.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_ears.yml @@ -3,6 +3,7 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [Human] + sponsorOnly: true coloring: default: type: @@ -19,6 +20,7 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [Human] + sponsorOnly: true coloring: default: type: @@ -42,6 +44,7 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [Human] + sponsorOnly: true coloring: default: type: @@ -58,6 +61,7 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [Human] + sponsorOnly: true coloring: default: type: @@ -74,4 +78,4 @@ - sprite: Mobs/Customization/kemonomimi-ears.rsi state: goathornstone1 - sprite: Mobs/Customization/kemonomimi-ears.rsi - state: goathornstone2 \ No newline at end of file + state: goathornstone2 diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_tails.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_tails.yml index d45d366ec04..ee04a00958d 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_tails.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_tails.yml @@ -3,6 +3,7 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [Human] + sponsorOnly: true coloring: default: type: @@ -21,6 +22,7 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [Human] + sponsorOnly: true coloring: default: type: @@ -41,6 +43,7 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [Human] + sponsorOnly: true coloring: default: type: @@ -59,6 +62,7 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [Human] + sponsorOnly: true coloring: default: type: @@ -79,6 +83,7 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [Human] + sponsorOnly: true coloring: default: type: @@ -99,6 +104,7 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [Human] + sponsorOnly: true coloring: default: type: @@ -117,6 +123,7 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [Human] + sponsorOnly: true coloring: default: type: @@ -135,6 +142,7 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [Human] + sponsorOnly: true coloring: default: type: @@ -153,6 +161,7 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [Human] + sponsorOnly: true coloring: default: type: @@ -166,4 +175,4 @@ - sprite: Mobs/Customization/kemonomimi-tails.rsi state: tasseltailtone1 - sprite: Mobs/Customization/kemonomimi-tails.rsi - state: tasseltailtone2 \ No newline at end of file + state: tasseltailtone2 diff --git a/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml b/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml index a6211a9a99b..85a6b1896d3 100644 --- a/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml @@ -2,7 +2,7 @@ - type: emote id: Hiss category: Vocal - chatMessages: [ шипит ] + chatMessages: [ chat-emote-msg-hisses ] chatTriggers: - hisses - шипит @@ -12,7 +12,7 @@ - type: emote id: Meow category: Vocal - chatMessages: [ мяукает ] + chatMessages: [ chat-emote-msg-meow ] chatTriggers: - meows - miaus @@ -26,7 +26,7 @@ - type: emote id: Mew category: Vocal - chatMessages: [ мавает ] + chatMessages: [ chat-emote-msg-mews ] chatTriggers: - mews - мавает @@ -36,7 +36,7 @@ - type: emote id: Growl category: Vocal - chatMessages: [ рычит ] + chatMessages: [ chat-emote-msg-growl ] chatTriggers: - growls - рычит @@ -47,7 +47,7 @@ - type: emote id: Purr category: Vocal - chatMessages: [ мурлыкает ] + chatMessages: [ chat-emote-msg-purrs ] chatTriggers: - purrs - мурлыкает diff --git a/Resources/Prototypes/Voice/disease_emotes.yml b/Resources/Prototypes/Voice/disease_emotes.yml index 6497358fc84..25c2ac6555c 100644 --- a/Resources/Prototypes/Voice/disease_emotes.yml +++ b/Resources/Prototypes/Voice/disease_emotes.yml @@ -1,12 +1,12 @@ - type: emote id: Sneeze category: Vocal - chatMessages: [ чихает ] + chatMessages: [ chat-emote-msg-sneeze ] - type: emote id: Cough category: Vocal - chatMessages: [ кашляет ] + chatMessages: [ chat-emote-msg-cough ] chatTriggers: - coughs # Corvax-Localization-Start @@ -21,27 +21,27 @@ - type: emote id: CatMeow category: Vocal - chatMessages: [ мяукает ] + chatMessages: [ chat-emote-msg-catmeow ] - type: emote id: CatHisses category: Vocal - chatMessages: [ шипит ] + chatMessages: [ chat-emote-msg-cathisses ] - type: emote id: MonkeyScreeches category: Vocal - chatMessages: [ визжит ] + chatMessages: [ chat-emote-msg-monkeyscreeches ] - type: emote id: RobotBeep category: Vocal - chatMessages: [ бипает ] + chatMessages: [ chat-emote-msg-robotbeep ] - type: emote id: Yawn category: Vocal - chatMessages: [ зевает ] + chatMessages: [ chat-emote-msg-yawn ] chatTriggers: - yawns # Corvax-Localization-Start @@ -52,4 +52,4 @@ - type: emote id: Snore category: Vocal - chatMessages: [ snores ] + chatMessages: [ chat-emote-msg-snore ] diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 847854acebf..de2dffe590b 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -574,40 +574,33 @@ # Corvax-Localization-End # Machine Emotes -# - type: emote -# id: Beep -# name: chat-emote-name-beep -# category: Vocal -# icon: Interface/Emotes/beep.png -# whitelist: -# requireAll: true -# components: -# - BorgChassis -# - Vocal -# chatMessages: ["chat-emote-msg-beep"] -# chatTriggers: -# - beep -# - beep! -# - beep. -# - beeps -# - beeps. -# - beeps! -# - beeped -# - beeped. -# - beeped! -# - beeping -# - beeping. -# - beeping! -# # Corvax-Localization-Start -# - бип -# - бип. -# - бип! -# # Corvax-Localization-End +- type: emote + id: Beep + category: Vocal + chatMessages: ["chat-emote-msg-beep"] + chatTriggers: + - beep + - beep! + - beep. + - beeps + - beeps. + - beeps! + - beeped + - beeped. + - beeped! + - beeping + - beeping. + - beeping! + # Corvax-Localization-Start + - бип + - бип. + - бип! + # Corvax-Localization-End - type: emote id: Boop category: Vocal - chatMessages: [ Буп ] + chatMessages: [ chat-emote-msg-boop ] chatTriggers: - boops - буп diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/TacticalShop.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/TacticalShop.yml index 61399642680..7b1247db68d 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/TacticalShop.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/TacticalShop.yml @@ -90,7 +90,7 @@ - type: currency id: LPPCentcoin - displayName: store-currency-display-cenctoin + displayName: store-currency-display-centcoin cash: 1: LPPCentcoin canWithdraw: false diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml index c112d2708ea..ae9c01451f6 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml @@ -60,6 +60,3 @@ innerClothingSkirt: LPPClothingUniformJumpskirtAdjutant satchel: ClothingBackpackSatchelHOPFilled duffelbag: ClothingBackpackDuffelHOPFilled - storage: - back: - - LPPTelebaton diff --git a/Resources/Prototypes/_LostParadise/Traits/languages.yml b/Resources/Prototypes/_LostParadise/Traits/languages.yml index a30fa91ac66..d8b7d2455a6 100644 --- a/Resources/Prototypes/_LostParadise/Traits/languages.yml +++ b/Resources/Prototypes/_LostParadise/Traits/languages.yml @@ -11,8 +11,18 @@ inverted: false species: - Human - - !type:CharacterItemGroupRequirement - group: TraitsLanguagesBasic + - !type:CharacterTraitRequirement + inverted: true + traits: + - DwarfLanguage + - ForeignerLight + - Foreigner + - SignLanguage + - SolCommon + - Tradeband + - Freespeak + - Elyran + - ValyrianStandard - type: trait id: DwarfLanguage @@ -27,5 +37,15 @@ inverted: false species: - Human - - !type:CharacterItemGroupRequirement - group: TraitsLanguagesBasic + - !type:CharacterTraitRequirement + inverted: true + traits: + - DwarfLanguage + - ForeignerLight + - Foreigner + - SignLanguage + - SolCommon + - Tradeband + - Freespeak + - Elyran + - ValyrianStandard diff --git a/Tools/ss14_ru/yamlextractor.py b/Tools/ss14_ru/yamlextractor.py index c138614ba19..2891402018e 100644 --- a/Tools/ss14_ru/yamlextractor.py +++ b/Tools/ss14_ru/yamlextractor.py @@ -62,7 +62,6 @@ def create_en_fluent_file(self, relative_parent_dir, file_name, file_data): en_new_dir_path = os.path.join(project.en_locale_prototypes_dir_path, relative_parent_dir) en_fluent_file = FluentFile(os.path.join(en_new_dir_path, f'{file_name}.ftl')) en_fluent_file.save_data(file_data) - logging.info(f'Актуализирован файл английской локали {en_fluent_file.full_path}') return en_fluent_file.full_path