-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #620 from Us3rn4me228/bonespear-resprite
Bonespear resprite
- Loading branch information
Showing
9 changed files
with
52 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+180 Bytes
(130%)
Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-BACKPACK.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+707 Bytes
(360%)
Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+713 Bytes
(370%)
Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
74 changes: 37 additions & 37 deletions
74
Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,37 +1,37 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "spear" | ||
}, | ||
{ | ||
"name": "spear1" | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "wielded-inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "wielded-inhand-right", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-BACKPACK", | ||
"directions": 4 | ||
} | ||
] | ||
} | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "https://github.com/ss220-space/Paradise/blob/master220/icons/obj/items.dmi", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "spear" | ||
}, | ||
{ | ||
"name": "spear1" | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "wielded-inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "wielded-inhand-right", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-BACKPACK", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file modified
BIN
+365 Bytes
(300%)
Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-376 Bytes
(35%)
Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+300 Bytes
(150%)
Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+213 Bytes
(130%)
Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.