diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl index d93c180aec9956..825fd5ee618682 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl @@ -31,6 +31,18 @@ ent-ClothingBackpackDuffelSyndicateFilledCarbine = набор "М-90gl" ent-ClothingBackpackDuffelSyndicateAmmoFilled = набор боеприпасов .desc = Перезарядка! Содержит 4 магазина для C-20r, 4 барабана для Бульдога и 2 коробки с патронами для L6 SAW. .suffix = { "" } +ent-ClothingBackpackDuffelSyndicateAmmoPistolFilled = набор с пистолетными магазинами (.35) + .desc = Набор, содержащий расширенные магазины для пистолета. 2 стандартных и 2 высокоскорострельных. Подходит для Гадюки. + .suffix = { "" } +ent-ClothingBackpackDuffelSyndicateAmmoPistolSubMachineGunBundle = набор с магазинами ПП (.35) + .desc = Набор, содержащий магазины для ПП. 2 стандартных и 2 высокоскорострельных. Совместим с C-20r. + .suffix = { "" } +ent-ClothingBackpackDuffelSyndicateAmmoShotGunBundle = набор с магазинами дробовика (.50) + .desc = Набор, содержащий магазины для дробовика. 2 стандартных, 2 пулевых и 1 зажигательный. Совместим с Бульдогом. + .suffix = { "" } +ent-ClothingBackpackDuffelSyndicateAmmoCaselessRifleBundle = набор с магазинами винтовки (.25) + .desc = Набор, содержащий магазины для винтовки. 2 стандартных и 2 высокоскорострельных. Совместим с КР51. + .suffix = { "" } ent-ClothingBackpackDuffelSyndicateCostumeCentcom = вещмешок с костюмом представителя Центкома .desc = Содержит полный комплект униформы представителя Центкома, гарнитуру и планшет. Гарнитура поставляется без ключа шифрования. .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl index 96941bdde683f8..72c852bda77079 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl @@ -13,3 +13,6 @@ ent-EnergyCutlass = энергетический катлас ent-EnergySwordDouble = сдвоенный энергетический меч .desc = Стажёры Командования Синдиката решили, что одного лезвия на энергетическом мече недостаточно. Можно поместить в карман. .suffix = { "" } +ent-EnergyAxe = лазерный топор + .desc = Зачем бороться с огнём с помощью топора, если можно бороться с огнём и топором? Теперь с прочной карбоновой ручкой и лазерным лезвием! + .suffix = { "" } diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl index c053eea6efba47..ab28ec38d75feb 100644 --- a/Resources/Locale/ru-RU/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/store/uplink-catalog.ftl @@ -15,6 +15,8 @@ uplink-edagger-name = Энергетический кинжал uplink-edagger-desc = Маленькое энергетический кинжал спрятанный под форму ручки. uplink-fire-axe-flaming-name = Пожарный топор uplink-fire-axe-flaming-desc = Стилизованный под классику топор соединёный с продвинутыми атмос технологиями чтобы поджигать цели. +uplink-energy-axe-name = Лазерный топор +uplink-energy-axe-desc = Технологичный топор, созданый группой ученых из Киберсан и синдиката. Слишком примечательный для агентов, является исключительной технологией ядерных оперативников. uplink-gloves-north-star-name = Перчатки северной звезды uplink-gloves-north-star-desc = Пара перчаток, которые значительно сокращают задержку между ударами, позволяя забивать людей до смерти градом ударов. # Взрывчатка @@ -40,9 +42,31 @@ uplink-exploding-pen-desc = Взрывное устройство класса I uplink-smg-magazine-name = Магазин для пистолета-пулемёта (.35 авто) uplink-smg-magazine-desc = Магазин для пистолета-пулемёта с 30 патронами. Подходит для С20-r. uplink-pistol-magazine-name = Пистолетный магазин (.35 авто) -uplink-pistol-magazine-desc = Пистолетый магазин с 10 патронами. Подходит для Гадюки. +uplink-pistol-magazine-desc = Пистолетый магазин с 15 патронами. Подходит для Гадюки. +uplink-pistol-magazine-HV-name = Пистолетный магазин (.35 высокоскорострельный) +uplink-pistol-magazine-HV-desc = Пистолетый магазин с 15 высокоскорострельными патронами. Подходит для Гадюки. +uplink-pistol-magazine-bundle-name = Набор с пистолетными магазинами (.35) +uplink-pistol-magazine-bundle-desc = Набор, содержащий расширенные магазины для пистолета. 2 стандартных и 2 высокоскорострельных. Подходит для Гадюки. +uplink-pistol-magazine-c20r-hv-name = Магазин ПП (.35 высокоскорострельный) +uplink-pistol-magazine-c20r-hv-desc = Винтовочный магазин с 30 высокоскорострельными патронами. Совместим с C-20r. +uplink-pistol-magazine-c20r-bundle-name = Набор с магазинами ПП (.35) +uplink-pistol-magazine-c20r-bundle-desc = Набор, содержащий магазины для ПП. 2 стандартных и 2 высокоскорострельных. Совместим с C-20r. uplink-pistol-magazine-c20r-name = Магазин ПП (.35 авто) uplink-pistol-magazine-c20r-desc = Винтовочный магазин с 30 патронами. Совместим с C-20r. +uplink-magazine-shotgun-pellets-name = Магазин барабан (.50 дробь) +uplink-magazine-shotgun-pellets-desc = Магазин для дробовика с 8 дробовичными патронами. Совместим с Бульдогом. +uplink-magazine-shotgun-slug-name = Магазин барабан (.50 пуля) +uplink-magazine-shotgun-slug-desc = Магазин для дробовика с 8 пулевыми патронами. Совместим с Бульдогом. +uplink-magazine-shotgun-incendiary-name = Магазин барабан (.50 зажигательные) +uplink-magazine-shotgun-incendiary-desc = Магазин для дробовика с 8 зажигательными патронами. Совместим с Бульдогом. +uplink-magazine-shotgun-bundle-name = Набор с магазинами дробовика (.50) +uplink-magazine-shotgun-bundle-desc = Набор, содержащий магазины для дробовика. 2 стандартных, 2 пулевых и 1 зажигательный. Совместим с Бульдогом. +uplink-magazine-caseless-rifle-name = Магазин винтовки (.25 безгильзовые) +uplink-magazine-caseless-rifle-desc = Магазин для винтовки с 30 безгильзовыми патронами. Совместим с КР51. +uplink-magazine-caseless-rifle-hv-name = Магазин винтовки (.25 безгильзовые высокоскорострельными) +uplink-magazine-caseless-rifle-hv-desc = Магазин для винтовки с 30 безгильзовыми высокоскорострельными патронами. Совместим с КР51. +uplink-magazine-caseless-rifle-bundle-name = Набор с магазинами винтовки (.25) +uplink-magazine-caseless-rifle-bundle-desc = Набор, содержащий магазины для винтовки. 2 стандартных и 2 высокоскорострельных. Совместим с КР51. uplink-pistol-magazine-caseless-name = Пистолетный магазин (.25 безгильзовые) uplink-pistol-magazine-caseless-desc = Пистолетный магазин с 10 безгильзовыми патронами. Подходит для Кобры. uplink-speedloader-magnum-name = Спидлоадер (.45 магнум) diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index d913bb3a85c48b..a68938275f82dc 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -81,7 +81,7 @@ - type: StorageFill contents: - id: WeaponRifleKR51 - - id: MagazineCaselessRifleShort + - id: MagazineCaselessRifle amount: 2 - type: entity @@ -154,6 +154,60 @@ - id: MagazineLightRifleBox amount: 2 +- type: entity + parent: ClothingBackpackDuffelSyndicateAmmo + id: ClothingBackpackDuffelSyndicateAmmoPistolFilled + name: ammo bundle + description: "Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, and 2 ammo boxes for the L6 SAW." + components: + - type: StorageFill + contents: + - id: MagazinePistolHighCapacityHighVelocity + amount: 2 + - id: MagazinePistolHighCapacity + amount: 2 + +- type: entity + parent: ClothingBackpackDuffelSyndicateAmmo + id: ClothingBackpackDuffelSyndicateAmmoPistolSubMachineGunBundle + name: ammo bundle + description: "Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, and 2 ammo boxes for the L6 SAW." + components: + - type: StorageFill + contents: + - id: MagazinePistolSubMachineGunHighVelocity + amount: 2 + - id: MagazinePistolSubMachineGun + amount: 2 + +- type: entity + parent: ClothingBackpackDuffelSyndicateAmmo + id: ClothingBackpackDuffelSyndicateAmmoShotGunBundle + name: ammo bundle + description: "Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, and 2 ammo boxes for the L6 SAW." + components: + - type: StorageFill + contents: + - id: MagazineShotgun + amount: 2 + - id: MagazineShotgunSlug + amount: 2 + - id: MagazineShotgunIncendiary + amount: 1 + +- type: entity + parent: ClothingBackpackDuffelSyndicateAmmo + id: ClothingBackpackDuffelSyndicateAmmoCaselessRifleBundle + name: ammo bundle + description: "Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, and 2 ammo boxes for the L6 SAW." + components: + - type: StorageFill + contents: + - id: MagazineCaselessRifleHighVelocity + amount: 2 + - id: MagazineCaselessRifle + amount: 2 + - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelSyndicateCostumeCentcom diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 544c2e72f40f76..e455a244db578b 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -74,6 +74,26 @@ Telecrystal: 10 categories: - UplinkWeapons + conditions: + - !type:StoreWhitelistCondition + blacklist: + tags: + - NukeOpsUplink + +- type: listing + id: UplinkEnergyAxe + name: uplink-energy-axe-name + description: uplink-energy-axe-desc + productEntity: EnergyAxe + cost: + Telecrystal: 16 + categories: + - UplinkWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink - type: listing id: UplinkGlovesNorthStar @@ -206,14 +226,54 @@ # Ammo +- type: listing + id: UplinkAmmoBundle + name: uplink-ammo-bundle-name + description: uplink-ammo-bundle-desc + productEntity: ClothingBackpackDuffelSyndicateAmmoFilled + cost: + Telecrystal: 15 + categories: + - UplinkAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + - !type:BuyerWhitelistCondition + blacklist: + components: + - SurplusBundle + - type: listing id: UplinkPistol9mmMagazine name: uplink-pistol-magazine-name description: uplink-pistol-magazine-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: red-icon } - productEntity: MagazinePistol + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi, state: red } + productEntity: MagazinePistolHighCapacity cost: - Telecrystal: 1 + Telecrystal: 2 + categories: + - UplinkAmmo + +- type: listing + id: UplinkPistol9mmMagazineHV + name: uplink-pistol-magazine-HV-name + description: uplink-pistol-magazine-HV-desc + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi, state: high_velocity } + productEntity: MagazinePistolHighCapacityHighVelocity + cost: + Telecrystal: 3 + categories: + - UplinkAmmo + +- type: listing + id: UplinkPistol9mmMagazineBundle + name: uplink-pistol-magazine-bundle-name + description: uplink-pistol-magazine-bundle-desc + productEntity: ClothingBackpackDuffelSyndicateAmmoPistolFilled + cost: + Telecrystal: 8 categories: - UplinkAmmo @@ -234,6 +294,147 @@ tags: - NukeOpsUplink +- type: listing + id: UplinkMagazinePistolSubMachineGunHV + name: uplink-pistol-magazine-c20r-hv-name + description: uplink-pistol-magazine-c20r-hv-desc + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: high_velocity } + productEntity: MagazinePistolSubMachineGunHighVelocity + cost: + Telecrystal: 4 + categories: + - UplinkAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + +- type: listing + id: UplinkMagazinePistolSubMachineGunBundle + name: uplink-pistol-magazine-c20r-bundle-name + description: uplink-pistol-magazine-c20r-bundle-desc + productEntity: ClothingBackpackDuffelSyndicateAmmoPistolSubMachineGunBundle + cost: + Telecrystal: 12 + categories: + - UplinkAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + +- type: listing + id: UplinkMagazineShotGunPellets + name: uplink-magazine-shotgun-pellets-name + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi, state: pellets } + description: uplink-magazine-shotgun-pellets-desc + productEntity: MagazineShotgun + cost: + Telecrystal: 3 + categories: + - UplinkAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + +- type: listing + id: UplinkMagazineShotGunSlug + name: uplink-magazine-shotgun-slug-name + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi, state: slug } + description: uplink-magazine-shotgun-slug-desc + productEntity: MagazineShotgunSlug + cost: + Telecrystal: 3 + categories: + - UplinkAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + +- type: listing + id: UplinkMagazineShotGunIncendiary + name: uplink-magazine-shotgun-incendiary-name + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi, state: base } + description: uplink-magazine-shotgun-incendiary-desc + productEntity: MagazineShotgunIncendiary + cost: + Telecrystal: 5 + categories: + - UplinkAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + +- type: listing + id: UplinkMagazineShotGunBundle + name: uplink-magazine-shotgun-bundle-name + description: uplink-magazine-shotgun-bundle-desc + productEntity: ClothingBackpackDuffelSyndicateAmmoShotGunBundle + cost: + Telecrystal: 12 + categories: + - UplinkAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + +- type: listing + id: UplinkMagazineCaselessRifle + name: uplink-magazine-caseless-rifle-name + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi, state: red } + description: uplink-magazine-caseless-rifle-desc + productEntity: MagazineCaselessRifle + cost: + Telecrystal: 3 + categories: + - UplinkAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + +- type: listing + id: UplinkMagazineCaselessRifleHV + name: uplink-magazine-caseless-rifle-hv-name + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi, state: high_velocity } + description: uplink-magazine-caseless-rifle-hv-desc + productEntity: MagazineCaselessRifleHighVelocity + cost: + Telecrystal: 4 + categories: + - UplinkAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + +- type: listing + id: UplinkMagazineCaselessRifleBundle + name: uplink-magazine-caseless-rifle-bundle-name + description: uplink-magazine-caseless-rifle-bundle-desc + productEntity: ClothingBackpackDuffelSyndicateAmmoCaselessRifleBundle + cost: + Telecrystal: 12 + categories: + - UplinkAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + # For the Cobra - type: listing id: UplinkMagazinePistolCaselessRifle @@ -591,24 +792,6 @@ # Bundles -- type: listing - id: UplinkAmmoBundle - name: uplink-ammo-bundle-name - description: uplink-ammo-bundle-desc - productEntity: ClothingBackpackDuffelSyndicateAmmoFilled - cost: - Telecrystal: 15 - categories: - - UplinkBundles - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - NukeOpsUplink - - !type:BuyerWhitelistCondition - blacklist: - components: - - SurplusBundle - type: listing id: UplinkMedsBundle @@ -658,7 +841,7 @@ icon: { sprite: /Textures/Objects/Weapons/Guns/Rifles/kr51.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateFilledRifle cost: - Telecrystal: 25 + Telecrystal: 17 categories: - UplinkBundles diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 7792e2809d87f9..e434756fc8222a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -480,8 +480,8 @@ Radiation: 0.5 Caustic: 0.5 - type: ClothingSpeedModifier - walkModifier: 0.9 - sprintModifier: 0.9 + walkModifier: 1 + sprintModifier: 1 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSyndie diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml index b78825f3e14d50..dece74fcd91c5e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml @@ -84,7 +84,7 @@ proto: ShellShotgunIncendiary - type: Sprite layers: - - state: slug + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index ec23d3063a0b87..9b619edad1b74e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -10,7 +10,7 @@ - type: Projectile damage: types: - Piercing: 8 # Should have the same or less damage than a regular pellet + Piercing: 12 # Should have the same or less damage than a regular pellet - type: entity id: PelletShotgunBeanbag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index a13e2f4bd270de..c92de99d8ab150 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -204,3 +204,48 @@ enabled: true reflectProb: .75 spread: 75 + +- type: entity + name: Double Bladed Energy Sword + parent: EnergySword + id: EnergyAxe + description: Syndicate Command Interns thought that having one blade on the energy sword was not enough. This can be stored in pockets. + components: + - type: Wieldable + wieldTime: 1 + - type: EnergySword + litDamageBonus: + types: + Slash: 20 + Heat: 20 + Structural: 60 + litDisarmMalus: 0.7 + - type: MeleeWeapon + attackRate: 0.9 + angle: 100 + heavyWindupModifier: .9 + heavyDamageModifier: 1.5 + soundHit: + path: /Audio/Weapons/eblade1.ogg + damage: + types: + Blunt: 4.5 + - type: Sprite + sprite: Objects/Weapons/Melee/e_axe.rsi + layers: + - state: e_axe + - state: e_axe_blade + color: "#FFFFFF" + visible: false + shader: unshaded + map: [ "blade" ] + - type: Item + size: 35 + sprite: Objects/Weapons/Melee/e_axe.rsi + - type: Tool + qualities: + - Prying + - type: Reflect + enabled: true + reflectProb: .75 + spread: 75 diff --git a/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/e_axe.png b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/e_axe.png new file mode 100644 index 00000000000000..8d84bf1d1e93ba Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/e_axe.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/e_axe_blade.png b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/e_axe_blade.png new file mode 100644 index 00000000000000..549f5ffc7e79de Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/e_axe_blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/icon.png new file mode 100644 index 00000000000000..e03028108debe0 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/inhand-left-blade.png new file mode 100644 index 00000000000000..c12f3e99b5267a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/inhand-left-blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/inhand-left.png new file mode 100644 index 00000000000000..e484a6c0304f7b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/inhand-right-blade.png new file mode 100644 index 00000000000000..96a0984bcb27ea Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/inhand-right-blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/inhand-right.png new file mode 100644 index 00000000000000..4391af61d2576f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/meta.json new file mode 100644 index 00000000000000..45762281094a85 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/meta.json @@ -0,0 +1,100 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "e_axe" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "e_axe_blade", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left-blade", + "directions": 4, + "delays": [ + [ + 0.15, + 0.15, + 0.15 + ], + [ + 0.15, + 0.15, + 0.15 + ], + [ + 0.15, + 0.15, + 0.15 + ], + [ + 0.15, + 0.15, + 0.15 + ] + ] + }, + { + "name": "inhand-right-blade", + "directions": 4, + "delays": [ + [ + 0.15, + 0.15, + 0.15 + ], + [ + 0.15, + 0.15, + 0.15 + ], + [ + 0.15, + 0.15, + 0.15 + ], + [ + 0.15, + 0.15, + 0.15 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000000..0b3e9fe501fd1a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000000..5392b3a49bcd14 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_axe.rsi/wielded-inhand-right.png differ