diff --git a/Resources/Audio/Weapons/sledgehammer_hit_1.ogg b/Resources/Audio/Weapons/sledgehammer_hit_1.ogg deleted file mode 100644 index fb0ab60c62..0000000000 Binary files a/Resources/Audio/Weapons/sledgehammer_hit_1.ogg and /dev/null differ diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index f5c692a1b8..68db40b20e 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -284,7 +284,6 @@ - id: WeaponPistolMk58Nonlethal - id: MagazinePistol - id: BoxMindshield - - id: TagillaHammer - type: entity id: LockerFreezerVaultFilled diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/tagilla_hammer.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/tagilla_hammer.yml deleted file mode 100644 index 9a95ae0d09..0000000000 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/tagilla_hammer.yml +++ /dev/null @@ -1,41 +0,0 @@ -- type: entity - name: Мёртвый удар - parent: BaseItem - id: TagillaHammer - description: При виде фелинида, держа эту огромную кувалду, у вас в голове появляется мысль - "Ха-ха, бегающий гвоздик!" - components: - - type: Sprite - sprite: Objects/Weapons/Melee/hammer_tagilla2.rsi - state: icon - scale: 0.8, 0.8 # needed - - type: MeleeWeapon - swingLeft: true - wideAnimationRotation: 135 - attackRate: 0.75 - damage: - types: - Blunt: 10 - Structural: 10 - soundHit: - path: "/Audio/Weapons/sledgehammer_hit_1.ogg" - - type: Wieldable - - type: IncreaseDamageOnWield - damage: - types: - Blunt: 30 - Structural: 40 - - type: Item - size: Ginormous - sprite: Objects/Weapons/Melee/hammer_tagilla.rsi - - type: Clothing - sprite: Objects/Weapons/Melee/hammer_tagilla.rsi - quickEquip: false - slots: - - back - - type: DisarmMalus - - type: Crit - critChance: 40 - critMultiplier: 1.5 - isBloodDagger: false - - type: UseDelay - delay: 1 diff --git a/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla.rsi/equipped-BACKPACK.png deleted file mode 100644 index 3b8501faad..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla.rsi/equipped-BACKPACK.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla.rsi/inhand-left.png deleted file mode 100644 index 6a22a0f1c7..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla.rsi/inhand-right.png deleted file mode 100644 index 9db2a7b901..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla.rsi/meta.json deleted file mode 100644 index 250e4915ea..0000000000 --- a/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla.rsi/meta.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "version": 1, - "license": "omsoyk", - "copyright": "omsoyk", - "size": { - "x": 64, - "y": 64 - }, - "states": [ - { - "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/Objects/Weapons/Melee/hammer_tagilla.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla.rsi/wielded-inhand-left.png deleted file mode 100644 index a918fc6f71..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla.rsi/wielded-inhand-right.png deleted file mode 100644 index ab7aed484f..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla2.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla2.rsi/icon.png deleted file mode 100644 index d9ef6010a6..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla2.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla2.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla2.rsi/meta.json deleted file mode 100644 index 7f9edb7fc1..0000000000 --- a/Resources/Textures/Objects/Weapons/Melee/hammer_tagilla2.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "license": "omsoyk", - "copyright": "omsoyk", - "size": { - "x": 47, - "y": 47 - }, - "states": [ - { - "name": "icon" - } - ] -}