juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed the storage sizes of different swords. (#36564)

Browse Source 
Co-authored-by: RedBookcase <Usualmoves@gmail.com>
This commit is contained in:
RedBookcase
2025-04-26 13:45:08 -07:00
committed by GitHub
parent 2bd8455ff7
commit b0dedb9770
22 changed files with 233 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Resources/Prototypes/Entities/Objects/Fun/toys.yml
View File

@@ -1811,7 +1811,11 @@
Blunt: 0
- type: Item
size: Normal
sprite: Objects/Weapons/Melee/cutlass.rsi
storedSprite:
state: foam_storage
sprite: Objects/Weapons/Melee/cutlass.rsi
shape:
- 0,0,0,2
- type: entity
parent: BaseItem

130
Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
View File

@@ -1,3 +1,6 @@
#While you were busy charging your batong... I studied the blade.
#BaseSword
- type: entity
parent: BaseItem
id: BaseSword
@@ -19,6 +22,58 @@
qualities:
- Slicing
#Shortswords
- type: entity
name: cutlass
parent: [ BaseSword, BaseMajorContraband ]
id: Cutlass
description: A wickedly curved blade, often seen in the hands of space pirates.
components:
- type: Tag
tags:
- Machete
- type: Sprite
sprite: Objects/Weapons/Melee/cutlass.rsi
- type: MeleeWeapon
damage:
types:
Slash: 16
soundHit:
path: /Audio/Weapons/bladeslice.ogg
- type: Item
storedSprite:
state: storage
sprite: Objects/Weapons/Melee/cutlass.rsi
shape:
- 0,0,0,2
- type: DisarmMalus
- type: entity
name: machete
parent: [ BaseSword, BaseMajorContraband ]
id: Machete
description: A large, vicious looking blade.
components:
- type: Tag
tags:
- Machete
- type: Sprite
sprite: Objects/Weapons/Melee/machete.rsi
- type: MeleeWeapon
damage:
types:
Slash: 15
soundHit:
path: /Audio/Weapons/bladeslice.ogg
- type: Item
storedSprite:
state: storage
sprite: Objects/Weapons/Melee/machete.rsi
shape:
- 0,0,0,2
- type: DisarmMalus
#Longswords
- type: entity
name: captain's sabre
parent: [ BaseSword, BaseCommandContraband ]
@@ -38,7 +93,11 @@
reflectProb: .1
spread: 90
- type: Item
sprite: Objects/Weapons/Melee/captain_sabre.rsi
storedSprite:
state: storage
sprite: Objects/Weapons/Melee/captain_sabre_storage_64x.rsi #Done in 64x64 because it looks way too puny in 32x32
shape:
- 0,0,0,3
- type: Tag
tags:
- CaptainSabre
@@ -67,7 +126,16 @@
soundHit:
path: /Audio/Weapons/bladeslice.ogg
- type: Item
storedSprite:
state: storage
sprite: Objects/Weapons/Melee/katana_storage_64x.rsi #Done in 64x64 because it looks way too puny in 32x32
shape:
- 0,0,0,3
- type: Clothing
sprite: Objects/Weapons/Melee/katana.rsi
slots:
- Back
- Belt
- type: DisarmMalus
- type: entity
@@ -84,7 +152,11 @@
types:
Slash: 30
- type: Item
sprite: Objects/Weapons/Melee/energykatana.rsi
storedSprite:
state: storage
sprite: Objects/Weapons/Melee/energykatana_storage_64x.rsi #Done in 64x64 because it looks way too puny in 32x32
shape:
- 0,0,0,3
- type: EnergyKatana
- type: DashAbility
- type: LimitedCharges
@@ -98,27 +170,7 @@
- Belt
- type: Reflect
- type: entity
name: machete
parent: [ BaseSword, BaseMajorContraband ]
id: Machete
description: A large, vicious looking blade.
components:
- type: Tag
tags:
- Machete
- type: Sprite
sprite: Objects/Weapons/Melee/machete.rsi
- type: MeleeWeapon
damage:
types:
Slash: 15
soundHit:
path: /Audio/Weapons/bladeslice.ogg
- type: Item
sprite: Objects/Weapons/Melee/machete.rsi
- type: DisarmMalus
#Greatswords
- type: entity
name: claymore
parent: [ BaseSword, BaseMajorContraband ]
@@ -135,38 +187,24 @@
soundHit:
path: /Audio/Weapons/bladeslice.ogg
- type: Item
storedSprite:
state: storage
sprite: Objects/Weapons/Melee/claymore_storage_64x.rsi #Done in 64x64 because it looks way too puny in 32x32
shape:
- 0,0,1,3
- type: Clothing
sprite: Objects/Weapons/Melee/claymore.rsi
slots:
- back
- type: DisarmMalus
- type: entity
name: cutlass
parent: [ BaseSword, BaseMajorContraband ]
id: Cutlass
description: A wickedly curved blade, often seen in the hands of space pirates.
components:
- type: Tag
tags:
- Machete
- type: Sprite
sprite: Objects/Weapons/Melee/cutlass.rsi
- type: MeleeWeapon
damage:
types:
Slash: 16
soundHit:
path: /Audio/Weapons/bladeslice.ogg
- type: Item
sprite: Objects/Weapons/Melee/cutlass.rsi
- Back
- SuitStorage #Bigger than the other swords, easier to strap to your suit.
- type: DisarmMalus
#Other/Weird
- type: entity
name: throngler
parent: [ BaseSword, BaseMajorContraband ]
id: Throngler
description: Why would you make this?
description: If Security dares take it from you, just remind them that they are indeed mortal.
components:
- type: Sprite
sprite: Objects/Weapons/Melee/Throngler2.rsi

38
Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json
View File

@@ -1,22 +1,22 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf.",
"size": {
"x": 32,
"y": 32
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

14
Resources/Textures/Objects/Weapons/Melee/captain_sabre_storage_64x.rsi/meta.json Normal file
View File

@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Storage sprite by RedBookcase on Github.",
"size": {
"x": 64,
"y": 64
},
"states": [
{
"name": "storage"
}
]
}

BIN
Resources/Textures/Objects/Weapons/Melee/captain_sabre_storage_64x.rsi/storage.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 494 B

BIN
Resources/Textures/Objects/Weapons/Melee/claymore.rsi/equipped-SUITSTORAGE.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 600 B

4
Resources/Textures/Objects/Weapons/Melee/claymore.rsi/meta.json
View File

@@ -21,6 +21,10 @@
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE",
"directions": 4
}
]
}

