-
Notifications
You must be signed in to change notification settings - Fork 473
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Port Samurai armor from Nyano (#334)
* [Clothing] Samurai dogi (#14927) * [Clothing] Samurai hakama syndicate only. * meta.json update Co-authored-by: AJCM-git <[email protected]> * hakama desc the description of the hakama is shortened * Update theater.yml * Update coats.yml * Update RobustToolbox * Revert "Update RobustToolbox" This reverts commit 113dd54a5d0e49a415039f8f03ea1bf87bad04c9. * dogi --------- Co-authored-by: AJCM-git <[email protected]> * port samurai armor * fix PR mess * samurai duffelbag bundle --------- Co-authored-by: Puro <[email protected]> Co-authored-by: AJCM-git <[email protected]> Co-authored-by: Hyenh <[email protected]>
- Loading branch information
1 parent
44a15f8
commit 2187b00
Showing
15 changed files
with
125 additions
and
2 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
uplink-kanabou-name = Kanabou | ||
uplink-kanabou-desc = A weapon for those who wish to forgo subtlety. Particularly suited to oni. | ||
uplink-rickenbacker4001-name = Rickenbacker 4001 | ||
uplink-rickenbacker4001-desc = When it comes down to it, there are very few people who will swing the bat. | ||
uplink-samurai-bundle-name = Syndicate samurai armor bundle | ||
uplink-samurai-bundle-desc = A bundle containing a modern replica of a full Tousei-Gusoku set. |
10 changes: 10 additions & 0 deletions
10
Resources/Prototypes/Nyanotrasen/Catalog/Fills/Crates/syndicate.yml
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 |
---|---|---|
@@ -0,0 +1,10 @@ | ||
- type: entity | ||
id: ClothingBackpackDuffelSyndicateBundleSamurai | ||
parent: ClothingBackpackDuffelSyndicateBundle | ||
name: Samurai armor bundle | ||
description: "A bundle containing a modern replica of a full Tousei-Gusoku set." | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: ClothingOuterArmorTouseiGusoku | ||
- id: ClothingHeadHelmetKabuto |
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
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
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 added
BIN
+8.43 KB
...urces/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi/equipped-HELMET.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 added
BIN
+6.96 KB
Resources/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi/icon.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 added
BIN
+8.09 KB
Resources/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.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 added
BIN
+8.79 KB
Resources/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.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.
26 changes: 26 additions & 0 deletions
26
Resources/Textures/Nyanotrasen/Clothing/Head/Helmets/kabuto.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 |
---|---|---|
@@ -0,0 +1,26 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-4.0", | ||
"copyright": "Hyenh#6078 (313846233099927552)", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "equipped-HELMET", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+12 KB
...trasen/Clothing/OuterClothing/Armor/touseigusoku.rsi/equipped-OUTERCLOTHING.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 added
BIN
+7.05 KB
...ces/Textures/Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi/icon.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 added
BIN
+7.1 KB
...tures/Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.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 added
BIN
+9.08 KB
...ures/Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.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.
26 changes: 26 additions & 0 deletions
26
Resources/Textures/Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.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 |
---|---|---|
@@ -0,0 +1,26 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-4.0", | ||
"copyright": "Hyenh#6078 (313846233099927552)", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "equipped-OUTERCLOTHING", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
} | ||
] | ||
} |