diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/UnarmedCombatComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/UnarmedCombatComponent.cs index 0cd7cb189c..9841f283a0 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/UnarmedCombatComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/UnarmedCombatComponent.cs @@ -1,6 +1,4 @@ - -using Content.Server.GameObjects.EntitySystems; -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.Components.Weapon.Melee { diff --git a/Resources/Prototypes/Entities/Mobs/human.yml b/Resources/Prototypes/Entities/Mobs/human.yml index 629926bc51..ba2e459c0c 100644 --- a/Resources/Prototypes/Entities/Mobs/human.yml +++ b/Resources/Prototypes/Entities/Mobs/human.yml @@ -135,6 +135,9 @@ - type: Stunnable - type: AnimationPlayer - type: UnarmedCombat + range: 0.8 + arcwidth: 30 + arc: fist - type: entity save: false diff --git a/Resources/Prototypes/MeleeWeaponAnimations/default.yml b/Resources/Prototypes/MeleeWeaponAnimations/default.yml index c7fe845719..0259f33948 100644 --- a/Resources/Prototypes/MeleeWeaponAnimations/default.yml +++ b/Resources/Prototypes/MeleeWeaponAnimations/default.yml @@ -5,3 +5,10 @@ length: 0.1 color: 255,255,255,1020 colorDelta: 0,0,0,-5100 + +- type: MeleeWeaponAnimation + id: fist + state: fist + arcType: Poke + length: 0.15 + speed: 1 diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/fist.png b/Resources/Textures/Effects/weapons/arcs.rsi/fist.png new file mode 100644 index 0000000000..337d57adc2 Binary files /dev/null and b/Resources/Textures/Effects/weapons/arcs.rsi/fist.png differ diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/meta.json b/Resources/Textures/Effects/weapons/arcs.rsi/meta.json index d9ae4e1a8d..6b8951dec8 100644 --- a/Resources/Textures/Effects/weapons/arcs.rsi/meta.json +++ b/Resources/Textures/Effects/weapons/arcs.rsi/meta.json @@ -13,6 +13,10 @@ { "name": "slash", "directions": 1 + }, + { + "name": "fist", + "directions": 1 } ] }