diff --git a/Resources/Locale/ru-RU/ADT/personalization.ftl b/Resources/Locale/ru-RU/ADT/personalization.ftl index 126293dfd4c..fc3ef2af07f 100644 --- a/Resources/Locale/ru-RU/ADT/personalization.ftl +++ b/Resources/Locale/ru-RU/ADT/personalization.ftl @@ -283,3 +283,30 @@ ent-ADTClothingOuterBolperCoat = плащ Волпера .desc = +5 процентов к крутости. .suffix = Именное, Bolper. +ent-ADTBolperKatana = Катана Волпера + .desc = +5 процентов к урону. + .suffix = Именное, Bolper. + +ent-ADTClothingShoesBolperBoots = Кроссовки Волпера + .desc = +5 процентов к скорости. + .suffix = Именное, Bolper. + +ent-ADTClothingNeckBolperCloak = Плащ Волпера + .desc = +5 процентов к крутости. + .suffix = Именное, Bolper. + +ent-ADTClothingUniformBolperJumpsuit = Костюм Волпера + .desc = +5 процентов к свежести. + .suffix = Именное, Bolper. + +ent-ADTClothingBackBolperSheath = Ножны Волпера + .desc = Я готов к бойне. + .suffix = Именное, Bolper. + +ent-ADTClothingUniformPangaariAmericanSleeveless = Американка без рукавов + .desc = Простой образ, состоящий из штанов и чёрной водолазки без рукавов. + .suffix = Именное, Pangaari. + +ent-ADTClothingNeckRipZoroMantle = Таинственная наплечная мантия + .desc = Мантия, хранящая тайну... + .suffix = Именное, Rip_Zoro diff --git a/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml index fd5df904aa6..f4fa121cfc3 100644 --- a/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml +++ b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml @@ -304,3 +304,110 @@ - type: ExplosionResistance damageCoefficient: 0.9 +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingShoesBolperBoots + suffix: Bolper + name: Bolper`s boots + description: Plus five percent speed. + components: + - type: Sprite + sprite: ADT/Personalization/bolper_boots.rsi + - type: Clothing + sprite: ADT/Personalization/bolper_boots.rsi + - type: Matchbox + +- type: entity + parent: ClothingNeckBase + id: ADTClothingNeckBolperCloak + suffix: Bolper + name: Bolper`s cloak + description: Plus five percent coolness. + components: + - type: Sprite + sprite: ADT/Personalization/bolper_cloak.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformBolperJumpsuit + suffix: Bolper + name: Bolper`s jumpsuit + description: Plus five percent freshness. + components: + - type: Sprite + sprite: ADT/Personalization/bolper_jumpsuit.rsi + - type: Clothing + sprite: ADT/Personalization/bolper_jumpsuit.rsi + +- type: entity + parent: [Clothing, ClothingSlotBase] + id: ADTClothingBackBolperSheath + suffix: Bolper + name: Bolper`s katana sheath + description: I`m ready to fight. + components: + - type: Sprite + sprite: ADT/Personalization/bolper_sheaths.rsi + state: sheath + - type: Clothing + sprite: ADT/Personalization/bolper_sheaths.rsi + quickEquip: false + slots: + - back + - type: Item + size: Ginormous + - type: ItemSlots + slots: + item: + name: Katana + insertVerbText: sheath-insert-verb + ejectVerbText: sheath-eject-verb + insertSound: /Audio/Items/sheath.ogg + ejectSound: /Audio/Items/unsheath.ogg + whitelist: + tags: + - Katana + - type: ItemMapper + mapLayers: + sheath-sabre: + whitelist: + tags: + - Katana + - type: Appearance + - type: PhysicalComposition + materialComposition: + Cloth: 50 + - type: StaticPrice + price: 20 +# - type: Clothing +# quickEquip: false +# slots: +# - back + +#Pangaari +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformPangaariAmericanSleeveless + suffix: Pangaari + name: American sleeveless. + components: + - type: Sprite + sprite: ADT/Personalization/pangaari_american_sleeveless.rsi + - type: Clothing + sprite: ADT/Personalization/pangaari_american_sleeveless.rsi + +#Rip_Zoro +- type: entity + parent: ClothingNeckBase + 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 diff --git a/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml b/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml index b945e94ec0f..4bd70ab8f93 100644 --- a/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml +++ b/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml @@ -925,4 +925,28 @@ components: - type: Sprite sprite: ADT/Personalization/toys.rsi - state: plushie_liexer \ No newline at end of file + state: plushie_liexer + +#Bolper +- type: entity + name: Bolper's katana + parent: BaseSword + id: ADTBolperKatana + description: Plus five percent to damage. + suffix: Bolper + components: + - type: Sprite + sprite: ADT/Personalization/bolper_katana.rsi + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Slash: 15 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Item + sprite: ADT/Personalization/bolper_katana.rsi + - type: Tag + tags: + - Katana + - type: DisarmMalus diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml index 60bb958df55..0617885f97f 100644 --- a/Resources/Prototypes/ADT/tags.yml +++ b/Resources/Prototypes/ADT/tags.yml @@ -38,4 +38,5 @@ id: ADTCartridgeBibis - type: Tag - id: ADTMagazineRifleBibis \ No newline at end of file + id: ADTMagazineRifleBibis + diff --git a/Resources/Textures/ADT/Personalization/bolper_boots.rsi/equipped-FEET.png b/Resources/Textures/ADT/Personalization/bolper_boots.rsi/equipped-FEET.png new file mode 100644 index 00000000000..04f7a69f4b1 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/bolper_boots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/ADT/Personalization/bolper_boots.rsi/icon.png b/Resources/Textures/ADT/Personalization/bolper_boots.rsi/icon.png new file mode 100644 index 00000000000..1aaad32641a Binary files /dev/null and b/Resources/Textures/ADT/Personalization/bolper_boots.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Personalization/bolper_boots.rsi/meta.json b/Resources/Textures/ADT/Personalization/bolper_boots.rsi/meta.json new file mode 100644 index 00000000000..a0ea984e131 --- /dev/null +++ b/Resources/Textures/ADT/Personalization/bolper_boots.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by boctonskuitea(Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Personalization/bolper_cloak.rsi/equipped-NECK.png b/Resources/Textures/ADT/Personalization/bolper_cloak.rsi/equipped-NECK.png new file mode 100644 index 00000000000..6a9465fe23c Binary files /dev/null and b/Resources/Textures/ADT/Personalization/bolper_cloak.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/ADT/Personalization/bolper_cloak.rsi/icon.png b/Resources/Textures/ADT/Personalization/bolper_cloak.rsi/icon.png new file mode 100644 index 00000000000..f1b943377ef Binary files /dev/null and b/Resources/Textures/ADT/Personalization/bolper_cloak.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Personalization/bolper_cloak.rsi/inhand-left.png b/Resources/Textures/ADT/Personalization/bolper_cloak.rsi/inhand-left.png new file mode 100644 index 00000000000..9e4f81e21d2 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/bolper_cloak.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Personalization/bolper_cloak.rsi/inhand-right.png b/Resources/Textures/ADT/Personalization/bolper_cloak.rsi/inhand-right.png new file mode 100644 index 00000000000..75a23e80f55 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/bolper_cloak.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Personalization/bolper_cloak.rsi/meta.json b/Resources/Textures/ADT/Personalization/bolper_cloak.rsi/meta.json new file mode 100644 index 00000000000..4fec0c368e6 --- /dev/null +++ b/Resources/Textures/ADT/Personalization/bolper_cloak.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "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 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Personalization/bolper_jumpsuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Personalization/bolper_jumpsuit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..c8acd437ade Binary files /dev/null and b/Resources/Textures/ADT/Personalization/bolper_jumpsuit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Personalization/bolper_jumpsuit.rsi/icon.png b/Resources/Textures/ADT/Personalization/bolper_jumpsuit.rsi/icon.png new file mode 100644 index 00000000000..cb7482b1874 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/bolper_jumpsuit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Personalization/bolper_jumpsuit.rsi/inhand-left.png b/Resources/Textures/ADT/Personalization/bolper_jumpsuit.rsi/inhand-left.png new file mode 100644 index 00000000000..77c97326e85 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/bolper_jumpsuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Personalization/bolper_jumpsuit.rsi/inhand-right.png b/Resources/Textures/ADT/Personalization/bolper_jumpsuit.rsi/inhand-right.png new file mode 100644 index 00000000000..1fb597ab6af Binary files /dev/null and b/Resources/Textures/ADT/Personalization/bolper_jumpsuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Personalization/bolper_jumpsuit.rsi/meta.json b/Resources/Textures/ADT/Personalization/bolper_jumpsuit.rsi/meta.json new file mode 100644 index 00000000000..54c0245c2a9 --- /dev/null +++ b/Resources/Textures/ADT/Personalization/bolper_jumpsuit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by boctonskuitea(Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Personalization/bolper_katana.rsi/icon.png b/Resources/Textures/ADT/Personalization/bolper_katana.rsi/icon.png new file mode 100644 index 00000000000..c1eac338a02 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/bolper_katana.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Personalization/bolper_katana.rsi/inhand-left.png b/Resources/Textures/ADT/Personalization/bolper_katana.rsi/inhand-left.png new file mode 100644 index 00000000000..bebd8078517 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/bolper_katana.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Personalization/bolper_katana.rsi/inhand-right.png b/Resources/Textures/ADT/Personalization/bolper_katana.rsi/inhand-right.png new file mode 100644 index 00000000000..72b490bd5fb Binary files /dev/null and b/Resources/Textures/ADT/Personalization/bolper_katana.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Personalization/bolper_katana.rsi/meta.json b/Resources/Textures/ADT/Personalization/bolper_katana.rsi/meta.json new file mode 100644 index 00000000000..b6b22ab80f3 --- /dev/null +++ b/Resources/Textures/ADT/Personalization/bolper_katana.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by boctonskuitea(Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Personalization/bolper_sheaths.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Personalization/bolper_sheaths.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..c06dfaa6d52 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/bolper_sheaths.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Personalization/bolper_sheaths.rsi/meta.json b/Resources/Textures/ADT/Personalization/bolper_sheaths.rsi/meta.json new file mode 100644 index 00000000000..15b6c849cd5 --- /dev/null +++ b/Resources/Textures/ADT/Personalization/bolper_sheaths.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by boctonskuitea(Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "sheath-sabre-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "sheath-sabre" + }, + { + "name": "sheath" + } + ] +} diff --git a/Resources/Textures/ADT/Personalization/bolper_sheaths.rsi/sheath-sabre-equipped-BACKPACK.png b/Resources/Textures/ADT/Personalization/bolper_sheaths.rsi/sheath-sabre-equipped-BACKPACK.png new file mode 100644 index 00000000000..8e34647286d Binary files /dev/null and b/Resources/Textures/ADT/Personalization/bolper_sheaths.rsi/sheath-sabre-equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Personalization/bolper_sheaths.rsi/sheath-sabre.png b/Resources/Textures/ADT/Personalization/bolper_sheaths.rsi/sheath-sabre.png new file mode 100644 index 00000000000..2c3d6ec3cbd Binary files /dev/null and b/Resources/Textures/ADT/Personalization/bolper_sheaths.rsi/sheath-sabre.png differ diff --git a/Resources/Textures/ADT/Personalization/bolper_sheaths.rsi/sheath.png b/Resources/Textures/ADT/Personalization/bolper_sheaths.rsi/sheath.png new file mode 100644 index 00000000000..e3143249185 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/bolper_sheaths.rsi/sheath.png differ diff --git a/Resources/Textures/ADT/Personalization/pangaari_american_sleeveless.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Personalization/pangaari_american_sleeveless.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..94c5c09b8a7 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/pangaari_american_sleeveless.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Personalization/pangaari_american_sleeveless.rsi/icon.png b/Resources/Textures/ADT/Personalization/pangaari_american_sleeveless.rsi/icon.png new file mode 100644 index 00000000000..79c35f5d952 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/pangaari_american_sleeveless.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Personalization/pangaari_american_sleeveless.rsi/inhand-left.png b/Resources/Textures/ADT/Personalization/pangaari_american_sleeveless.rsi/inhand-left.png new file mode 100644 index 00000000000..1310ab709a8 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/pangaari_american_sleeveless.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Personalization/pangaari_american_sleeveless.rsi/inhand-right.png b/Resources/Textures/ADT/Personalization/pangaari_american_sleeveless.rsi/inhand-right.png new file mode 100644 index 00000000000..6fdb40efb1d Binary files /dev/null and b/Resources/Textures/ADT/Personalization/pangaari_american_sleeveless.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Personalization/pangaari_american_sleeveless.rsi/meta.json b/Resources/Textures/ADT/Personalization/pangaari_american_sleeveless.rsi/meta.json new file mode 100644 index 00000000000..9aba1a4372f --- /dev/null +++ b/Resources/Textures/ADT/Personalization/pangaari_american_sleeveless.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by pangaari(Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} 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 new file mode 100644 index 00000000000..a3769f9a7ac Binary files /dev/null and b/Resources/Textures/ADT/Personalization/rip_zoro_mantle.rsi/equipped-NECK.png 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 new file mode 100644 index 00000000000..ab6d139c805 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/rip_zoro_mantle.rsi/icon.png 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 new file mode 100644 index 00000000000..852f427a517 --- /dev/null +++ b/Resources/Textures/ADT/Personalization/rip_zoro_mantle.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "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 + } + ] +}