Can now equip fireaxe, claymore, spear and baseball back on your back (#4484)

* Can equip spears and claymores on your back now

* Adds fireaxe and baseball bat back equip
This commit is contained in:
Swept
2021-08-17 19:42:50 -07:00
committed by GitHub
parent 8da0901b8e
commit 030c4a07ce
12 changed files with 54 additions and 36 deletions

View File

@@ -9,10 +9,11 @@
state: icon state: icon
- type: MeleeWeapon - type: MeleeWeapon
damage: 15 damage: 15
- type: Item - type: Clothing
size: 24 size: 15
sprite: Objects/Weapons/Melee/baseball_bat.rsi sprite: Objects/Weapons/Melee/baseball_bat.rsi
prefix: inhand Slots:
- back
- type: Construction - type: Construction
graph: WoodenBat graph: WoodenBat
node: bat node: bat

View File

@@ -12,6 +12,8 @@
state: icon state: icon
- type: MeleeWeapon - type: MeleeWeapon
damage: 25 damage: 25
- type: Item - type: Clothing
size: 20
sprite: Objects/Weapons/Melee/fireaxe.rsi sprite: Objects/Weapons/Melee/fireaxe.rsi
prefix: inhand Slots:
- back

View File

@@ -17,10 +17,11 @@
arc: spear arc: spear
- type: DamageOtherOnHit - type: DamageOtherOnHit
amount: 15 amount: 15
- type: Item - type: Clothing
size: 24 size: 24
sprite: Objects/Weapons/Melee/spear.rsi sprite: Objects/Weapons/Melee/spear.rsi
prefix: inhand Slots:
- back
- type: Construction - type: Construction
graph: spear graph: spear
node: spear node: spear

View File

@@ -12,7 +12,6 @@
- type: Item - type: Item
size: 15 size: 15
sprite: Objects/Weapons/Melee/captain_sabre.rsi sprite: Objects/Weapons/Melee/captain_sabre.rsi
prefix: inhand
- type: Tag - type: Tag
tags: tags:
- CaptainSabre - CaptainSabre
@@ -34,7 +33,6 @@
- type: Item - type: Item
size: 15 size: 15
sprite: Objects/Weapons/Melee/katana.rsi sprite: Objects/Weapons/Melee/katana.rsi
prefix: inhand
- type: entity - type: entity
name: machete name: machete
@@ -53,7 +51,6 @@
- type: Item - type: Item
size: 15 size: 15
sprite: Objects/Weapons/Melee/machete.rsi sprite: Objects/Weapons/Melee/machete.rsi
prefix: inhand
- type: entity - type: entity
name: claymore name: claymore
@@ -66,7 +63,8 @@
state: icon state: icon
- type: MeleeWeapon - type: MeleeWeapon
damage: 25 damage: 25
- type: Item - type: Clothing
size: 15 size: 20
sprite: Objects/Weapons/Melee/claymore.rsi sprite: Objects/Weapons/Melee/claymore.rsi
prefix: inhand Slots:
- back

Binary file not shown.

After

Width:  |  Height:  |  Size: 463 B

View File

@@ -1,12 +1,15 @@
{ {
"version": 1, "version": 1,
"license": "CC-BY-NC-SA-3.0", "license": "CC-BY-NC-SA-3.0",
"copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a", "copyright": "Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a",
"size": { "size": {
"x": 32, "x": 32,
"y": 32 "y": 32
}, },
"states": [ "states": [
{
"name": "icon"
},
{ {
"name": "inhand-left", "name": "inhand-left",
"directions": 4 "directions": 4
@@ -16,7 +19,8 @@
"directions": 4 "directions": 4
}, },
{ {
"name": "icon" "name": "equipped-BACKPACK",
"directions": 4
} }
] ]
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 600 B

View File

@@ -1,22 +1,26 @@
{ {
"version": 1, "version": 1,
"license": "CC-BY-SA-3.0", "license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation and modified by Taral at https://github.com/tgstation/tgstation/pull/18086/commits/aea72a79fd34990dc7affd5cdf8dc13bd5b6431a", "copyright": "Taken from tgstation and modified by Taral and Swept at https://github.com/tgstation/tgstation/pull/18086/commits/aea72a79fd34990dc7affd5cdf8dc13bd5b6431a",
"size": { "size": {
"x": 32, "x": 32,
"y": 32 "y": 32
},
"states": [
{
"name": "icon"
}, },
"states": [ {
{ "name": "inhand-left",
"name": "icon" "directions": 4
}, },
{ {
"name": "inhand-left", "name": "inhand-right",
"directions": 4 "directions": 4
}, },
{ {
"name": "inhand-right", "name": "equipped-BACKPACK",
"directions": 4 "directions": 4
} }
] ]
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 494 B

View File

@@ -7,6 +7,9 @@
"y": 32 "y": 32
}, },
"states": [ "states": [
{
"name": "icon"
},
{ {
"name": "inhand-left", "name": "inhand-left",
"directions": 4 "directions": 4
@@ -16,7 +19,8 @@
"directions": 4 "directions": 4
}, },
{ {
"name": "icon" "name": "equipped-BACKPACK",
"directions": 4
} }
] ]
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 420 B

View File

@@ -7,6 +7,9 @@
"y": 32 "y": 32
}, },
"states": [ "states": [
{
"name": "spear"
},
{ {
"name": "inhand-left", "name": "inhand-left",
"directions": 4 "directions": 4
@@ -16,7 +19,8 @@
"directions": 4 "directions": 4
}, },
{ {
"name": "spear" "name": "equipped-BACKPACK",
"directions": 4
} }
] ]
} }