From 264d3d39427e642582e69661147cbf79f2c27a4e Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Tue, 23 Jun 2020 05:53:38 -0700
Subject: [PATCH] Add fist graphic and change some punch settings

---
 .../Weapon/Melee/UnarmedCombatComponent.cs        |   4 +---
 Resources/Prototypes/Entities/Mobs/human.yml      |   3 +++
 .../Prototypes/MeleeWeaponAnimations/default.yml  |   7 +++++++
 .../Textures/Effects/weapons/arcs.rsi/fist.png    | Bin 0 -> 190 bytes
 .../Textures/Effects/weapons/arcs.rsi/meta.json   |   4 ++++
 5 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Textures/Effects/weapons/arcs.rsi/fist.png

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 0000000000000000000000000000000000000000..337d57adc28b31a7e1d84c2eed5d212dedb6996c
GIT binary patch
literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6`n4RArY-_
zCwp@pFyLVIeR<Sor@MD}6NlKJ7QJ6-q8!hBO%$1c3K<yc(^I)!QrxT0%&~iaO6-S1
ztnufn$<m@59!f=V`g6M^ZsT@mty$3VCQtlbR|8vkmhIyG4I1`sUpSWK#fg0oy7+5F
j!_wb!x0tj(u5@T;-@Df=)k^IfE68L|S3j3^P6<r_4ktj|

literal 0
HcmV?d00001

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
         }
     ]
 }