Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions Resources/Prototypes/_RPSX/NewYear/Structures/trees.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
name: christmas tree
components:
- type: Sprite
sprite: _RPSX/NewYear/Structures/Trees.rsi/32x48.rsi
sprite: _RPSX/NewYear/Structures/Trees/32x48.rsi
layers:
- state: tree1
- type: Damageable
Expand Down Expand Up @@ -43,7 +43,7 @@
parent: DecoratedFirTreeRPSX
components:
- type: Sprite
sprite: _RPSX/NewYear/Structures/Trees.rsi/64x64.rsi
sprite: _RPSX/NewYear/Structures/Trees/64x64.rsi
layers:
- state: Engineers_tree_broken

Expand Down
Binary file not shown.
4 changes: 4 additions & 0 deletions Resources/Textures/Clothing/Hands/Gloves/combat.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"name": "equipped-HAND",
"directions": 4
},
{
"name": "equipped-HAND-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"name": "equipped-HAND",
"directions": 4
},
{
"name": "equipped-HAND-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "equipped-head-unshaded",
"directions": 4
},
{
"name": "equipped-head-unshaded-vox",
"directions": 4
},
{
"name": "icon-unshaded"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@
{
"name": "on-equipped-HELMET-vox",
"directions": 4
},
{
"name": "equipped-HELMET-vox",
"directions": 4
},
{
"name": "equipped-HELMET-vox",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@
{
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "off-equipped-HELMET-vox",
"directions": 4
},
{
"name": "on-equipped-HELMET-vox",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
4 changes: 4 additions & 0 deletions Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
"name": "equipped-HELMET-hamster",
"directions": 4
},
{
"name": "equipped-HELMET-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
4 changes: 4 additions & 0 deletions Resources/Textures/Clothing/Head/Hats/redwizard.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
"name": "equipped-HELMET-dog",
"directions": 4
},
{
"name": "equipped-HELMET-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
8 changes: 8 additions & 0 deletions Resources/Textures/Clothing/Head/Hats/safarihat.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
"name": "equipped-HELMET-dog",
"directions": 4
},
{
"name": "equipped-HELMET-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
4 changes: 4 additions & 0 deletions Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
"name": "equipped-HELMET-dog",
"directions": 4
},
{
"name": "equipped-HELMET-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,18 @@
"name": "equipped-HELMET-hamster",
"directions": 4
},
{
"name": "equipped-HELMET-vox",
"directions": 4
},
{
"name": "flipped-equipped-HELMET-hamster",
"directions": 4
},
{
"name": "flipped-equipped-HELMET-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
8 changes: 8 additions & 0 deletions Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "equipped-HELMET-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand All @@ -29,6 +33,10 @@
"name": "flipped-equipped-HELMET",
"directions": 4
},
{
"name": "flipped-equipped-HELMET-vox",
"directions": 4
},
{
"name": "flipped-inhand-left",
"directions": 4
Expand Down
4 changes: 4 additions & 0 deletions Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"name": "equipped-MASK",
"directions": 4
},
{
"name": "equipped-MASK-reptilian",
"directions": 4
},
{
"name": "equipped-MASK-vox",
"directions": 4
Expand Down
36 changes: 36 additions & 0 deletions Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@
"name": "non-equipped-NECK",
"directions": 4
},
{
"name": "non-equipped",
"directions": 4
},
{
"name": "pan"
},
Expand Down Expand Up @@ -132,6 +136,38 @@
{
"name": "fluid-equipped-NECK",
"directions": 4
},
{
"name": "les-equipped",
"directions": 4
},
{
"name": "aro-equipped",
"directions": 4
},
{
"name": "lgbt-equipped",
"directions": 4
},
{
"name": "pan-equipped",
"directions": 4
},
{
"name": "trans-equipped",
"directions": 4
},
{
"name": "inter-equipped",
"directions": 4
},
{
"name": "bi-equipped",
"directions": 4
},
{
"name": "asex-equipped",
"directions": 4
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
{
"name": "icon"
},
{
"name": "icon-open"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
Expand All @@ -21,6 +24,18 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "open-equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "open-inhand-left",
"directions": 4
},
{
"name": "open-inhand-right",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
"name": "equipped-OUTERCLOTHING-dog",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-reptilian",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-reptilian",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
"name": "equipped-OUTERCLOTHING-dog",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-reptilian",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
"name": "equipped-OUTERCLOTHING-dog",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-reptilian",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-scurret",
"directions": 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
"name": "equipped-OUTERCLOTHING-dog",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-reptilian",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-reptilian",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-dog",
"directions": 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
}
]
}
16 changes: 16 additions & 0 deletions Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,26 @@
"name": "equipped-FEET",
"directions": 4
},
{
"name": "equipped-FEET-vox",
"directions": 4
},
{
"name": "equipped-FEET-reptilian",
"directions": 4
},
{
"name": "on-equipped-FEET",
"directions": 4
},
{
"name": "on-equipped-FEET-vox",
"directions": 4
},
{
"name": "on-equipped-FEET-reptilian",
"directions": 4
},
{
"name": "icon"
},
Expand Down
Binary file not shown.
Binary file not shown.
Loading
Loading