Skip to content

Commit

Permalink
Fixes for craftable muskets (#1261)
Browse files Browse the repository at this point in the history
* Add wielded in hand sprite for musket

* actually adding the sprites in YML

* Add a missing tag
  • Loading branch information
Tryded authored May 27, 2024
1 parent d55dd24 commit f79c653
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,13 @@
- CartridgeMusket
capacity: 1
proto: CartridgeMusket
- type: Sprite
sprite: DeltaV/Objects/Weapons/Guns/Rifles/musket.rsi
state: base
- type: Gun #Smoothbore
fireRate: .125
resetOnHandSelected: false
minAngle: 20
minAngle: 22
maxAngle: 43
- type: Wieldable
- type: GunWieldBonus
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,5 @@
objectType: Item
description: An old flintlock, feels like 1800s gang warfare. Uses musket cartidges.
icon:
sprite: Objects/Weapons/Guns/Snipers/musket.rsi
sprite: Objects/Weapons/Guns/Snipers/flintlock.rsi
state: base
3 changes: 3 additions & 0 deletions Resources/Prototypes/DeltaV/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
- type: Tag
id: ForensicBeltEquip

- type: Tag
id: GasPipeHalf #Craftable Musket

- type: Tag
id: HandLabeler

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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Pato Grone for SS14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "base"
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"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.

0 comments on commit f79c653

Please sign in to comment.