Skip to content
This repository has been archived by the owner on Oct 25, 2023. It is now read-only.

Early Merge - MartialArtist geta shoes #187

Closed
Closed
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
2 changes: 1 addition & 1 deletion Resources/Maps/shoukou.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27465,7 +27465,7 @@ entities:
- pos: -48.775764,1.1938145
parent: 34
type: Transform
- proto: ClothingShoesWizard
- proto: ClothingShoesGeta
entities:
- uid: 7654
components:
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/Nyanotrasen/Entities/Clothing/Shoes/misc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: ClothingShoesBaseButcherable
id: ClothingShoesGeta
name: geta sandals
description: A pair of traditional japanese sandals.
components:
- type: Sprite
sprite: Nyanotrasen/Clothing/Shoes/Misc/geta.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/Shoes/Misc/geta.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
back: ClothingBackpackFilled
id: MartialArtistPDA
ears: ClothingHeadsetService
shoes: ClothingShoesWizard
shoes: ClothingShoesGeta
gloves: ClothingHandsGlovesBoxingRed
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
Binary file modified Resources/Textures/Markers/jobs.rsi/martialartist.png
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
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Mimi (justanorang) on Discord",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-FEET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading