Skip to content

Commit

Permalink
Merge branch 'master' into stable-merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Coolsurf6 committed Jan 9, 2025
2 parents f89ef13 + cf8cf47 commit 66e8a2d
Show file tree
Hide file tree
Showing 10 changed files with 3 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
parent: [Clothing, BaseFoldable]
id: PersonalItemKarakiNanoweaveMantle
name: Karaki's nanoweave mantle
description: A two piece cloak that can be folded up into a mantle. Its made out of nanoweave in traditional colours, often worn by Avali across the Illuminate. The fabric is intricately weaved down to the atomic level, making it incredibly strong and durable. A necklace with a softly pulsing crystal is sown into fabric around the neck.
description: A multi piece cloak that can be folded up into a mantle. Its made out of nanoweave in traditional colours, often worn by Avali across the Illuminate. The fabric is intricately weaved down to the atomic level, making it incredibly strong and durable. A large dream catcher with some sync crystals attached to it hang from the right shoulder. Wearing it feels like the embrace of a forgotten loved one.
suffix: PersonalItem
components:
- type: Item
Expand All @@ -14,7 +14,7 @@
- state: icon
map: [ "unfoldedLayer" ]
- state: icon-open
map: ["foldedLayer"]
map: [ "foldedLayer" ]
visible: false
- type: Clothing
sprite: _Umbra/PersonalItems/Wearables/karakinanoweavemantle.rsi
Expand All @@ -28,7 +28,6 @@
foldVerbText: fold-open-verb
- type: FoldableClothing
foldedEquippedPrefix: open
foldedHeldPrefix: open
- type: Tag
tags:
- WhitelistChameleon
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by Jacketed (jacketedgaming)",
"copyright": "Sprited by jacketedgaming (Discord)",
"size": {
"x": 32,
"y": 32
Expand All @@ -28,14 +28,6 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "open-inhand-left",
"directions": 4
},
{
"name": "open-inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.

0 comments on commit 66e8a2d

Please sign in to comment.