diff --git a/Resources/Locale/ru-RU/ADT/personalization.ftl b/Resources/Locale/ru-RU/ADT/personalization.ftl index 84401e02cc4..5f0845eae00 100644 --- a/Resources/Locale/ru-RU/ADT/personalization.ftl +++ b/Resources/Locale/ru-RU/ADT/personalization.ftl @@ -378,10 +378,6 @@ ent-ADTVehiclePangaariBike = спортивный мотоцикл .desc = Мотоцикл оранжевого цвета с острыми гранями, аэродинамическими обвесами и облегчёнными элементами оперения, а также с немного наклонённым передним капотом, который придаёт ему более агрессивный и динамичный вид. .suffix = { "Именное, Pangaari" } -ent-ADTClothingNeckRipZoroMantle = Таинственная наплечная мантия - .desc = Мантия, хранящая тайну... - .suffix = { "Именное, Rip_Zoro" } - ent-ADTSyrelBattleAxe = боевой топор капитана .desc = Церемониальное оружие Вазеи-Амусса полученное по наследству. Надпись на рукояти не читаема, но точно ясно что она написана на языке Синта’Унати. .suffix = { "Именное, Syrel" } @@ -442,10 +438,6 @@ ent-ADTMoon_so_redWand = круглая трость .desc = Массивная трость, похожа на трубу или палку. Наконечник позолочен, а на самой трости сверху вниз, по кругу, тонкими и маленькими буквами на общегалактическом выгравировано: " 1508 K`е ". .suffix = { "Именное, Moon_so_red" } -ent-ADTClothingUniformZoroJumpsuit = легендарный деловой костюм - .desc = Легендарный, поношенный костюм. Весь белый с позолотой. От него пахнет ванилью... - .suffix = { "Именное, Rip_Zoro" } - ent-ADTPlushieEmma = плюшевая Эмма .desc = Кажется, она хочет заставить вас работать. .suffix = { "Именное" } @@ -1023,6 +1015,14 @@ ent-ADTAdmiraldeathushanka = элитная ушанка квартирмейс .desc = Ушанка, с золотой киркой спереди и эмблемой на левой части. Выглядит довольно потрёпанной и старой... .suffix = { "Именное, ADMIRAL_DEATH" } +ent-ADTClothingHeadHatsRipCap = фуражка полковника + .desc = Офицерская фуражка, изготовленная на заказ полковником Андерсоном. Символ высшего офицерского звания и гордость Транс-Солнечная Федерация. + .suffix = { "Именное, Ripchik" } + +ent-ADTClothingOuterRipCoat = китель офицера ТСФ + .desc = Китель офицера Транс-Солнечной Федерации, сшитый на заказ для полковника Андерсона. Предмет особой гордости, почета и уважения. Поношенный и жесткий, почти как у генерала! От него пахнет дорогими духами. + .suffix = { "Именное, Ripchik" } + ent-ADTPosterContrabandAria = Ария советует - Охладись! .desc = Плакат, на котором изображена аркана, рекламирующая мороженое "собственного" производства на станциях NanoTrasen. .suffix = { "Именное, Syrel" } diff --git a/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml index a604fca782e..67dd907dcb8 100644 --- a/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml +++ b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml @@ -617,21 +617,6 @@ sprite: ADT/Personalization/pangaari_jacket.rsi #Rip_Zoro -- type: entity - parent: ADTSponsorClothingNeckBase - id: ADTClothingNeckRipZoroMantle - suffix: Rip_Zoro - name: Mysterious shoulder mantle - description: A mantle that holds a secret... - components: - - type: Sprite - sprite: ADT/Personalization/rip_zoro_mantle.rsi - state: icon - - type: Clothing - sprite: ADT/Personalization/rip_zoro_mantle.rsi - - type: Item - size: Normal - - type: entity parent: [ClothingBeltBase, ClothingSlotBase] id: ADTClothingBeltZoroSheath @@ -669,16 +654,38 @@ - type: Appearance - type: entity - parent: ADTSponsorClothingUniformBase - id: ADTClothingUniformZoroJumpsuit - suffix: Rip_Zoro - name: The legendary business suit - description: A legendary, worn-out suit. All white and gilded. He smells like vanilla... + parent: ADTSponsorClothingHeadBase + id: ADTClothingHeadHatsRipCap + name: the colonel's cap + description: An officer's cap custom-made by Colonel Anderson. A symbol of the highest officer rank and the pride of the Trans-Solar Federation. + suffix: Personal, Ripchik components: - type: Sprite - sprite: ADT/Personalization/rip_zoro_jumpsuit.rsi + sprite: ADT/Personalization/ripchik_cap.rsi - type: Clothing - sprite: ADT/Personalization/rip_zoro_jumpsuit.rsi + sprite: ADT/Personalization/ripchik_cap.rsi + +- type: entity + parent: ADTSponsorClothingOuterStorageBase + id: ADTClothingOuterRipCoat + name: TSF officer's tunic + description: The Trans-Solar Federation officer's tunic, tailor-made for Colonel Anderson. Worn and stiff, almost like a general's! It smells of expensive perfume. + suffix: Personal, Ripchik + components: + - type: Sprite + sprite: ADT/Personalization/ripchik_greatcoat.rsi + - type: Clothing + sprite: ADT/Personalization/ripchik_greatcoat.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.7 + Piercing: 0.75 + Heat: 0.65 + - type: ExplosionResistance + damageCoefficient: 0.9 + #PushnoY - type: entity diff --git a/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/equipped-INNERCLOTHING.png deleted file mode 100644 index 7317bc56a9c..00000000000 Binary files a/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/equipped-INNERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/icon.png b/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/icon.png deleted file mode 100644 index 4480e73a378..00000000000 Binary files a/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/inhand-left.png b/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/inhand-left.png deleted file mode 100644 index 40825dae94c..00000000000 Binary files a/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/inhand-right.png b/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/inhand-right.png deleted file mode 100644 index 66b0f73e309..00000000000 Binary files a/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/ADT/Personalization/rip_zoro_mantle.rsi/equipped-NECK.png b/Resources/Textures/ADT/Personalization/rip_zoro_mantle.rsi/equipped-NECK.png deleted file mode 100644 index a3769f9a7ac..00000000000 Binary files a/Resources/Textures/ADT/Personalization/rip_zoro_mantle.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/ADT/Personalization/rip_zoro_mantle.rsi/icon.png b/Resources/Textures/ADT/Personalization/rip_zoro_mantle.rsi/icon.png deleted file mode 100644 index ab6d139c805..00000000000 Binary files a/Resources/Textures/ADT/Personalization/rip_zoro_mantle.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/ADT/Personalization/rip_zoro_mantle.rsi/meta.json b/Resources/Textures/ADT/Personalization/rip_zoro_mantle.rsi/meta.json deleted file mode 100644 index 852f427a517..00000000000 --- a/Resources/Textures/ADT/Personalization/rip_zoro_mantle.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by boctonskuitea(discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-NECK", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/ADT/Personalization/ripchik_cap.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Personalization/ripchik_cap.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..d8a3bfbb46f Binary files /dev/null and b/Resources/Textures/ADT/Personalization/ripchik_cap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Personalization/ripchik_cap.rsi/icon.png b/Resources/Textures/ADT/Personalization/ripchik_cap.rsi/icon.png new file mode 100644 index 00000000000..cabcbaf3bf0 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/ripchik_cap.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Personalization/ripchik_cap.rsi/inhand-left.png b/Resources/Textures/ADT/Personalization/ripchik_cap.rsi/inhand-left.png new file mode 100644 index 00000000000..9a4bdd4e11b Binary files /dev/null and b/Resources/Textures/ADT/Personalization/ripchik_cap.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Personalization/ripchik_cap.rsi/inhand-right.png b/Resources/Textures/ADT/Personalization/ripchik_cap.rsi/inhand-right.png new file mode 100644 index 00000000000..6698de7d68d Binary files /dev/null and b/Resources/Textures/ADT/Personalization/ripchik_cap.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/meta.json b/Resources/Textures/ADT/Personalization/ripchik_cap.rsi/meta.json similarity index 80% rename from Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/meta.json rename to Resources/Textures/ADT/Personalization/ripchik_cap.rsi/meta.json index aa4f4a17b88..dbc287be4cc 100644 --- a/Resources/Textures/ADT/Personalization/rip_zoro_jumpsuit.rsi/meta.json +++ b/Resources/Textures/ADT/Personalization/ripchik_cap.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by boctonskuitea(Discord)", + "copyright": "Created by: boctonskuitea (discord)", "size": { "x": 32, "y": 32 @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-INNERCLOTHING", + "name": "equipped-HELMET", "directions": 4 }, { @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/ADT/Personalization/ripchik_greatcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Personalization/ripchik_greatcoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..db1648ea514 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/ripchik_greatcoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Personalization/ripchik_greatcoat.rsi/icon.png b/Resources/Textures/ADT/Personalization/ripchik_greatcoat.rsi/icon.png new file mode 100644 index 00000000000..b5dbbccd915 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/ripchik_greatcoat.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Personalization/ripchik_greatcoat.rsi/inhand-left.png b/Resources/Textures/ADT/Personalization/ripchik_greatcoat.rsi/inhand-left.png new file mode 100644 index 00000000000..d8a8acdfc93 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/ripchik_greatcoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Personalization/ripchik_greatcoat.rsi/inhand-right.png b/Resources/Textures/ADT/Personalization/ripchik_greatcoat.rsi/inhand-right.png new file mode 100644 index 00000000000..3d995bef19c Binary files /dev/null and b/Resources/Textures/ADT/Personalization/ripchik_greatcoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Personalization/ripchik_greatcoat.rsi/meta.json b/Resources/Textures/ADT/Personalization/ripchik_greatcoat.rsi/meta.json new file mode 100644 index 00000000000..f12da179073 --- /dev/null +++ b/Resources/Textures/ADT/Personalization/ripchik_greatcoat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by: boctonskuitea (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}