From 46aca028db9ae7713e246d9f46471a566b4090d1 Mon Sep 17 00:00:00 2001 From: PyotrIgn Date: Wed, 11 Sep 2024 20:05:11 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B8=20=D1=8F=D0=BC=D0=BB=D1=8B=20?= =?UTF-8?q?=D1=81=D0=B0=D0=BC=D0=B8=D1=85=20=D0=B2=D0=B5=D1=89=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/Preferences/loadout-groups.ftl | 3 +- .../Entities/Clothing/Head/hats.ftl | 7 ++ .../Entities/Clothing/Mask/mask.ftl | 3 + .../Entities/Clothing/Neck/cloaks.ftl | 6 ++ .../Entities/Clothing/OuterClothing/coats.ftl | 3 + .../Entities/Clothing/Uniforms/jumpskirts.ftl | 5 +- .../Entities/Clothing/Uniforms/jumpsuits.ftl | 11 ++- .../components/foldable-component.ftl | 2 + .../ADT/Entities/Clothing/Head/hats.yml | 44 ++++++++++++ .../ADT/Entities/Clothing/Masks/mask.yml | 15 ++++ .../ADT/Entities/Clothing/Neck/Cloaks.yml | 18 +++++ .../Entities/Clothing/OuterClothing/coats.yml | 11 +++ .../Entities/Clothing/Uniforms/Jumpsuits.yml | 71 +++++++++++++++++++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 37 ++++++++++ 14 files changed, 233 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl index 1cf09ac2859..7e3ad142294 100644 --- a/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl @@ -15,7 +15,8 @@ loadout-group-blueshield-back = ОСЩ, рюкзак # Cargo # Engineering - +loadout-group-atmospheric-technician-neck = Атмосферный техник, плащ +loadout-group-atmospheric-technician-gasmask = Атмосферный техник, противогаз # Science loadout-group-roboticist-jumpsuit = Робототехник, комбинезон loadout-group-roboticist-outerclothing = Робототехник, верхняя одежда diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl index f2fd5e3b885..05ea580a422 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl @@ -25,3 +25,10 @@ ent-ADTClothingHeadHatsInvestigatorCap = фуражка следователя ent-ADTClothingHeadHatsBeretArmy = армейский берет .desc = Потрёпанный на службе военный берет. Имеет золотую нашивку сбоку. .suffix = { "Новая Мекка" } + +ent-ADTClothingHeadHatsBeretSupply = берет отдела снабжения + .desc = Берет медного цвета с вышитой эмблемой отдела снабжения. +ent-ADTClothingHeadHatsBeretAtmos = берет атмосферного техника + .desc = Голубой берет с вышитой эмблемой инжерного отдела. Пахнет фрезоном. +ent-ADTClothingHeadHatsBeretHOP = берет главы персонала + .desc = Синий берет с вышитой командирской эмблемой. Холодная рассудительность и твердая рука - вот что главное. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Mask/mask.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Mask/mask.ftl index 363163bf9ea..94e4512c651 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Mask/mask.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Mask/mask.ftl @@ -14,3 +14,6 @@ ent-ADTClothingMaskGasIlisium = дыхательная маска ent-ADTChronosMask = визор "Жертва Хроноса" .desc = Продвинутый визор, сделанный на заказ неким учёным. На боковой стороне визора видна роспись: Х.К. .suffix = { "Новая Мекка" } + +ent-ClothingMaskGasAtmosian = противогаз атмосианина + .desc = Улучшенный противогаз, используемый атмосианинами. Огнеупорный! diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/cloaks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/cloaks.ftl index 17063cc3d58..e518d71edc3 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/cloaks.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/cloaks.ftl @@ -12,3 +12,9 @@ ent-ADTClothingNeckGothicCloak = готический плащ ent-ADTClothingNeckNewMekkaCloak = накидка Новой Мекки .desc = Зеленая накидка, очень удобная в носке. Скреплена застёжкой на шее. .suffix = { "Новая Мекка" } + +ent-ADTClothingNeckHoPAltCloak = торжественный плащ Главы Персонала + .desc = Плащ Главы Персонала для особых случаев + .suffix = { "" } +ent-ClothingCloakAtmosian = плащ атмосианина + .desc = Плащ легендарного атмосианина. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl index 5a4a19c95ba..f1f7212c2b0 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl @@ -21,3 +21,6 @@ ent-ADTClothingOuterCoatIlisium = плащ Иллизиума ent-ADTClothingOuterCoatInvestigator = бушлат следователя Службы Безопасности .desc = Один вид этого бушлата повышает вероятность чистосердечного признания подозреваемого на 50%. .suffix = { "" } + +ent-ClothingOuterAtmosianBomberJacket = куртка-бомбер атмосианина + .desc = Плотная, поношенная куртка-бомбер атмосианина. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl index 16ec0c2cacf..f9981a09924 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl @@ -89,7 +89,7 @@ ent-ADTCMOJumpskirtWarm = водолазка главного врача .desc = Это комбинезон, носимый теми, у кого есть опыт работы на должности главного врача. Он обеспечивает слабую биологическую защиту. .suffix = {""} -ent-ADTHOPJumpskirtWarm = водолазка главы персонала +ent-ADTClothingUniformJumpskirtHopWarm = водолазка c юбкой главы персонала .desc = Довольно безвкусная и невзрачная. Идеально подходит для того, чтобы исчезнуть с лица Вселенной. .suffix = {""} @@ -108,3 +108,6 @@ ent-ADTCapJumpskirtWarm = { ent-ADTCapJumpsuitWarm } ent-ClothingUniformJumpskirtBlueshieldTurtleneck = юбка-водолазка офицера синего щита .desc = Белая удобная водолазка с юбкой для Офицера Синего Щита с пришитыми золотыми погонами и ярким именным бейджиком. К сожалению, если вы её наденете, это не будет значить, что вам дадут отпуск. + +ent-ADTClothingJumpskirtHopAlt = деловой костюм с юбкой главы персонала + .desc = Качетсвенно сделанная униформа для тех глав персонала, что могут себе такую позволить. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl index e7f120fdb72..0bb10c4eb47 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl @@ -152,7 +152,7 @@ ent-ADTCMOJumpsuitWarm = водолазка главного врача .desc = Это комбинезон, носимый теми, у кого есть опыт работы на должности главного врача. Он обеспечивает слабую биологическую защиту. .suffix = {""} -ent-ADTHOPJumpsuitWarm = водолазка главы персонала +ent-ADTClothingUniformJumpsuitHopWarm = водолазка главы персонала .desc = Довольно безвкусная и невзрачная. Идеально подходит для того, чтобы исчезнуть с лица Вселенной. .suffix = {""} @@ -199,3 +199,12 @@ ent-ADTClothingUniformInvestigatorSuit = форма следователя Сл ent-ADTClothingUniformNewMekka = униформа Новой Мекки .desc = Эта униформа имеет очень долгую и кровавую историю... .suffix = { "Новая Мекка" } + +ent-ADTClothingJumpsuitHopAlt = деловой костюм главы персонала + .desc = Качетсвенно сделанная униформа для тех глав персонала, что могут себе такую позволить. +ent-ADTClothingJumpsuitSecOffMogesBrown = костюм офицера СБ с Могеса + .desc = Не совсем формальный, но очень подходящий для трофиков костюм офицера, служившего в филиале Нанотрейзен на планете Могес. Заслужить право носить такой может только ветеран СБ. Стоять, СБ Могеса! +ent-ADTClothingJumpsuitSecOffMogesBlue = костюм офицера СБ с Могеса + .desc = Не совсем формальный, но очень подходящий для трофиков костюм офицера, служившего в филиале Нанотрейзен на планете Могес. Заслужить право носить такой может только ветеран СБ. Стоять, СБ Могеса! +ent-ADTClothingJumpsuitSecOffMogesGray = костюм офицера СБ с Могеса + .desc = Не совсем формальный, но очень подходящий для трофиков костюм офицера, служившего в филиале Нанотрейзен на планете Могес. Заслужить право носить такой может только ветеран СБ. Стоять, СБ Могеса! diff --git a/Resources/Locale/ru-RU/foldable/components/foldable-component.ftl b/Resources/Locale/ru-RU/foldable/components/foldable-component.ftl index 67c7a72e75e..9038e0ebcec 100644 --- a/Resources/Locale/ru-RU/foldable/components/foldable-component.ftl +++ b/Resources/Locale/ru-RU/foldable/components/foldable-component.ftl @@ -6,3 +6,5 @@ unfold-verb = Разложить fold-flip-verb = Перевернуть fold-zip-verb = Застегнуть fold-unzip-verb = Расстегнуть +fold-pull-off-verb = Снять +fold-put-on-verb = Надеть diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml index 2709141fec6..691e6f3eef1 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml @@ -126,3 +126,47 @@ sprite: ADT/Clothing/Head/Hats/armyberet.rsi - type: Clothing sprite: ADT/Clothing/Head/Hats/armyberet.rsi + +#Береты профессий + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsBeretAtmos + name: atmospheric techinican's beret + description: A blue beret with sewn emblem of engineering departament. Smells like frezon. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/beret_atmospheric_technician.rsi + - type: Tag + tags: + - HamsterWearable + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsBeretHOP + name: head of personell's beret + description: A blue beret with sewn commander's emblem. The most important in work - cold mind and sure hand. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/beret_HOP.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/beret_HOP.rsi + - type: Tag + tags: + - HamsterWearable + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsBeretSupply + name: suply departament beret + description: Copper beret with sewn Supply departament emblem. #медный берет? + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/beret_cargo.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/beret_cargo.rsi + - type: Tag + tags: + - HamsterWearable diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml b/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml index 0deab815c2d..1032d823505 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml @@ -287,3 +287,18 @@ Heat: 0.80 - type: StealTarget stealGroup: ADTClothingMaskGasCE + +- type: entity + parent: ClothingMaskGas + id: ClothingMaskGasAtmosian + name: atmosian gas mask + description: Improved gas mask utilized by atmospheric technicians. It's flameproof! + components: + - type: Sprite + sprite: ADT/Clothing/Mask/atmosian.rsi + - type: Clothing + sprite: ADT/Clothing/Mask/atmosian.rsi + - type: Armor + modifiers: + coefficients: + Heat: 0.80 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml index bf077ed3483..629c066fb69 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml @@ -39,3 +39,21 @@ components: - type: Sprite sprite: ADT/Clothing/Neck/Cloaks/newmekkacloak.rsi + +- type: entity + parent: ClothingNeckBase + id: ADTClothingNeckHoPAltCloak + name: HoP parade cloak + description: Cloak for Head of Personell for special events. + components: + - type: Sprite + sprite: ADT/Clothing/Neck/Cloaks/HoP_alt_cloak.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingCloakAtmosian + name: atmosian's cloak + description: The cloak of a legendary Atmosian. + components: + - type: Sprite + sprite: ADT/Clothing/Neck/Cloaks/atmosian.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml index 668269c9495..6bfbc649fbe 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml @@ -130,3 +130,14 @@ Slash: 0.8 Piercing: 0.7 Heat: 0.8 + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterAtmosianBomberJacket + name: atmosian bomber jacket + description: A thick, well-worn atmosian leather bomber jacket. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/atmosian.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/atmosian.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml index 00a1c8c31fb..8da13c3411f 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml @@ -597,3 +597,74 @@ sprite: ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi + +#Альтернативная одежда для ГП +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitHopWarm + name: hop jumpsuit warm + description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingJumpsuitHopAlt + name: head of personell's business suit + description: Fancy. + components: + - type: Appearance + - type: Foldable + canFoldInsideContainer: true + unfoldVerbText: fold-put-on-verb + foldVerbText: fold-pull-off-verb + - type: FoldableClothing + foldedEquippedPrefix: vest + foldedHeldPrefix: vest + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_alt_hop.rsi + layers: + - state: icon + map: [ "unfoldedLayer" ] + - state: icon_vest + map: ["foldedLayer"] + visible: false + +#Одежда для ветерана СБ +- type: entity + parent: ClothingUniformBase + id: ADTClothingJumpsuitSecOffMogesBrown + name: sec off suit from Moges + description: Freeze, Moges Vice! + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_brown.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_brown.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingJumpsuitSecOffMogesBlue + name: sec off suit from Moges + description: Freeze, Moges Vice! + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_blue.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_blue.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingJumpsuitSecOffMogesGray + name: sec off suit from Moges + description: Freeze, Moges Vice! + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml index 07c3265440f..2df442edb41 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml @@ -249,3 +249,40 @@ sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi + +#Альтернативная одежда для ГП +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpskirtHopWarm + name: hop jumpskirt warm + description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hop.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hop.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingJumpskirtHopAlt + name: head of personell's business suit + description: Fancy. + components: + - type: Appearance + - type: Foldable + canFoldInsideContainer: true + unfoldVerbText: fold-put-on-verb + foldVerbText: fold-pull-off-verb + - type: FoldableClothing + foldedEquippedPrefix: vest + foldedHeldPrefix: vest + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_alt_hop.rsi + layers: + - state: icon + map: [ "unfoldedLayer" ] + - state: icon_vest + map: ["foldedLayer"] + visible: false