diff --git a/Resources/Prototypes/MeleeWeaponAnimations/animations.yml b/Resources/Prototypes/MeleeWeaponAnimations/animations.yml new file mode 100644 index 0000000000..ad05697497 --- /dev/null +++ b/Resources/Prototypes/MeleeWeaponAnimations/animations.yml @@ -0,0 +1,55 @@ +- type: MeleeWeaponAnimation + id: default + state: slash + arcType: Slash + length: 0.1 + color: 255,255,255,1020 + colorDelta: 0,0,0,-5100 + +- type: MeleeWeaponAnimation + id: Bite + state: bite + arcType: Poke + length: 0.4 + color: 255,255,255,1020 + colorDelta: 0,0,0,-5100 + +- type: MeleeWeaponAnimation + id: Claw + state: claw + arcType: Slash + length: 0.4 + color: 255,255,255,1020 + colorDelta: 0,0,0,-5100 + +- type: MeleeWeaponAnimation + id: Disarm + state: disarm + arcType: Poke + length: 0.3 + color: 255,255,255,1020 + colorDelta: 0,0,0,-5100 + +- type: MeleeWeaponAnimation + id: Kick + state: kick + arcType: Poke + length: 0.3 + color: 255,255,255,1020 + colorDelta: 0,0,0,-5100 + +- type: MeleeWeaponAnimation + id: Punch + state: punch + arcType: Poke + length: 0.5 + color: 255,255,255,1020 + colorDelta: 0,0,0,-5100 + +- type: MeleeWeaponAnimation + id: Smash + state: smash + arcType: Poke + length: 0.3 + color: 255,255,255,1020 + colorDelta: 0,0,0,-5100 diff --git a/Resources/Prototypes/MeleeWeaponAnimations/default.yml b/Resources/Prototypes/MeleeWeaponAnimations/default.yml deleted file mode 100644 index c7fe845719..0000000000 --- a/Resources/Prototypes/MeleeWeaponAnimations/default.yml +++ /dev/null @@ -1,7 +0,0 @@ -- type: MeleeWeaponAnimation - id: default - state: slash - arcType: Slash - length: 0.1 - color: 255,255,255,1020 - colorDelta: 0,0,0,-5100 diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/bite.png b/Resources/Textures/Effects/weapons/arcs.rsi/bite.png new file mode 100644 index 0000000000..1826701a47 Binary files /dev/null and b/Resources/Textures/Effects/weapons/arcs.rsi/bite.png differ diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/claw.png b/Resources/Textures/Effects/weapons/arcs.rsi/claw.png new file mode 100644 index 0000000000..62e1234404 Binary files /dev/null and b/Resources/Textures/Effects/weapons/arcs.rsi/claw.png differ diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/disarm.png b/Resources/Textures/Effects/weapons/arcs.rsi/disarm.png new file mode 100644 index 0000000000..f963782898 Binary files /dev/null and b/Resources/Textures/Effects/weapons/arcs.rsi/disarm.png differ diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/kick.png b/Resources/Textures/Effects/weapons/arcs.rsi/kick.png new file mode 100644 index 0000000000..9645f8b1dd Binary files /dev/null and b/Resources/Textures/Effects/weapons/arcs.rsi/kick.png differ diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/meta.json b/Resources/Textures/Effects/weapons/arcs.rsi/meta.json index d9ae4e1a8d..2b141cfdee 100644 --- a/Resources/Textures/Effects/weapons/arcs.rsi/meta.json +++ b/Resources/Textures/Effects/weapons/arcs.rsi/meta.json @@ -4,7 +4,8 @@ "x": 32, "y": 32 }, - + "license": "CC-BY-SA-3.0 for bite->smash", + "copyright": "https://github.com/tgstation/tgstation/raw/c545428822f1ee0d402b812221518632dbe198cb/icons/effects/effects.dmi", "states": [ { "name": "spear", @@ -13,6 +14,76 @@ { "name": "slash", "directions": 1 + }, + { + "name": "bite", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "claw", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "disarm", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "kick", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "punch", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "smash", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] } ] } diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/punch.png b/Resources/Textures/Effects/weapons/arcs.rsi/punch.png new file mode 100644 index 0000000000..a7b116ed6a Binary files /dev/null and b/Resources/Textures/Effects/weapons/arcs.rsi/punch.png differ diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/smash.png b/Resources/Textures/Effects/weapons/arcs.rsi/smash.png new file mode 100644 index 0000000000..94e259a154 Binary files /dev/null and b/Resources/Textures/Effects/weapons/arcs.rsi/smash.png differ