diff --git a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-58.ftl b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-58.ftl index b88fa90df1..aa33c56aa0 100644 --- a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-58.ftl +++ b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-58.ftl @@ -27,10 +27,6 @@ ent-ClothingEyesGlassesJamjar = очки "банка варенья" .desc = Также известны как "защитники девственности". ent-ClothingEyesGlassesCheapSunglasses = дешевые солнцезащитные очки .desc = Пара черных солнцезащитных очков. Не очень хорошо блокируют свет, больше аксессуар, чем полезная вещь. -ent-ClothingEyesGlassesMercenaryMeaty = очки наемника - .desc = Боевые очки, бюджетный вариант. -ent-ClothingEyesGlassesSunglassesMeaty = солнцезащитные очки - .desc = Полезны как для безопасности, так и для каргонии. Бюджетный вариант. ent-ClothingEyesGlassesChemical = очки для химического анализа .desc = Очки, которые могут сканировать химический состав раствора. ent-ClothingEyesVisorNinja = визор ниндзя diff --git a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-63.ftl b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-63.ftl index 64e992a961..eb4f2b553c 100644 --- a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-63.ftl +++ b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-63.ftl @@ -2,10 +2,6 @@ ent-ClothingOuterCoatRD = лабораторный халат директора .desc = Ткань, из которой сшит этот халат, пропитана передовыми технологиями, защищающими от радиации подобно экспериментальному скафандру. ent-ClothingOuterCoatRDOpened = лабораторный халат директора исследований .desc = лабораторный халат директора исследований -ent-ClothingOuterCoatSyndieCapMeaty = тренч синдиката - .desc = Тренч синдиката сшит из прочной ткани с позолоченными узорами. -ent-ClothingOuterCoatSyndieCapArmoredMeaty = бронированный тренч синдиката - .desc = Бронированный тренч синдиката изготовлен из прочной ткани с позолоченными узорами, но без вшитых бронепластин. ent-ClothingOuterCoatSpaceAsshole = халат космического мудилы .desc = И вот он... ent-ClothingOuterCoatExpensive = дорогой халат diff --git a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-64.ftl b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-64.ftl index f0aff80666..70821b597b 100644 --- a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-64.ftl +++ b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-64.ftl @@ -8,12 +8,6 @@ ent-ClothingOuterWinterWardenUnarmored = зимнее пальто началь .desc = Прочное пальто, теплое пальто, но не бронированное. ent-ClothingOuterWinterWeb = зимнее пальто паутины .desc = Чувствуется как внутри кокона, не то чтобы это сделало тебя менее напуганным, находясь в нем. -ent-ClothingOuterWinterSyndieCapMeaty = зимнее пальто синдиката - .desc = Зимнее пальто синдиката сделано из прочной ткани, с позолоченными узорами и грубой шерсти. -ent-ClothingOuterWinterSyndieCapArmoredMeaty = бронированное зимнее пальто синдиката - .desc = Бронированное зимнее пальто синдиката сделано из прочной ткани, с позолоченными узорами и грубой шерсти. -ent-ClothingOuterWinterSyndieMeaty = зимнее пальто синдиката - .desc = Теплое зимнее пальто, выглядит как мерч из "Синдиленда" ent-ClothingShoesHighheelBoots = туфли на высоком каблуке .desc = Стильные сапоги для тех, кто хочет быть модным, но готовым ко всему. ent-ClothingShoesBootsWinter = зимние сапоги diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-6.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-6.ftl index 7c808095b4..86c173b123 100644 --- a/Resources/Locale/ru-RU/locales-new/autotranslate-6.ftl +++ b/Resources/Locale/ru-RU/locales-new/autotranslate-6.ftl @@ -3,7 +3,7 @@ ent-ClothingOuterDogi = самурайский доги ent-ClothingOuterCoatSyndieCap = пальто синдиката .desc = Пальто синдиката сшито из прочной ткани с позолоченными узорами. ent-ClothingOuterCoatSyndieCapArmored = бронированное пальто синдиката - .desc = Бронированное пальто синдиката изготовлен из прочной ткани с позолоченными узорами. + .desc = Бронированное пальто синдиката изготовлено из прочной ткани с позолоченными узорами. ent-ClothingOuterCoatAMG = бронированный медицинский халат .desc = Вариант медицинского халата с элементами пуленепробиваемого жилета выглядит странно, но ваше сердце защищено. ent-ClothingOuterCoatLabSeniorResearcher = лабораторный халат ведущего исследователя @@ -27,7 +27,7 @@ ent-ClothingOuterWinterSyndieCap = зимнее пальто синдиката ent-ClothingOuterWinterSyndieCapArmored = бронированное зимнее пальто синдиката .desc = Зимнее бронированное пальто синдиката изготовлено из прочной ткани с позолоченными узорами и грубой шерсти. ent-ClothingOuterWinterSyndie = зимнее пальто синдиката - .desc = Утепленное зимнее пальто, выглядит как товар из "Синдиленда". + .desc = Утепленное зимнее пальто, выглядит как мерч из "Синдиленда". ent-ClothingShoesBootsMerc = сапоги наемника .desc = Ботинки, прошедшие через множество конфликтов и доказавшие свою боевую надежность. ent-ClothingShoesClownLarge = большие клоунские ботинки diff --git a/Resources/Locale/ru-RU/meaty/meaty.ftl b/Resources/Locale/ru-RU/meaty/meaty.ftl new file mode 100644 index 0000000000..67f9cd48d1 --- /dev/null +++ b/Resources/Locale/ru-RU/meaty/meaty.ftl @@ -0,0 +1,24 @@ +ent-ClothingEyesGlassesMercenaryMeaty = { ent-ClothingEyesGlassesMercenary } + .desc = Боевые очки, бюджетный вариант. +ent-ClothingEyesGlassesSunglassesMeaty = { ent-ClothingEyesGlassesSunglasses } + .desc = Полезны как для безопасности, так и для карго. Бюджетный вариант. +ent-ClothingOuterCoatSyndieCapMeaty = { ent-ClothingOuterCoatSyndieCap } + .desc = { ent-ClothingOuterCoatSyndieCap.desc } +ent-ClothingOuterCoatSyndieCapArmoredMeaty = { ent-ClothingOuterCoatSyndieCapArmored } + .desc = Бронированное пальто синдиката изготовлено из прочной ткани с позолоченными узорами, но без вшитых бронепластин. +ent-ClothingOuterWinterSyndieCapMeaty = { ent-ClothingOuterWinterSyndieCap } + .desc = { ent-ClothingOuterWinterSyndieCap.desc } +ent-ClothingOuterWinterSyndieCapArmoredMeaty = { ent-ClothingOuterWinterSyndieCapArmored } + .desc = Зимнее бронированное пальто синдиката изготовлено из прочной ткани с позолоченными узорами и грубой шерсти, но без вшитых бронепластин. +ent-ClothingOuterWinterSyndieMeaty = { ent-ClothingOuterWinterSyndie } + .desc = { ent-ClothingOuterWinterSyndie.desc } +ent-ClothingEyesHudBeerMeaty = { ent-ClothingEyesHudBeer } + .desc = Пара очков, похожих на те, которые носят бармены. +ent-ClothingEyesGlassesMaidMeaty = { ent-ClothingEyesGlassesMaid } + .desc = Чистые и милые. Коллекционное издание. +ent-ClothingEyesGlassesGarMeaty = { ent-ClothingEyesGlassesGar } + .desc = { ent-ClothingEyesGlassesGar.desc } +ent-ClothingEyesGlassesGarOrangeMeaty = { ent-ClothingEyesGlassesGarOrange } + .desc = { ent-ClothingEyesGlassesGarOrange.desc } +ent-ClothingEyesGlassesGarGigaMeaty = { ent-ClothingEyesGlassesGarGiga } + .desc = { ent-ClothingEyesGlassesGarGiga.desc } diff --git a/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml b/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml index f2b429585d..136c968821 100644 --- a/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml +++ b/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml @@ -544,6 +544,17 @@ categories: - MeatyOreBoots +- type: listing + id: MeatyClothingShoesClownLarge + productEntity: ClothingShoesClownLarge + name: ent-ClothingShoesClownLarge + description: ent-ClothingShoesClownLarge.desc + cost: + MeatyOreCoin: 2 + categories: + - MeatyOreBoots + - MeatyOreNew + # Glasses - type: listing @@ -596,6 +607,83 @@ categories: - MeatyOreGlasses +- type: listing + id: MeatyClothingEyesGlassesJensen + productEntity: ClothingEyesGlassesJensen + name: ent-ClothingEyesGlassesJensen + description: ent-ClothingEyesGlassesJensen.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreGlasses + - MeatyOreNew + +- type: listing + id: MeatyClothingEyesGlassesJamjar + productEntity: ClothingEyesGlassesJamjar + name: ent-ClothingEyesGlassesJamjar + description: ent-ClothingEyesGlassesJamjar.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreGlasses + - MeatyOreNew + +- type: listing + id: MeatyClothingEyesHudBeerMeaty + productEntity: ClothingEyesHudBeerMeaty + name: ent-ClothingEyesHudBeerMeaty + description: ent-ClothingEyesHudBeerMeaty.desc + cost: + MeatyOreCoin: 2 + categories: + - MeatyOreGlasses + - MeatyOreNew + +- type: listing + id: MeatyClothingEyesGlassesMaidMeaty + productEntity: ClothingEyesGlassesMaidMeaty + name: ent-ClothingEyesGlassesMaidMeaty + description: ent-ClothingEyesGlassesMaidMeaty.desc + cost: + MeatyOreCoin: 3 + categories: + - MeatyOreGlasses + - MeatyOreNew + +- type: listing + id: MeatyClothingEyesGlassesGarMeaty + productEntity: ClothingEyesGlassesGarMeaty + name: ent-ClothingEyesGlassesGarMeaty + description: ent-ClothingEyesGlassesGarMeaty.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreGlasses + - MeatyOreNew + +- type: listing + id: MeatyClothingEyesGlassesGarOrangeMeaty + productEntity: ClothingEyesGlassesGarOrangeMeaty + name: ent-ClothingEyesGlassesGarOrangeMeaty + description: ent-ClothingEyesGlassesGarOrangeMeaty.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreGlasses + - MeatyOreNew + +- type: listing + id: MeatyClothingEyesGlassesGarGigaMeaty + productEntity: ClothingEyesGlassesGarGigaMeaty + name: ent-ClothingEyesGlassesGarGigaMeaty + description: ent-ClothingEyesGlassesGarGigaMeaty.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreGlasses + - MeatyOreNew + # Uniforms - type: listing @@ -1784,6 +1872,17 @@ categories: - MeatyOreToys +- type: listing + id: MeatyBeachBall + productEntity: BeachBall + name: ent-BeachBall + description: ent-BeachBall.desc + cost: + MeatyOreCoin: 1 + categories: + - MeatyOreToys + - MeatyOreNew + - type: listing id: MeatyFoamBlade productEntity: FoamBlade @@ -1824,6 +1923,17 @@ categories: - MeatyOreToys +- type: listing + id: MeatyBalloonNT + productEntity: BalloonNT + name: ent-BalloonNT + description: ent-BalloonNT.desc + cost: + MeatyOreCoin: 2 + categories: + - MeatyOreToys + - MeatyOreNew + - type: listing id: MeatyPonderingOrb productEntity: PonderingOrb @@ -2064,6 +2174,28 @@ categories: - MeatyOreToys +- type: listing + id: MeatyPlushieHampter + productEntity: PlushieHampter + name: ent-PlushieHampter + description: ent-PlushieHampter.desc + cost: + MeatyOreCoin: 2 + categories: + - MeatyOreToys + - MeatyOreNew + +- type: listing + id: MeatyWhoopieCushion + productEntity: WhoopieCushion + name: ent-WhoopieCushion + description: ent-WhoopieCushion.desc + cost: + MeatyOreCoin: 5 + categories: + - MeatyOreToys + - MeatyOreNew + # Misc - type: listing diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 5bd8613134..eaef68e75a 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -195,32 +195,6 @@ - type: EyeProtection protectionTime: 5 -- type: entity - parent: ClothingEyesBase - id: ClothingEyesGlassesMercenaryMeaty - name: mercenary glasses - description: Glasses made for combat. - components: - - type: Sprite - sprite: Clothing/Eyes/Glasses/mercglasses.rsi - - type: Clothing - sprite: Clothing/Eyes/Glasses/mercglasses.rsi - -- type: entity - parent: ClothingEyesBase - id: ClothingEyesGlassesSunglassesMeaty - name: sun glasses - description: Useful both for security and cargonia. - components: - - type: Sprite - sprite: Clothing/Eyes/Glasses/sunglasses.rsi - - type: Clothing - sprite: Clothing/Eyes/Glasses/sunglasses.rsi - - type: Tag - tags: - - HamsterWearable - - WhitelistChameleon - #Make a scanner category when these actually function and we get the trayson - type: entity parent: ClothingEyesBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 50651f21e5..6b415d0e3e 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -400,29 +400,6 @@ - type: Clothing sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi -- type: entity - parent: ClothingOuterStorageBase - id: ClothingOuterCoatSyndieCapMeaty - name: syndicate's coat - description: The syndicate's coat is made of durable fabric, with gilded patterns. - components: - - type: Sprite - sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi - - type: Clothing - sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi - -- type: entity - parent: ClothingOuterStorageBase - id: ClothingOuterCoatSyndieCapArmoredMeaty - name: syndicate's armored coat - description: The syndicate's armored coat is made of durable fabric, with gilded patterns. - components: - - type: Sprite - sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi - - type: Clothing - sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi - - - type: entity parent: [ClothingOuterStorageBase, AllowSuitStorageClothing] # WD added AllowSuitStorageClothing id: ClothingOuterCoatAMG diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 95ccf08ea4..65f8801337 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -541,39 +541,6 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterWeb -- type: entity - parent: ClothingOuterStorageBase - id: ClothingOuterWinterSyndieCapMeaty - name: syndicate's winter coat - description: "The syndicate's winter coat is made of durable fabric, with gilded patterns, and coarse wool." - components: - - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi - - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi - -- type: entity - parent: ClothingOuterStorageBase - id: ClothingOuterWinterSyndieCapArmoredMeaty - name: syndicate's armored winter coat - description: "The syndicate's armored winter coat is made of durable fabric, with gilded patterns, and coarse wool." - components: - - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecaparmored.rsi - - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecaparmored.rsi - -- type: entity - parent: ClothingOuterStorageBase - id: ClothingOuterWinterSyndieMeaty - name: syndicate's winter coat - description: Insulated winter coat, looks like a merch from "Syndieland" - components: - - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi - - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi - - type: entity parent: ClothingOuterStorageBase id: ClothingOuterWinterInspector diff --git a/Resources/Prototypes/_White/Meaty/meaty.yml b/Resources/Prototypes/_White/Meaty/meaty.yml new file mode 100644 index 0000000000..cb9cf978c9 --- /dev/null +++ b/Resources/Prototypes/_White/Meaty/meaty.yml @@ -0,0 +1,161 @@ +- type: entity + parent: ClothingEyesBase + id: ClothingEyesGlassesMercenaryMeaty + name: mercenary glasses + description: Glasses made for combat. + suffix: Meaty + components: + - type: Sprite + sprite: Clothing/Eyes/Glasses/mercglasses.rsi + - type: Clothing + sprite: Clothing/Eyes/Glasses/mercglasses.rsi + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesGlassesSunglassesMeaty + name: sun glasses + description: Useful both for security and cargonia. + suffix: Meaty + components: + - type: Sprite + sprite: Clothing/Eyes/Glasses/sunglasses.rsi + - type: Clothing + sprite: Clothing/Eyes/Glasses/sunglasses.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatSyndieCapMeaty + name: syndicate's coat + description: The syndicate's coat is made of durable fabric, with gilded patterns. + suffix: Meaty + components: + - type: Sprite + sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatSyndieCapArmoredMeaty + name: syndicate's armored coat + description: The syndicate's armored coat is made of durable fabric, with gilded patterns. + suffix: Meaty + components: + - type: Sprite + sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterWinterSyndieCapMeaty + name: syndicate's winter coat + description: "The syndicate's winter coat is made of durable fabric, with gilded patterns, and coarse wool." + suffix: Meaty + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterWinterSyndieCapArmoredMeaty + name: syndicate's armored winter coat + description: "The syndicate's armored winter coat is made of durable fabric, with gilded patterns, and coarse wool." + suffix: Meaty + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecaparmored.rsi + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecaparmored.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterWinterSyndieMeaty + name: syndicate's winter coat + description: Insulated winter coat, looks like a merch from "Syndieland" + suffix: Meaty + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesHudBeerMeaty + name: beer goggles + description: A pair of sunHud outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion. + suffix: Meaty + components: + - type: Sprite + sprite: Clothing/Eyes/Hud/beergoggles.rsi + - type: Clothing + sprite: Clothing/Eyes/Hud/beergoggles.rsi + - type: Tag + tags: + - WhitelistChameleon + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesGlassesMaidMeaty + name: maid's sunglasses + description: Maid's sunglasses. Clean and cute. + suffix: Meaty + components: + - type: Sprite + sprite: White/Clothing/Eyes/Glasses/maidglasses.rsi + - type: Clothing + sprite: White/Clothing/Eyes/Glasses/maidglasses.rsi + - type: Tag + tags: + - WhitelistChameleon + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesGlassesGarMeaty + name: gar glasses + description: Go beyond impossible and kick reason to the curb! + suffix: Meaty + components: + - type: Sprite + sprite: Clothing/Eyes/Glasses/gar.rsi + - type: Clothing + sprite: Clothing/Eyes/Glasses/gar.rsi + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesGlassesGarOrangeMeaty + name: orange gar glasses + description: Just who the hell do you think I am?! + suffix: Meaty + components: + - type: Sprite + sprite: Clothing/Eyes/Glasses/gar.rsi + state: icon-alt + - type: Clothing + sprite: Clothing/Eyes/Glasses/gar.rsi + equippedPrefix: alt + - type: Item + heldPrefix: alt + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesGlassesGarGigaMeaty + name: giga gar glasses + description: We evolve past the person we were a minute before. Little by little we advance with each turn. That's how a drill works! + suffix: Meaty + components: + - type: Sprite + sprite: Clothing/Eyes/Glasses/gar.rsi + state: icon-super + - type: Clothing + sprite: Clothing/Eyes/Glasses/gar.rsi + equippedPrefix: super + - type: Item + heldPrefix: super