Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Three-Sword Style #582

Closed
wants to merge 5 commits into from
Closed

Added Three-Sword Style #582

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
872ad20
Added Three-Sword Style
ps3moira Dec 21, 2023
2664104
Removed Unnecessary Delta-V tag
ps3moira Dec 21, 2023
3f0b742
Merge branch 'master' into Three-Sword-Style
ps3moira Dec 23, 2023
087d244
Merge remote-tracking branch 'upstream/master' into Three-Sword-Style
ps3moira Dec 28, 2023
b6e2b5e
Merge branch 'master' into Three-Sword-Style
ps3moira Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@
- type: Item
size: 15
sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV
- type: Clothing #DeltaV
sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV
slots:
- mask
- type: DisarmMalus

- type: entity
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/dulled.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
- type: Item
size: 15
sprite: Objects/Weapons/Melee/katana.rsi
- type: Clothing #DeltaV
sprite: Objects/Weapons/Melee/katana.rsi
slots:
- mask
- type: DisarmMalus #DeltaV

- type: entity
name: claymore
Expand Down
Binary file added Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/equipped-MASK.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"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. Further modified by TJohnson.",
"copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf. Further modified by TJohnson. Mask-equip sprite made by ps3moira",
"size": {
"x": 32,
"y": 32
Expand All @@ -17,6 +17,10 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-MASK",
"directions": 4
}
]
}
Binary file added Resources/Textures/Objects/Weapons/Melee/katana.rsi/equipped-MASK.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"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",
"copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf. Mask-equip sprite made by ps3moira",
"size": {
"x": 32,
"y": 32
Expand All @@ -17,6 +17,10 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-MASK",
"directions": 4
}
]
}
Loading