Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Magic staves + wands (#9070)

Browse Source
This commit is contained in:
Kara
2022-07-14 19:45:27 -07:00
committed by GitHub
parent 9608005db0
commit ad7889e8a9
85 changed files with 1299 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/animation-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/animation-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/animation.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 782 B

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/change-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/change-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/change.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 949 B

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/chaos-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/chaos-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/chaos.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/door-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/door-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/door.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1010 B

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/healing-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/healing-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/healing.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

522
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/meta.json Normal file
View File

@@ -0,0 +1,522 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "/tg/station at https://github.com/tgstation/tgstation/commit/270acce4f551253d8ac75de19236b8b4be598f7f. edited by mirrorcult to allow layering",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "animation",
"delays": [
[
0.5,
0.5,
0.5,
0.5
]
]
},
{
"name": "healing",
"delays": [
[
0.1,
0.1,
0.2,
0.1,
0.1,
0.1,
0.2,
0.1,
0.1,
0.1,
0.2,
0.1,
0.1,
0.1,
0.2,
0.1
]
]
},
{
"name": "door",
"delays": [
[
2,
2,
2,
2
]
]
},
{
"name": "staff-inhand-left",
"directions": 4,
"delays": [
[
0.5,
0.5,
0.5,
0.5
],
[
0.5,
0.5,
0.5,
0.5
],
[
0.5,
0.5,
0.5,
0.5
],
[
0.5,
0.5,
0.5,
0.5
]
]
},
{
"name": "animation-inhand-left",
"directions": 4,
"delays": [
[
0.5,
0.5,
0.5,
0.5
],
[
0.5,
0.5,
0.5,
0.5
],
[
0.5,
0.5,
0.5,
0.5
],
[
0.5,
0.5,
0.5,
0.5
]
]
},
{
"name": "healing-inhand-left",
"directions": 4,
"delays": [
[
0.2,
0.2,
0.1,
0.2,
0.2,
0.1,
0.2,
0.2,
0.1,
0.2,
0.2,
0.1
],
[
0.2,
0.2,
0.1,
0.2,
0.2,
0.1,
0.2,
0.2,
0.1,
0.2,
0.2,
0.1
],
[
0.2,
0.2,
0.1,
0.2,
0.2,
0.1,
0.2,
0.2,
0.1,
0.2,
0.2,
0.1
],
[
0.2,
0.2,
0.1,
0.2,
0.2,
0.1,
0.2,
0.2,
0.1,
0.2,
0.2,
0.1
]
]
},
{
"name": "door-inhand-left",
"directions": 4,
"delays": [
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
]
]
},
{
"name": "staff-inhand-right",
"directions": 4,
"delays": [
[
0.5,
0.5,
0.5,
0.5
],
[
0.5,
0.5,
0.5,
0.5
],
[
0.5,
0.5,
0.5,
0.5
],
[
0.5,
0.5,
0.5,
0.5
]
]
},
{
"name": "animation-inhand-right",
"directions": 4,
"delays": [
[
0.5,
0.5,
0.5,
0.5
],
[
0.5,
0.5,
0.5,
0.5
],
[
0.5,
0.5,
0.5,
0.5
],
[
0.5,
0.5,
0.5,
0.5
]
]
},
{
"name": "healing-inhand-right",
"directions": 4,
"delays": [
[
0.2,
0.2,
0.1,
0.2,
0.2,
0.1,
0.2,
0.2,
0.1,
0.2,
0.2,
0.1
],
[
0.2,
0.2,
0.1,
0.2,
0.2,
0.1,
0.2,
0.2,
0.1,
0.2,
0.2,
0.1
],
[
0.2,
0.2,
0.1,
0.2,
0.2,
0.1,
0.2,
0.2,
0.1,
0.2,
0.2,
0.1
],
[
0.2,
0.2,
0.1,
0.2,
0.2,
0.1,
0.2,
0.2,
0.1,
0.2,
0.2,
0.1
]
]
},
{
"name": "door-inhand-right",
"directions": 4,
"delays": [
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
]
]
},
{
"name": "change",
"delays": [
[
0.4,
0.4,
0.4,
0.4,
0.4
]
]
},
{
"name": "nothing",
"delays": [
[
0.5,
0.5,
0.5,
0.5
]
]
},
{
"name": "chaos",
"delays": [
[
0.5,
0.5,
0.5,
0.5
]
]
},
{
"name": "change-inhand-left",
"directions": 4,
"delays": [
[
0.4,
0.4,
0.4,
0.4,
0.4
],
[
0.4,
0.4,
0.4,
0.4,
0.4
],
[
0.4,
0.4,
0.4,
0.4,
0.4
],
[
0.4,
0.4,
0.4,
0.4,
0.4
]
]
},
{
"name": "chaos-inhand-left",
"directions": 4,
"delays": [
[
0.4,
0.4,
0.4,
0.4
],
[
0.4,
0.4,
0.4,
0.4
],
[
0.4,
0.4,
0.4,
0.4
],
[
0.4,
0.4,
0.4,
0.4
]
]
},
{
"name": "change-inhand-right",
"directions": 4,
"delays": [
[
0.4,
0.4,
0.4,
0.4,
0.4
],
[
0.4,
0.4,
0.4,
0.4,
0.4
],
[
0.4,
0.4,
0.4,
0.4,
0.4
],
[
0.4,
0.4,
0.4,
0.4,
0.4
]
]
},
{
"name": "chaos-inhand-right",
"directions": 4,
"delays": [
[
0.5,
0.5,
0.5,
0.5
],
[
0.5,
0.5,
0.5,
0.5
],
[
0.5,
0.5,
0.5,
0.5
],
[
0.5,
0.5,
0.5,
0.5
]
]
}
]
}

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/nothing.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 534 B

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/staff-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/staff-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/staffofchange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/death-effect.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 278 B

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/death.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 340 B

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/door-effect.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 182 B

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/door.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 379 B

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/fire-effect.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 442 B

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/fire.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 284 B

