Merge pull request #911 from Zumorica/2020-05-13-stuns

Adds StunnableComponent, Stunbaton...
This commit is contained in:
Víctor Aguilera Puerto
2020-05-21 19:48:19 +02:00
committed by GitHub
41 changed files with 919 additions and 22 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,25 @@
- type: entity
name: Stun baton
parent: BaseItem
id: Stunbaton
components:
- type: Sprite
sprite: Objects/Melee/stunbaton.rsi
state: stunbaton_off
- type: Icon
sprite: Objects/Melee/stunbaton.rsi
state: stunbaton_off
- type: Stunbaton
damage: 1
range: 0.75
arcwidth: 0
arc: default
- type: Item
Size: 10
sprite: Objects/Melee/stunbaton.rsi
HeldPrefix: off
- type: ItemCooldown

View File

@@ -131,6 +131,8 @@
- type: FootstepSound
- type: HumanoidAppearance
- type: HumanInventoryController
- type: Stunnable
- type: AnimationPlayer
- type: entity
save: false

View File

@@ -0,0 +1,7 @@
- type: sound_collection
id: bodyfall
files:
- /Audio/effects/bodyfall1.ogg
- /Audio/effects/bodyfall2.ogg
- /Audio/effects/bodyfall3.ogg
- /Audio/effects/bodyfall4.ogg

View File

@@ -0,0 +1,7 @@
- type: sound_collection
id: sparks
files:
- /Audio/effects/sparks1.ogg
- /Audio/effects/sparks2.ogg
- /Audio/effects/sparks3.ogg
- /Audio/effects/sparks4.ogg

View File

@@ -0,0 +1,143 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC BY-SA 3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at b8758256b31013946fdbd320ca043a663c399656",
"states":
[
{
"name": "off-inhand-left",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "off-inhand-right",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "on-inhand-left",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
],
[
0.1,
0.1,
0.1,
0.1,
],
[
0.1,
0.1,
0.1,
0.1,
],
[
0.1,
0.1,
0.1,
0.1,
],
]
},
{
"name": "on-inhand-right",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
],
[
0.1,
0.1,
0.1,
0.1,
],
[
0.1,
0.1,
0.1,
0.1,
],
[
0.1,
0.1,
0.1,
0.1,
],
]
},
{
"name": "stunbaton_off",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "stunbaton_nocell",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "stunbaton_on",
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 259 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 261 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 807 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 789 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 431 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 362 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB