diff --git a/Resources/Locale/ru-RU/ADT/personalization.ftl b/Resources/Locale/ru-RU/ADT/personalization.ftl index c01743d2361..ae02c4d60e8 100644 --- a/Resources/Locale/ru-RU/ADT/personalization.ftl +++ b/Resources/Locale/ru-RU/ADT/personalization.ftl @@ -762,3 +762,23 @@ ent-ADTClothingUniformGothic = готическое платье ent-ADTClothingHandsCuffsFaust = бархатные манжеты .desc = Специальные манжеты, сжитые из бархатной ткани для какой-то особы королевских кровей. От них пахнет цветами. .suffix = { "Спонсорское, Faust Netzach" } + +ent-ADTClothingUniformKimerK = фиолетовый костюм + .desc = Лёгкая классическая рубашка с галстуком в нежных тонах, дополненная жилетом на пуговицах с V-образным вырезом. + .suffix = { "Спонсорское, kimer_k" } + +ent-ADTGoldPlatedDrinkShaker = шейкер с позолотой + .desc = Шейкер из высококачественной нержавеющей стали с защитным покрытием, которое предотвращает появление царапин и коррозии. Кроме того, шейкер имеет улучшенную конструкцию для удобного захвата и стильный дизайн с золотыми элементами. + .suffix = { "Спонсорское, kimer_k" } + +ent-ADTGoldPlatedBarSpoon = барная ложка с позолотой + .desc = Ложка для приготовления коктейлей из нержавеющей стали, декорированная золотистым напылением. + .suffix = { "Спонсорское, kimer_k" } + +ent-ADTGoldPlatedDrinkJigger = джиггер с позолотой + .desc = Джиггер с позолоченным корпусом и резиновыми вставками для удобного захвата и комфортной работы. + .suffix = { "Спонсорское, kimer_k" } + +ent-ADTPremiumCaseKimerk = премиальный кейс + .desc = Роскошный кейс из экзотической кожи, отделанный изнутри красным бархатом с отделениями для каждого инструмента. На крышке видна аккуратная гравюра "Sternenflug", выполненная каллиграфическим почерком. + .suffix = { "Спонсорское, kimer_k" } diff --git a/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml index 7269d21ced2..379e2110de9 100644 --- a/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml +++ b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml @@ -1492,3 +1492,16 @@ sprite: ADT/Personalization/FaustNetzach/faust_cuffs.rsi - type: Fiber fiberColor: fibers-white + +#kimer_k +- type: entity + parent: ADTSponsorClothingUniformBase + id: ADTClothingUniformKimerK + name: pink suit + description: A lightweight classic shirt with a delicate tie, complemented by a button-down vest with a V-neck. + suffix: Personal, kimer_k + components: + - type: Sprite + sprite: ADT/Personalization/Kimer_k/kimer_k_suit.rsi + - type: Clothing + sprite: ADT/Personalization/Kimer_k/kimer_k_suit.rsi diff --git a/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml b/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml index 8fc9f542ceb..53781f57946 100644 --- a/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml +++ b/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml @@ -2740,4 +2740,112 @@ head: - state: equipped-HELMET offset: "0, 0.04" + +#kimer_k +- type: entity + parent: DrinkShaker + id: ADTGoldPlatedDrinkShaker + name: gold-plated shaker + description: The shaker is made of high-quality stainless steel with a protective coating that prevents scratches and corrosion. Additionally, the shaker has an improved design for a comfortable grip and a stylish design with gold accents. + suffix: Personal, kimer_k + components: + - type: Sprite + sprite: ADT/Personalization/Kimer_k/kimer_k_shaker.rsi + - type: Tag + tags: + - ADTGoldPlatedDrinkShakerTag + +- type: entity + parent: Spoon + id: ADTGoldPlatedBarSpoon + name: gold-plated bar spoon + description: Stainless steel cocktail spoon with a golden finish. + suffix: Personal, kimer_k + components: + - type: Sprite + sprite: ADT/Personalization/Kimer_k/kimer_k_spoon.rsi + state: spoon + - type: Item + sprite: ADT/Personalization/Kimer_k/kimer_k_spoon.rsi + - type: Tag + tags: + - Metal + - ADTGoldPlatedBarSpoonTag + +- type: entity + parent: DrinkJigger + id: ADTGoldPlatedDrinkJigger + name: gold-plated jigger + description: A jigger with a gold-plated body and rubber inserts for a comfortable grip and operation. + suffix: Personal, kimer_k + components: + - type: Sprite + sprite: ADT/Personalization/Kimer_k/kimer_k_jigger.rsi + - type: Tag + tags: + - ADTGoldPlatedDrinkJiggerTag + + +- type: entity + id: ADTPremiumCaseKimerk + name: premium case + description: premium case desc + parent: [BaseStorageItem, BaseBagOpenClose] + suffix: Personal, kimer_k + components: + - type: Sprite + sprite: ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi + state: closed + layers: + - state: closed + map: ["closeLayer"] + - state: open + map: ["openLayer"] + visible: false + # Слои заполнения + - state: full-item-open + map: ["full-item-open"] + visible: false + - state: bez_trex + map: ["bez_trex"] + visible: false + - state: bez_dvux + map: ["bez_dvux"] + visible: false + - state: bez_loshki + map: ["bez_loshki"] + visible: false + - type: Appearance + - type: Item + sprite: ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi + size: Normal + - type: Storage + grid: + - 0,0,4,2 + maxItemSize: Small + - type: StorageFill + contents: + - id: ADTGoldPlatedDrinkJigger + - id: ADTGoldPlatedDrinkJigger + - id: ADTGoldPlatedBarSpoon + - id: ADTGoldPlatedDrinkShaker + - type: MeleeWeapon + damage: + types: + Blunt: 12 + soundHit: + path: "/Audio/Weapons/smash.ogg" + - type: ItemCounter + count: + tags: + - ADTGoldPlatedDrinkJiggerTag + - ADTGoldPlatedBarSpoonTag + - ADTGoldPlatedDrinkShakerTag + composite: true + layerStates: + - full-item-open + - bez_trex + - bez_dvux + - bez_loshki + #SPONSOR-ITEMS-END diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml index ad4e5cff94f..c89bbcaf85e 100644 --- a/Resources/Prototypes/ADT/tags.yml +++ b/Resources/Prototypes/ADT/tags.yml @@ -531,6 +531,14 @@ - type: Tag id: ADTKeyPangaariBike +- type: Tag + id: ADTGoldPlatedDrinkJiggerTag + +- type: Tag + id: ADTGoldPlatedBarSpoonTag + +- type: Tag + id: ADTGoldPlatedDrinkShakerTag #sponsor_items - End - type: Tag diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_jigger.rsi/icon.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_jigger.rsi/icon.png new file mode 100644 index 00000000000..9f3cdccd3e1 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_jigger.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_jigger.rsi/inhand-left.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_jigger.rsi/inhand-left.png new file mode 100644 index 00000000000..f1a94b00608 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_jigger.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_jigger.rsi/inhand-right.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_jigger.rsi/inhand-right.png new file mode 100644 index 00000000000..f82b5e6e8d0 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_jigger.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_jigger.rsi/meta.json b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_jigger.rsi/meta.json new file mode 100644 index 00000000000..5ee9f71a7d2 --- /dev/null +++ b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_jigger.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by pangaari (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/bez_dvux.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/bez_dvux.png new file mode 100644 index 00000000000..8451e5b5556 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/bez_dvux.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/bez_loshki.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/bez_loshki.png new file mode 100644 index 00000000000..fdebca5d890 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/bez_loshki.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/bez_trex.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/bez_trex.png new file mode 100644 index 00000000000..1c27d5ff2d3 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/bez_trex.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/closed.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/closed.png new file mode 100644 index 00000000000..d9319cdd4c7 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/closed.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/full-item-open.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/full-item-open.png new file mode 100644 index 00000000000..9de98b30fdd Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/full-item-open.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/icon.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/icon.png new file mode 100644 index 00000000000..d9319cdd4c7 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/inhand-left.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/inhand-left.png new file mode 100644 index 00000000000..4f1072de530 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/inhand-right.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/inhand-right.png new file mode 100644 index 00000000000..c5a41ececd0 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/meta.json b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/meta.json new file mode 100644 index 00000000000..afdc48b38fe --- /dev/null +++ b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:pangaari", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "closed" + }, + { + "name": "icon" + }, + { + "name": "open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "bez_dvux" + }, + { + "name": "bez_loshki" + }, + { + "name": "bez_trex" + }, + { + "name": "full-item-open" + } + ] +} diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/open.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/open.png new file mode 100644 index 00000000000..5d7a9b209ef Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_premium_case.rsi/open.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_shaker.rsi/icon.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_shaker.rsi/icon.png new file mode 100644 index 00000000000..70d3156fb6f Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_shaker.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_shaker.rsi/inhand-left.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_shaker.rsi/inhand-left.png new file mode 100644 index 00000000000..663fca56d57 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_shaker.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_shaker.rsi/inhand-right.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_shaker.rsi/inhand-right.png new file mode 100644 index 00000000000..ae01f199b4b Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_shaker.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_shaker.rsi/meta.json b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_shaker.rsi/meta.json new file mode 100644 index 00000000000..5ee9f71a7d2 --- /dev/null +++ b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_shaker.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by pangaari (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_spoon.rsi/meta.json b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_spoon.rsi/meta.json new file mode 100644 index 00000000000..fb5278ce2c8 --- /dev/null +++ b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_spoon.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by pangaari (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spoon-inhand-right", + "directions": 4 + }, + { + "name": "spoon" + }, + { + "name": "spoon-inhand-left", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_spoon.rsi/spoon-inhand-left.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_spoon.rsi/spoon-inhand-left.png new file mode 100644 index 00000000000..838ee8fceb1 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_spoon.rsi/spoon-inhand-left.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_spoon.rsi/spoon-inhand-right.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_spoon.rsi/spoon-inhand-right.png new file mode 100644 index 00000000000..598ff2be9d0 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_spoon.rsi/spoon-inhand-right.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_spoon.rsi/spoon.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_spoon.rsi/spoon.png new file mode 100644 index 00000000000..83137ce9a1c Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_spoon.rsi/spoon.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_suit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..ca38bbfd2c9 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_suit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_suit.rsi/icon.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_suit.rsi/icon.png new file mode 100644 index 00000000000..124155984d0 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_suit.rsi/inhand-left.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_suit.rsi/inhand-left.png new file mode 100644 index 00000000000..06c7c610431 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_suit.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_suit.rsi/inhand-right.png b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_suit.rsi/inhand-right.png new file mode 100644 index 00000000000..12f8e2bf735 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_suit.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_suit.rsi/meta.json b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_suit.rsi/meta.json new file mode 100644 index 00000000000..5bc99b06e20 --- /dev/null +++ b/Resources/Textures/ADT/Personalization/Kimer_k/kimer_k_suit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by pangaari (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} \ No newline at end of file