diff --git a/Resources/Locale/ru-RU/_white/items/misc.ftl b/Resources/Locale/ru-RU/_white/items/misc.ftl new file mode 100644 index 0000000000..4f33a63bf9 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/items/misc.ftl @@ -0,0 +1,24 @@ +ent-ClothingNeckMantieZero = мантия "Ноль" + .desc = Камуфляжная мантия элитного бойца, покрытая кровью тысяч невинных. +ent-ClothingNeckMantieDuneHat = пустынный капюшон + .desc = Пыльный капюшон плотно закрывающий голову от песчаных вихрей. +ent-ClothingNeckMantieDune = пустынная мантия + .desc = Покрытая въевшейся пылью мантия, отлично защищающая от непогоды. Такие носят на гиблых мирах-пустошах - кочевники и рейдеры. Поможет вам не схлопотать солнечный удар слишком быстро. +ent-ClothingMaskSratVPodjesde = маска скрытности + .desc = Маска незаметность свободно ананизм невидимость скрытно шаттл синдикат. +ent-ClothingHeadHatStreamerCap = шапка стримера + .desc = С этой шапкой вы будете в центре внимания! Или нет. +ent-BeretZero = берет "Ноль" + .desc = Камуфляжный берет элитного бойца со знаком отличия в виде цифры "0". Пахнет кровью. +ent-ClothingOuterPunkBomber = куртка панка + .desc = Просто не вступайте в армию, пока не узнаете, в какой войне вы участвуете. +ent-ClothingOuterHoodieStreamer = стримерское худи + .desc = Тёплое и уютное, с карманами и капюшоном. +ent-ClothingHeadHatHoodHoodieStreamer = капюшон + .desc = Если хочешь быть загадочным и привлекательным. +ent-ClothingUniformJumpsuitZeroSamurai = кимоно мечника + .desc = Удобное просторное кимоно, не стенсняющее движений, в его кармане... старый плеер? +ent-ClothingUniformJumpsuitWhiteTShirt = белая футболка с джинсами + .desc = Модно. Минималистично. Стильно. Молодёжно. +ent-ClothingUniformJumpsuitZero = униформа "Ноль" + .desc = Удобная униформа из прочных и эластичных материалов, состоящая из штанов "карго" и чёрной водолазки. diff --git a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-60.ftl b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-60.ftl index fcc28a6a11..1a84a0e636 100644 --- a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-60.ftl +++ b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-60.ftl @@ -7,15 +7,15 @@ ent-ClothingHeadHatBrownFlatcap = коричневая кепка ent-ClothingHeadHatCowboyBrown = коричневая ковбойская шляпа .desc = Эта шляпа слишком мала для нас двоих. ent-ClothingHeadHatCowboyBlack = черная ковбойская шляпа - .desc = черная ковбойская шляпа + .desc = Эта шляпа слишком мала для нас двоих. ent-ClothingHeadHatCowboyGrey = серая ковбойская шляпа - .desc = серая ковбойская шляпа + .desc = Эта шляпа слишком мала для нас двоих. ent-ClothingHeadHatCowboyRed = красная ковбойская шляпа - .desc = красная ковбойская шляпа + .desc = Эта шляпа слишком мала для нас двоих. ent-ClothingHeadHatCowboyWhite = белая ковбойская шляпа - .desc = белая ковбойская шляпа + .desc = Эта шляпа слишком мала для нас двоих. ent-ClothingHeadHatCowboyBountyHunter = шляпа ковбоя-охотника за головами - .desc = шляпа ковбоя-охотника за головами + .desc = Эта шляпа слишком мала для нас двоих. ent-ClothingHeadHatStrawHat = соломенная шляпа .desc = Модная шляпа для жарких дней! Не рекомендуется носить рядом с огнем. ent-ClothingHeadHatBeretMedic = медицинская беретка diff --git a/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml b/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml index 136c968821..235e57dbf3 100644 --- a/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml +++ b/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml @@ -250,6 +250,259 @@ categories: - MeatyOreHats +- type: listing + id: MeatyClothingHeadBandMerc + productEntity: ClothingHeadBandMerc + name: ent-ClothingHeadBandMerc + description: ent-ClothingHeadBandMerc.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadBandSkull + productEntity: ClothingHeadBandSkull + name: ent-ClothingHeadBandSkull + description: ent-ClothingHeadBandSkull.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadBandBotany + productEntity: ClothingHeadBandBotany + name: ent-ClothingHeadBandBotany + description: ent-ClothingHeadBandBotany.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadBandGold + productEntity: ClothingHeadBandGold + name: ent-ClothingHeadBandGold + description: ent-ClothingHeadBandGold.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadBandBlack + productEntity: ClothingHeadBandBlack + name: ent-ClothingHeadBandBlack + description: ent-ClothingHeadBandBlack.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadBandGrey + productEntity: ClothingHeadBandGrey + name: ent-ClothingHeadBandGrey + description: ent-ClothingHeadBandGrey.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadBandGreen + productEntity: ClothingHeadBandGreen + name: ent-ClothingHeadBandGreen + description: ent-ClothingHeadBandGreen.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadBandBrown + productEntity: ClothingHeadBandBrown + name: ent-ClothingHeadBandBrown + description: ent-ClothingHeadBandBrown.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadBandRed + productEntity: ClothingHeadBandRed + name: ent-ClothingHeadBandRed + description: ent-ClothingHeadBandRed.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadHatStreamerCap + productEntity: ClothingHeadHatStreamerCap + name: ent-ClothingHeadHatStreamerCap + description: ent-ClothingHeadHatStreamerCap.desc + cost: + MeatyOreCoin: 3 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyBeretZero + productEntity: BeretZero + name: ent-BeretZero + description: ent-BeretZero.desc + cost: + MeatyOreCoin: 2 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadHatBizarreSoft + productEntity: ClothingHeadHatBizarreSoft + name: ent-ClothingHeadHatBizarreSoft + description: ent-ClothingHeadHatBizarreSoft.desc + cost: + MeatyOreCoin: 5 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadHatCowboyBountyHunter + productEntity: ClothingHeadHatCowboyBountyHunter + name: ent-ClothingHeadHatCowboyBountyHunter + description: ent-ClothingHeadHatCowboyBountyHunter.desc + cost: + MeatyOreCoin: 2 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadHatBeretMerc + productEntity: ClothingHeadHatBeretMerc + name: ent-ClothingHeadHatBeretMerc + description: ent-ClothingHeadHatBeretMerc.desc + cost: + MeatyOreCoin: 2 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadHatYellowsoft + productEntity: ClothingHeadHatYellowsoft + name: ent-ClothingHeadHatYellowsoft + description: ent-ClothingHeadHatYellowsoft.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadHatGreensoft + productEntity: ClothingHeadHatGreensoft + name: ent-ClothingHeadHatGreensoft + description: ent-ClothingHeadHatGreensoft.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadHatMimesoft + productEntity: ClothingHeadHatMimesoft + name: ent-ClothingHeadHatMimesoft + description: ent-ClothingHeadHatMimesoft.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadHatPurplesoft + productEntity: ClothingHeadHatPurplesoft + name: ent-ClothingHeadHatPurplesoft + description: ent-ClothingHeadHatPurplesoft.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadHatCorpsoft + productEntity: ClothingHeadHatCorpsoft + name: ent-ClothingHeadHatCorpsoft + description: ent-ClothingHeadHatCorpsoft.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadHatBluesoft + productEntity: ClothingHeadHatBluesoft + name: ent-ClothingHeadHatBluesoft + description: ent-ClothingHeadHatBluesoft.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadHatBlacksoft + productEntity: ClothingHeadHatBlacksoft + name: ent-ClothingHeadHatBlacksoft + description: ent-ClothingHeadHatBlacksoft.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadHatRedsoft + productEntity: ClothingHeadHatRedsoft + name: ent-ClothingHeadHatRedsoft + description: ent-ClothingHeadHatRedsoft.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreHats + - MeatyOreNew + +- type: listing + id: MeatyClothingHeadHatOrangesoft + productEntity: ClothingHeadHatOrangesoft + name: ent-ClothingHeadHatOrangesoft + description: ent-ClothingHeadHatOrangesoft.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreHats + - MeatyOreNew + # Masks - type: listing @@ -302,6 +555,127 @@ categories: - MeatyOreMasks +- type: listing + id: MeatyClothingMaskNeckGaiter + productEntity: ClothingMaskNeckGaiter + name: ent-ClothingMaskNeckGaiter + description: ent-ClothingMaskNeckGaiter.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreMasks + - MeatyOreNew + +- type: listing + id: MeatyClothingMaskSratVPodjesde + productEntity: ClothingMaskSratVPodjesde + name: ent-ClothingMaskSratVPodjesde + description: ent-ClothingMaskSratVPodjesde.desc + cost: + MeatyOreCoin: 5 + categories: + - MeatyOreMasks + - MeatyOreNew + +- type: listing + id: MeatyClothingMaskBandMerc + productEntity: ClothingMaskBandMerc + name: ent-ClothingMaskBandMerc + description: ent-ClothingMaskBandMerc.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreMasks + - MeatyOreNew + +- type: listing + id: MeatyClothingMaskBandSkull + productEntity: ClothingMaskBandSkull + name: ent-ClothingMaskBandSkull + description: ent-ClothingMaskBandSkull.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreMasks + - MeatyOreNew + +- type: listing + id: MeatyClothingMaskBandBotany + productEntity: ClothingMaskBandBotany + name: ent-ClothingMaskBandBotany + description: ent-ClothingMaskBandBotany.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreMasks + - MeatyOreNew + +- type: listing + id: MeatyClothingMaskBandGold + productEntity: ClothingMaskBandGold + name: ent-ClothingMaskBandGold + description: ent-ClothingMaskBandGold.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreMasks + - MeatyOreNew + +- type: listing + id: MeatyClothingMaskBandBlack + productEntity: ClothingMaskBandBlack + name: ent-ClothingMaskBandBlack + description: ent-ClothingMaskBandBlack.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreMasks + - MeatyOreNew + +- type: listing + id: MeatyClothingMaskBandGrey + productEntity: ClothingMaskBandGrey + name: ent-ClothingMaskBandGrey + description: ent-ClothingMaskBandGrey.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreMasks + - MeatyOreNew + +- type: listing + id: MeatyClothingMaskBandGreen + productEntity: ClothingMaskBandGreen + name: ent-ClothingMaskBandGreen + description: ent-ClothingMaskBandGreen.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreMasks + - MeatyOreNew + +- type: listing + id: MeatyClothingMaskBandBrown + productEntity: ClothingMaskBandBrown + name: ent-ClothingMaskBandBrown + description: ent-ClothingMaskBandBrown.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreMasks + - MeatyOreNew + +- type: listing + id: MeatyClothingMaskBandRed + productEntity: ClothingMaskBandRed + name: ent-ClothingMaskBandRed + description: ent-ClothingMaskBandRed.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreMasks + - MeatyOreNew + # Boots - type: listing @@ -1136,6 +1510,39 @@ categories: - MeatyOreUniforms +- type: listing + id: MeatyClothingUniformJumpsuitZeroSamurai + productEntity: ClothingUniformJumpsuitZeroSamurai + name: ent-ClothingUniformJumpsuitZeroSamurai + description: ent-ClothingUniformJumpsuitZeroSamurai.desc + cost: + MeatyOreCoin: 2 + categories: + - MeatyOreUniforms + - MeatyOreNew + +- type: listing + id: MeatyClothingUniformJumpsuitWhiteTShirt + productEntity: ClothingUniformJumpsuitWhiteTShirt + name: ent-ClothingUniformJumpsuitWhiteTShirt + description: ent-ClothingUniformJumpsuitWhiteTShirt.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreUniforms + - MeatyOreNew + +- type: listing + id: MeatyClothingUniformJumpsuitZero + productEntity: ClothingUniformJumpsuitZero + name: ent-ClothingUniformJumpsuitZero + description: ent-ClothingUniformJumpsuitZero.desc + cost: + MeatyOreCoin: 2 + categories: + - MeatyOreUniforms + - MeatyOreNew + # Gloves - type: listing @@ -1580,6 +1987,28 @@ categories: - MeatyOreCloaks +- type: listing + id: MeatyClothingOuterPunkBomber + productEntity: ClothingOuterPunkBomber + name: ent-ClothingOuterPunkBomber + description: ent-ClothingOuterPunkBomber.desc + cost: + MeatyOreCoin: 2 + categories: + - MeatyOreCloaks + - MeatyOreNew + +- type: listing + id: MeatyClothingOuterHoodieStreamer + productEntity: ClothingOuterHoodieStreamer + name: ent-ClothingOuterHoodieStreamer + description: ent-ClothingOuterHoodieStreamer.desc + cost: + MeatyOreCoin: 3 + categories: + - MeatyOreCloaks + - MeatyOreNew + # Toys - type: listing @@ -2420,6 +2849,83 @@ categories: - MeatyOreCapes +- type: listing + id: MeatyClothingNeckCloakVoid + productEntity: ClothingNeckCloakVoid + name: ent-ClothingNeckCloakVoid + description: ent-ClothingNeckCloakVoid.desc + cost: + MeatyOreCoin: 3 + categories: + - MeatyOreCapes + - MeatyOreNew + +- type: listing + id: MeatyClothingNeckStoleChaplain + productEntity: ClothingNeckStoleChaplain + name: ent-ClothingNeckStoleChaplain + description: ent-ClothingNeckStoleChaplain.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreCapes + - MeatyOreNew + +- type: listing + id: MeatyClothingNeckTieRed + productEntity: ClothingNeckTieRed + name: ent-ClothingNeckTieRed + description: ent-ClothingNeckTieRed.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreCapes + - MeatyOreNew + +- type: listing + id: MeatyClothingNeckTieDet + productEntity: ClothingNeckTieDet + name: ent-ClothingNeckTieDet + description: ent-ClothingNeckTieDet.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreCapes + - MeatyOreNew + +- type: listing + id: MeatyClothingNeckTieSci + productEntity: ClothingNeckTieSci + name: ent-ClothingNeckTieSci + description: ent-ClothingNeckTieSci.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreCapes + - MeatyOreNew + +- type: listing + id: MeatyClothingNeckMantieDune + productEntity: ClothingNeckMantieDune + name: ent-ClothingNeckMantieDune + description: ent-ClothingNeckMantieDune.desc + cost: + MeatyOreCoin: 2 + categories: + - MeatyOreCapes + - MeatyOreNew + +- type: listing + id: MeatyClothingNeckMantieZero + productEntity: ClothingNeckMantieZero + name: ent-ClothingNeckMantieZero + description: ent-ClothingNeckMantieZero.desc + cost: + MeatyOreCoin: 2 + categories: + - MeatyOreCapes + - MeatyOreNew + # Dj - type: listing diff --git a/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/misc.yml index 4b40a0ddcb..59d8bc0165 100644 --- a/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/misc.yml @@ -36,34 +36,12 @@ - type: entity parent: ClothingOuterStorageBase id: ClothingOuterHoodieStreamer - name: стримерский худи - description: Тёплый и уютный, с карманами и капюшоном. + name: стримерское худи + description: Тёплое и уютное, с карманами и капюшоном. components: - type: Sprite sprite: White/Clothing/OuterClothing/Misc/cute-hoodie.rsi - type: Clothing sprite: White/Clothing/OuterClothing/Misc/cute-hoodie.rsi - - type: TemperatureProtection - coefficient: 0.1 - - type: Item - size: Normal - - type: Armor - modifiers: - coefficients: - Heat: 0.95 - - type: Food - requiresSpecialDigestion: true - - type: SolutionContainerManager - solutions: - food: - maxVol: 30 - reagents: - - ReagentId: Fiber - Quantity: 30 - - type: Tag - tags: - - ClothMade - - type: StaticPrice - price: 70 - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodHoodieStreamer diff --git a/Resources/Prototypes/_White/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_White/Entities/Clothing/Uniforms/jumpsuits.yml index e7d12d9a3e..1a032ea06c 100644 --- a/Resources/Prototypes/_White/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_White/Entities/Clothing/Uniforms/jumpsuits.yml @@ -76,7 +76,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitWhiteTShirt name: белая футболка с джинсами - description: Модно. Милимастично. Стильно. Молодёжно. + description: Модно. Минималистично. Стильно. Молодёжно. components: - type: Sprite sprite: White/Clothing/Uniforms/Jumpsuit/white-t-shirt.rsi diff --git a/Resources/Textures/White/Clothing/Head/Hoods/Coat/cute-hood.rsi/equipped-HELMET.png b/Resources/Textures/White/Clothing/Head/Hoods/Coat/cute-hood.rsi/equipped-HELMET.png index a56a369b87..79c1e1ace8 100644 Binary files a/Resources/Textures/White/Clothing/Head/Hoods/Coat/cute-hood.rsi/equipped-HELMET.png and b/Resources/Textures/White/Clothing/Head/Hoods/Coat/cute-hood.rsi/equipped-HELMET.png differ