diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/belt/belts.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/belt/belts.ftl index 1eff8c072bc..a7a09daf38a 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/belt/belts.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/belt/belts.ftl @@ -11,3 +11,9 @@ ent-ClothingBeltMedicalCMO = медицинский пояс главного в .desc = Стерильный пояс со множеством карманов под таблетки и другие лекарства, подчёркивающий, что лечить нужно со стилем. ent-ClothingBeltReaperWebbing = разгрузочный жилет .desc = Тактическая разгрузка, которую носят десантники Синдиката. +ent-ClothingBeltSheathSyndicateFilled = {ent-ClothingBeltSheathSyndicate} + .desc = { ent-ClothingBeltSheathSyndicate.desc } +ent-ClothingBeltSheathSyndicate = ножны для рапиры + .desc = Зловещие тонкие ножны, подходящие для рапиры. +ent-BeltSheathSyndieFilledBox = обёрнутая рапира синдиката + .desc = Разверните. diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/melee/sword.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/melee/sword.ftl new file mode 100644 index 00000000000..8f428d7b314 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/melee/sword.ftl @@ -0,0 +1,2 @@ +ent-SyndicateRapier = Рапира Синдиката + .desc = Тонкое лезвие из пластитана с алмазным наконечником. diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl index d56c8c89904..334f1f7eb99 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl @@ -14,3 +14,5 @@ uplink-hardsuit-syndie-medic-name = скафандр Медика Синдика uplink-hardsuit-syndie-medic-desc = Скафандр предназначеный для боевых врачей отрядов Горлекса. uplink-syndie-nvd-name = ПНВ Синдиката uplink-syndie-nvd-desc = Качественно исполненый прибор ночного видения, производства компании "Горлакс секьюрити", использует красные линзы для улучшения видимости в условиях низкой освещенности. +uplink-syndicate-rapier-name = Рапира Синдиката +uplink-syndicate-rapier-desc = Элегантная рапира из пластитана с алмазным наконечником. Рапира поставляется в собственных ножнах и способна пробить практически любую защиту если бить точно. \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/belt.yml new file mode 100644 index 00000000000..fce77e30264 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/belt.yml @@ -0,0 +1,26 @@ +- type: entity + id: ClothingBeltSheathSyndicateFilled + parent: ClothingBeltSheathSyndicate + suffix: Filled + components: + - type: ContainerFill + containers: + item: + - SyndicateRapier + +- type: entity + parent: [BaseItem, BaseSyndicateContraband] + id: BeltSheathSyndieFilledBox + name: the Wrapped Rapier of the Syndicate + description: Unwrap. + components: + - type: Item + size: Ginormous + - type: Sprite + sprite: _Sunrise/Objects/Storage/sheath-rapier-gift.rsi + state: sheath-rapier-gift + - type: SpawnItemsOnUse + items: + - id: ClothingBeltSheathSyndicateFilled + sound: + path: /Audio/Effects/unwrap.ogg diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml index 574783aa05d..53f8ebfba8f 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml @@ -362,3 +362,17 @@ Telecrystal: 12 categories: - UplinkDisruption + +- type: listing + id: UplinkSyndicateRapier + name: uplink-syndicate-rapier-name + description: uplink-syndicate-rapier-desc + icon: { sprite: _Sunrise/Clothing/Belt/syndie_sheath.rsi, state: sheath-rapier } + productEntity: BeltSheathSyndieFilledBox + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 5 + cost: + Telecrystal: 11 + categories: + - UplinkWeaponry diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml index 36550b43654..a547e3af519 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml @@ -95,3 +95,35 @@ sprite: _Sunrise/Clothing/Belt/webbing.rsi - type: ExplosionResistance damageCoefficient: 0.5 + +- type: entity + parent: [ClothingBeltBase, ClothingSlotBase, BaseSyndicateContraband] + id: ClothingBeltSheathSyndicate + name: rapier sheath + description: A sinister, thin sheath, suitable for a rapier. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Belt/syndie_sheath.rsi + state: sheath + - type: Clothing + sprite: _Sunrise/Clothing/Belt/syndie_sheath.rsi + - type: Item + size: Ginormous + - type: ItemSlots + slots: + item: + name: rapier + insertVerbText: sheath-insert-verb + ejectVerbText: sheath-eject-verb + insertSound: /Audio/Items/sheath.ogg + ejectSound: /Audio/Items/unsheath.ogg + whitelist: + tags: + - SyndicateRapier + - type: ItemMapper + mapLayers: + sheath-rapier: + whitelist: + tags: + - SyndicateRapier + - type: Appearance diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/sword.yml new file mode 100644 index 00000000000..b6172658016 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/sword.yml @@ -0,0 +1,29 @@ +- type: entity + name: syndicate rapier + parent: [ BaseSword, BaseSyndicateContraband ] + id: SyndicateRapier + description: A thin blade made of plastitanium with a diamond tip. + components: + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Melee/syndicate_rapier.rsi + - type: DisarmMalus + malus: 0.6 + - type: MeleeWeapon + wideAnimationRotation: -135 + angle: 0 + animation: WeaponArcThrust + attackRate: 1.4 + damage: + types: + Piercing: 18 + resistanceBypass: true + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Reflect + reflectProb: 0.2 + spread: 90 + - type: Item + sprite: _Sunrise/Objects/Weapons/Melee/syndicate_rapier.rsi + - type: Tag + tags: + - SyndicateRapier diff --git a/Resources/Prototypes/_Sunrise/tags.yml b/Resources/Prototypes/_Sunrise/tags.yml index c1c90666515..4e654cbf0a1 100644 --- a/Resources/Prototypes/_Sunrise/tags.yml +++ b/Resources/Prototypes/_Sunrise/tags.yml @@ -138,3 +138,7 @@ - type: Tag id: MagazineDl6902 + +- type: Tag + id: SyndicateRapier + diff --git a/Resources/Textures/_Sunrise/Clothing/Belt/syndie_sheath.rsi/equipped-BELT.png b/Resources/Textures/_Sunrise/Clothing/Belt/syndie_sheath.rsi/equipped-BELT.png new file mode 100644 index 00000000000..c14db1435e7 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Belt/syndie_sheath.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Belt/syndie_sheath.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Belt/syndie_sheath.rsi/meta.json new file mode 100644 index 00000000000..a1bb9436540 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Belt/syndie_sheath.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Спизжено из SS13 Paradise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "sheath-rapier-equipped-BELT", + "directions": 4 + }, + { + "name": "sheath-rapier" + }, + { + "name": "sheath" + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Belt/syndie_sheath.rsi/sheath-rapier-equipped-BELT.png b/Resources/Textures/_Sunrise/Clothing/Belt/syndie_sheath.rsi/sheath-rapier-equipped-BELT.png new file mode 100644 index 00000000000..2cdb97d8336 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Belt/syndie_sheath.rsi/sheath-rapier-equipped-BELT.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Belt/syndie_sheath.rsi/sheath-rapier.png b/Resources/Textures/_Sunrise/Clothing/Belt/syndie_sheath.rsi/sheath-rapier.png new file mode 100644 index 00000000000..6a0ac123ef5 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Belt/syndie_sheath.rsi/sheath-rapier.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Belt/syndie_sheath.rsi/sheath.png b/Resources/Textures/_Sunrise/Clothing/Belt/syndie_sheath.rsi/sheath.png new file mode 100644 index 00000000000..446cfe69d19 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Belt/syndie_sheath.rsi/sheath.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Storage/sheath-rapier-gift.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Storage/sheath-rapier-gift.rsi/meta.json new file mode 100644 index 00000000000..c69d0351368 --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Storage/sheath-rapier-gift.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Спизжено из SS13 Paradise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "sheath-rapier-gift" + } + ] +} diff --git a/Resources/Textures/_Sunrise/Objects/Storage/sheath-rapier-gift.rsi/sheath-rapier-gift.png b/Resources/Textures/_Sunrise/Objects/Storage/sheath-rapier-gift.rsi/sheath-rapier-gift.png new file mode 100644 index 00000000000..60bfcd3e3ef Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Storage/sheath-rapier-gift.rsi/sheath-rapier-gift.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Melee/syndicate_rapier.rsi/icon.png b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/syndicate_rapier.rsi/icon.png new file mode 100644 index 00000000000..7eda280b4dd Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/syndicate_rapier.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Melee/syndicate_rapier.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/syndicate_rapier.rsi/inhand-left.png new file mode 100644 index 00000000000..991891def5c Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/syndicate_rapier.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Melee/syndicate_rapier.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/syndicate_rapier.rsi/inhand-right.png new file mode 100644 index 00000000000..5cbf8e69f4b Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/syndicate_rapier.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Melee/syndicate_rapier.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/syndicate_rapier.rsi/meta.json new file mode 100644 index 00000000000..590119a8b9c --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/syndicate_rapier.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Спизжено из SS13 Paradise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}