14
Resources/Textures/Objects/Weapons/Melee/claymore_storage_64x.rsi/meta.json Normal file
View File

@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Storage sprite by RedBookcase on Github.",
"size": {
"x": 64,
"y": 64
},
"states": [
{
"name": "storage"
}
]
}

BIN
Resources/Textures/Objects/Weapons/Melee/claymore_storage_64x.rsi/storage.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 589 B

BIN
Resources/Textures/Objects/Weapons/Melee/cutlass.rsi/foam_storage.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 477 B

8
Resources/Textures/Objects/Weapons/Melee/cutlass.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "Modified from https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi by Taral#6480 (Discord) for ss14",
"copyright": "Modified from https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi by Taral#6480 (Discord) for ss14. Storage and Foam Storage sprites by RedBookcase on Github.",
"size": {
"x": 32,
"y": 32
@@ -10,8 +10,14 @@
{
"name": "icon"
},
{
"name": "storage"
},
{
"name": "foam_icon"
},
{
"name": "foam_storage"
},
{
"name": "inhand-left",

BIN
Resources/Textures/Objects/Weapons/Melee/cutlass.rsi/storage.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 495 B

54
Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
View File

@@ -1,30 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a9451f4d22f233d328b63490c2bcf64a640e42ff and modified by Jackal298",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a9451f4d22f233d328b63490c2bcf64a640e42ff and modified by Jackal298.",
"size": {
"x": 32,
"y": 32
},
{
"name": "equipped-BELT",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
}
]
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "equipped-BELT",
"directions": 4
}
]
}

14
Resources/Textures/Objects/Weapons/Melee/energykatana_storage_64x.rsi/meta.json Normal file
View File

@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Storage sprite by RedBookcase on Github.",
"size": {
"x": 64,
"y": 64
},
"states": [
{
"name": "storage"
}
]
}

BIN
Resources/Textures/Objects/Weapons/Melee/energykatana_storage_64x.rsi/storage.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 382 B

BIN
Resources/Textures/Objects/Weapons/Melee/katana.rsi/equipped-BACKPACK.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 529 B

BIN
Resources/Textures/Objects/Weapons/Melee/katana.rsi/equipped-BELT.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 574 B

46
Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json
View File

@@ -1,22 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf. Belt and SuitStorage sprites by RedBoockase on Github.",
"size": {
"x": 32,
"y": 32
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "equipped-BELT",
"directions": 4
}
]
}

14
Resources/Textures/Objects/Weapons/Melee/katana_storage_64x.rsi/meta.json Normal file
View File

@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Storage sprite by RedBookcase on Github.",
"size": {
"x": 64,
"y": 64
},
"states": [
{
"name": "storage"
}
]
}

BIN
Resources/Textures/Objects/Weapons/Melee/katana_storage_64x.rsi/storage.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 361 B

5
Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "Taken from Baystation12 and modified by Taral at https://github.com/Baystation12/Baystation12/pull/29841/commits/57265cd89e6b66b9a67915172f60bbbeacbeced0",
"copyright": "Taken from Baystation12 and modified by Taral at https://github.com/Baystation12/Baystation12/pull/29841/commits/57265cd89e6b66b9a67915172f60bbbeacbeced0. Storage sprite by RedBookcase on Github.",
"size": {
"x": 32,
"y": 32
@@ -10,6 +10,9 @@
{
"name": "icon"
},
{
"name": "storage"
},
{
"name": "inhand-left",
"directions": 4

BIN
Resources/Textures/Objects/Weapons/Melee/machete.rsi/storage.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 382 B