More pirate weapon content(two new cannon ammo types, a musket and flintlock resprite and rebalance) (#23408)

* tally ho

* yarg

* forgot some shit

* Update projectiles.yml

* fucl

* glass ball

* Update snipers.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
This commit is contained in:
Boaz1111
2024-01-09 13:23:11 +01:00
committed by GitHub
parent d59e28522a
commit 5fd3d4552c
25 changed files with 109 additions and 24 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 546 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 544 B

View File

@@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi, ball Made by Alekshhh (Github) for ss14",
"copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi, ball, glassshot and grapeshot Made by Alekshhh (Github) for ss14",
"states": [
{
"name": "baton"
@@ -25,6 +25,12 @@
{
"name": "ball"
},
{
"name": "grapeshot"
},
{
"name": "glassshot"
},
{
"name": "spent"
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 254 B

View File

@@ -72,6 +72,12 @@
0.05
]
]
},
{
"name": "grapeshot"
},
{
"name": "shard"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 302 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 376 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 180 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 189 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 387 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 653 B

After

Width:  |  Height:  |  Size: 519 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 660 B

After

Width:  |  Height:  |  Size: 530 B

View File

@@ -1,24 +1,15 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/d1a574ded496e5ebb5373a8221c2c563820fc137/icons/obj/guns/projectile/obrez_bolt.dmi",
"copyright": "Made by Pato Grone for ss14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "base"
},
{
"name": "bolt-open"
},
{
"name": "bolt-closed"
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

Before

Width:  |  Height:  |  Size: 387 B

After

Width:  |  Height:  |  Size: 714 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 217 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 453 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 696 B

After

Width:  |  Height:  |  Size: 736 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 706 B

After

Width:  |  Height:  |  Size: 735 B

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/boltgun.dmi",
"copyright": "Made by Pato Grone for SS14",
"size": {
"x": 32,
"y": 32
@@ -17,15 +17,6 @@
},
{
"name": "base"
},
{
"name": "bolt-closed"
},
{
"name": "bolt-open"
},
{
"name": "icon"
}
]
}