Skip to content

Commit

Permalink
Reverts Shot Gun Sprites
Browse files Browse the repository at this point in the history
  • Loading branch information
ps3moira committed Dec 23, 2023
1 parent b6abced commit a90589d
Show file tree
Hide file tree
Showing 48 changed files with 211 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
suffix: Beanbag
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
sprite: DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi # Delta-V
- type: Clothing
sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
sprite: DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi # Delta-V
- type: BallisticAmmoProvider
capacity: 4
proto: ShellShotgunBeanbag
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# If you update this also update the bulldog's size.
size: 30
- type: Clothing
sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
sprite: DeltaV/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi # Delta-V
quickEquip: false
slots:
- Back
Expand Down Expand Up @@ -106,7 +106,7 @@
description: An immortal classic. Uses .50 shotgun shells.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
sprite: DeltaV/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi # Delta-V
- type: Gun
fireRate: 2
- type: BallisticAmmoProvider
Expand All @@ -133,11 +133,9 @@
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
sprite: DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi # Delta-V
- type: Clothing
sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
- type: Item
sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
sprite: DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi # Delta-V
heldPrefix: enforcer
- type: BallisticAmmoProvider

Expand All @@ -156,9 +154,9 @@
description: When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. Uses .50 shotgun shells.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
sprite: DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi # Delta-V
- type: Clothing
sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
sprite: DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi # Delta-V
- type: BallisticAmmoProvider
capacity: 4
- type: Tag
Expand All @@ -172,9 +170,9 @@
description: Groovy! Uses .50 shotgun shells.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
sprite: DeltaV/Objects/Weapons/Guns/Shotguns/sawn.rsi # Delta-V
- type: Clothing
sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
sprite: DeltaV/Objects/Weapons/Guns/Shotguns/sawn.rsi # Delta-V
- type: Item
size: 10
- type: Gun
Expand Down Expand Up @@ -246,9 +244,9 @@
description: A shitty, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi
sprite: DeltaV/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi # Delta-V
- type: Clothing
sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi
sprite: DeltaV/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi # Delta-V
- type: Item
size: 75
- type: Gun
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
description: There is a small label that reads "For Emergency use only" along with details for safe use of the shotgun. As if.
components:
- type: Sprite
sprite: Structures/Wallmounts/shotgun_cabinet.rsi
sprite: DeltaV/Structures/Wallmounts/shotgun_cabinet.rsi # Delta-V
layers:
- state: cabinet
- state: shotgun
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"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",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "bolt-open"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"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",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "bolt-open"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, back sprite modified by Flareguy, sprites tweaked by ps3moira",
"size": {
"x": 64,
"y": 64
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "ishotgunstep1"
},
{
"name": "ishotgunstep2"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"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",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "bolt-open"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"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",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "bolt-open"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"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",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "glass"
},
{
"name": "glass-1"
},
{
"name": "glass-2"
},
{
"name": "glass-3"
},
{
"name": "glass-4"
},
{
"name": "glass-up"
},
{
"name": "locked"
},
{
"name": "shotgun"
},
{
"name": "unlocked"
},
{
"name": "cabinet"
},
{
"name": "cabinet-empty-open"
},
{
"name": "cabinet-filled-closed"
},
{
"name": "cabinet-filled-open"
}
]
}

0 comments on commit a90589d

Please sign in to comment.