Ports the /tg/ shotgun sprites (#22539)

* ports the /tg/ shotgun sprites

* webedit fail

* i'm wario and my furniture is broken

* hopefully finally actually fix tests? maybe? my couch is broken

* update shotgun cabinet

* update shotgun cabinet MORE

* ohhhhhh my god...
This commit is contained in:
Flareguy
2023-12-15 22:23:57 -06:00
committed by GitHub
parent 87c48047e1
commit e31cf20871
45 changed files with 76 additions and 60 deletions

View File

@@ -105,12 +105,14 @@
id: WeaponShotgunDoubleBarreled
description: An immortal classic. Uses .50 shotgun shells.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
- type: Item
size: Normal
shape:
- 0,0,4,0
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
heldPrefix: db
- type: Gun
fireRate: 2
- type: BallisticAmmoProvider
@@ -134,25 +136,22 @@
name: Enforcer
parent: BaseWeaponShotgun
id: WeaponShotgunEnforcer
description: A next-generation Frozen Star shotgun. Uses .50 shotgun shells.
description: A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
- type: Clothing
sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
- type: Item
sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
heldPrefix: enforcer
- type: BallisticAmmoProvider
- type: entity
name: Enforcer
parent: BaseWeaponShotgun
parent: WeaponShotgunEnforcer
id: WeaponShotgunEnforcerRubber
description: A next-generation Frozen Star shotgun. Uses .50 shotgun shells.
suffix: Non-Lethal
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
- type: Clothing
sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
- type: BallisticAmmoProvider
proto: ShellShotgunBeanbag
@@ -166,6 +165,8 @@
size: Normal
shape:
- 0,0,4,0
sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
heldPrefix: pump
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
- type: Clothing
@@ -188,6 +189,8 @@
sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
- type: Item
size: Small
sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
heldPrefix: sawn
- type: Gun
fireRate: 4
- type: BallisticAmmoProvider
@@ -261,14 +264,16 @@
id: WeaponShotgunImprovised
description: A shitty, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber.
components:
- type: Item
size: Normal
shape:
- 0,0,4,0
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi
- type: Clothing
sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi
- type: Item
size: Normal
shape:
- 0,0,4,0
sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
heldPrefix: improvised
- type: Gun
fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways.
- type: BallisticAmmoProvider

Binary file not shown.

Before

Width:  |  Height:  |  Size: 286 B

After

Width:  |  Height:  |  Size: 328 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 912 B

After

Width:  |  Height:  |  Size: 499 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 266 B

After

Width:  |  Height:  |  Size: 301 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 750 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 777 B

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-NC-4.0",
"copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8, https://github.com/tgstation/TerraGov-Marine-Corps/blob/master/icons/obj/items/gun.dmi, backpack sprite by Peptide, sprite modification by Jaсkal 298, backpack sling sprite edited by Boaz1111",
"copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy",
"size": {
"x": 32,
"y": 32
@@ -13,14 +13,6 @@
{
"name": "bolt-open"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4

Binary file not shown.

Before

Width:  |  Height:  |  Size: 347 B

After

Width:  |  Height:  |  Size: 282 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 492 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 347 B

After

Width:  |  Height:  |  Size: 295 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 326 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 334 B

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/27557/commits, backpack sprite by Peptide (copy of bulldog), backpack sling sprite edited by Boaz1111",
"copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy",
"size": {
"x": 32,
"y": 32
@@ -13,14 +13,6 @@
{
"name": "bolt-open"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4

Binary file not shown.

Before

Width:  |  Height:  |  Size: 500 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 512 B

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken/modified from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, inhand and back sprites modified by Flareguy",
"copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, back sprite modified by Flareguy",
"size": {
"x": 32,
"y": 32
@@ -10,14 +10,6 @@
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 661 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 664 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 550 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 551 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 643 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 656 B

View File

@@ -0,0 +1,51 @@
{
"version": 1,
"license": "CC-BY-NC-4.0",
"copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, sawn-inhand states modified from db-inhand by Flareguy",
"size": {
"x": 64,
"y": 64
},
"states": [
{
"name": "pump-inhand-left",
"directions": 4
},
{
"name": "pump-inhand-right",
"directions": 4
},
{
"name": "enforcer-inhand-left",
"directions": 4
},
{
"name": "enforcer-inhand-right",
"directions": 4
},
{
"name": "db-inhand-left",
"directions": 4
},
{
"name": "db-inhand-right",
"directions": 4
},
{
"name": "sawn-inhand-left",
"directions": 4
},
{
"name": "sawn-inhand-right",
"directions": 4
},
{
"name": "improvised-inhand-left",
"directions": 4
},
{
"name": "improvised-inhand-right",
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 584 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 595 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 517 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 535 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 280 B

After

Width:  |  Height:  |  Size: 301 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 933 B

After

Width:  |  Height:  |  Size: 492 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 278 B

After

Width:  |  Height:  |  Size: 317 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 776 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 805 B

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-NC-4.0",
"copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8backpack, https://github.com/tgstation/TerraGov-Marine-Corps/blob/master/icons/obj/items/gun.dmi, backpack sprite by Peptide (copy of db), sprite modification by Jaсkal 298, backpack sling sprite edited by Boaz1111",
"copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy",
"size": {
"x": 32,
"y": 32
@@ -13,14 +13,6 @@
{
"name": "bolt-open"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4

Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 B

After

Width:  |  Height:  |  Size: 293 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 794 B

After

Width:  |  Height:  |  Size: 456 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 247 B

After

Width:  |  Height:  |  Size: 284 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 581 B

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-NC-4.0",
"copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8, https://github.com/tgstation/TerraGov-Marine-Corps/blob/master/icons/obj/items/gun.dmi backpack sprite by Peptide, sprite modification by Jaсkal 298",
"copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, sprites edited from db_shotgun.rsi by Flareguy",
"size": {
"x": 32,
"y": 32
@@ -13,14 +13,6 @@
{
"name": "bolt-open"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4

Binary file not shown.

Before

Width:  |  Height:  |  Size: 486 B

After

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 749 B

After

Width:  |  Height:  |  Size: 594 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 757 B

After

Width:  |  Height:  |  Size: 505 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 449 B

After

Width:  |  Height:  |  Size: 332 B

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Inspired by tg station\u0027s fireaxe cabinet https://github.com/tgstation/tgstation/commit/d0d81185f09ca30d3b0856d476544240dba0de53 Made by DISCORD@ps3moira#9488",
"copyright": "Inspired by tg station\u0027s fireaxe cabinet https://github.com/tgstation/tgstation/commit/d0d81185f09ca30d3b0856d476544240dba0de53 Made by DISCORD@ps3moira#9488, sprite further modified and updated by Flareguy",
"size": {
"x": 32,
"y": 32

Binary file not shown.

Before

Width:  |  Height:  |  Size: 396 B

After

Width:  |  Height:  |  Size: 313 B