diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index 51524297c9..e82c4d6a2b 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -394,6 +394,9 @@ ent-CP14BaseThrowableSpear = метательное копьё ent-CP14BaseTwoHandedSword = двуручный меч .desc = Мощное оружие, требующее огромной силы и умения для эффективного использования. +ent-CP14TwoHandedSwordScythe = коса + .desc = Большая двуручная коса. Что вы будете косить ею? Пшено, или головы своих врагов? + ent-CP14WeaponRevolverNavy = револьвер "Марин" .desc = Увесистый капсюльный револьвер серии "Марин". В настоящее время револьверы серии "Марин" стоят баснословные деньги, и их могут позволить себе исключительно преуспевающие моряки и торговцы. diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml index 5313bd85ff..66368aa6df 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml @@ -47,4 +47,19 @@ - type: CP14SkillRequirement fuckupChance: 0.5 requiredSkills: - - Warcraft \ No newline at end of file + - Warcraft + +- type: entity + id: CP14TwoHandedSwordScythe + parent: CP14BaseTwoHandedSword + name: scythe + description: A large, two-handed scythe. What will you mow with it? Millet or heads? + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi + state: icon + - type: Clothing + sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi + - type: Tag + tags: + - CP14HerbalGathering \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..c21554bedc Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/icon.png new file mode 100644 index 0000000000..3e226cd881 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/inhand-left.png new file mode 100644 index 0000000000..1aee844538 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/inhand-right.png new file mode 100644 index 0000000000..7c36eb58e0 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/meta.json new file mode 100644 index 0000000000..2c3cbc4e20 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "Created by TheShuEd (Github) for CrystallPunk", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..d5ca4921ce Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..22cec3d051 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/wielded-inhand-right.png differ