68
Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/meta.json Normal file
View File

@@ -0,0 +1,68 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "/tg/station at https://github.com/tgstation/tgstation/commit/270acce4f551253d8ac75de19236b8b4be598f7f. edited by mirrorcult to allow layering",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "death-effect",
"delays": [
[
0.3,
0.3
]
]
},
{
"name": "poly-effect",
"delays": [
[
0.5,
0.5,
0.5,
0.5
]
]
},
{
"name": "fire-effect",
"delays": [
[
0.2,
0.2,
0.2,
0.2
]
]
},
{
"name": "death"
},
{
"name": "poly"
},
{
"name": "fire"
},
{
"name": "door-effect"
},
{
"name": "door"
},
{
"name": "nothing"
},
{
"name": "wand-inhand-left",
"directions": 4
},
{
"name": "wand-inhand-right",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/nothing.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 342 B

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/poly-effect.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 510 B

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/poly.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 299 B

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/wand-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 316 B

BIN
Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/wand-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 322 B

BIN
Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/arcane_barrage.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 356 B

After

Width:  |  Height:  |  Size: 396 B

BIN
Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/blastwave.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 906 B

After

Width:  |  Height:  |  Size: 555 B

BIN
Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/chronobolt.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 320 B

After

Width:  |  Height:  |  Size: 263 B

BIN
Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/cryoshot.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 249 B

After

Width:  |  Height:  |  Size: 218 B

BIN
Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/declone.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 341 B

BIN
Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/energy.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 384 B

BIN
Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/energy2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 395 B

BIN
Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/energy3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 417 B

BIN
Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/fireball.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/infernoshot.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 468 B

After

Width:  |  Height:  |  Size: 398 B

30
Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/meta.json
View File

@@ -7,16 +7,6 @@
"y": 32
},
"states": [
{
"name": "energy",
"delays": [
[
0.1,
0.1,
0.1
]
]
},
{
"name": "magicm",
"delays": [
@@ -59,26 +49,6 @@
]
]
},
{
"name": "energy2",
"delays": [
[
0.1,
0.1,
0.1
]
]
},
{
"name": "energy3",
"delays": [
[
0.1,
0.1,
0.1
]
]
},
{
"name": "chronobolt"
},

BIN
Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/spell.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 352 B

After

Width:  |  Height:  |  Size: 314 B