-
Notifications
You must be signed in to change notification settings - Fork 68
Cherrypick: MNK Clothing From Nyanotrasen/DV #291
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
1cdcb9c
Adds the MoNoKrome Drobe and additional MNK outfits. (#1696)
Hyenh cc4c3cc
cleanup (#1734)
Elijahrane 77bb88b
Checkout tracksuit.rsi
mnva0 5d1a183
Add to loadout
mnva0 8670a27
Silence, 1 test failure
mnva0 ef0fb2f
Extremely partial checkout of DV head
mnva0 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
13 changes: 13 additions & 0 deletions
13
Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/mnkdrobe.yml
This file contains hidden or 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,13 @@ | ||
| - type: vendingMachineInventory | ||
| id: MNKDrobeInventory | ||
| startingInventory: | ||
| ClothingUniformMNKOfficeSkirt: 3 | ||
| ClothingUniformMNKUnderGarment: 3 | ||
| ClothingUniformMNKDressBlack: 3 | ||
| ClothingUniformMNKGymBra: 3 | ||
| ClothingUniformMNKBlackOveralls: 3 | ||
| ClothingUniformMNKBlackShoulder: 3 | ||
| ClothingUniformMNKTracksuitBlack: 3 | ||
| ClothingOuterCoatMNKBlackJacket: 3 | ||
| ClothingOuterCoatMNKWhiteHoodie: 3 | ||
| ClothingOuterCoatMNKBlackTopCoat: 3 |
38 changes: 38 additions & 0 deletions
38
Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/misc.yml
This file contains hidden or 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,38 @@ | ||
| ## mnk | ||
|
|
||
| - type: entity | ||
| parent: ClothingOuterStorageBase | ||
| id: ClothingOuterCoatMNKWhiteHoodie | ||
| name: MNK white hoodie | ||
| description: A classic MNK produced white hoodie. | ||
| components: | ||
| - type: Sprite | ||
| sprite: Nyanotrasen/Clothing/Misc/hoodie_white.rsi | ||
| - type: Clothing | ||
| sprite: Nyanotrasen/Clothing/Misc/hoodie_white.rsi | ||
| - type: TemperatureProtection | ||
| coolingCoefficient: 0.4 # Triad - `coolingCoefficient` < `coefficient` | ||
| - type: entity | ||
| parent: ClothingOuterStorageBase | ||
| id: ClothingOuterCoatMNKBlackTopCoat | ||
| name: MNK black top coat | ||
| description: A sturdy MNK black top coat. | ||
| components: | ||
| - type: Sprite | ||
| sprite: Nyanotrasen/Clothing/Misc/black_top_coat.rsi | ||
| - type: Clothing | ||
| sprite: Nyanotrasen/Clothing/Misc/black_top_coat.rsi | ||
| - type: TemperatureProtection | ||
| coolingCoefficient: 0.4 # Triad - `coolingCoefficient` < `coefficient` | ||
| - type: entity | ||
| parent: ClothingOuterStorageBase | ||
| id: ClothingOuterCoatMNKBlackJacket | ||
| name: MNK black jacket | ||
| description: A light MNK black jacket. | ||
| components: | ||
| - type: Sprite | ||
| sprite: Nyanotrasen/Clothing/Misc/black_jacket.rsi | ||
| - type: Clothing | ||
| sprite: Nyanotrasen/Clothing/Misc/black_jacket.rsi | ||
| - type: TemperatureProtection | ||
| coolingCoefficient: 0.2 # Triad - `coolingCoefficient` < `coefficient` |
This file contains hidden or 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 hidden or 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 hidden or 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
41 changes: 41 additions & 0 deletions
41
Resources/Prototypes/_Triad/Loadouts/Jobs/Contractor/jumpsuit.yml
This file contains hidden or 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,41 @@ | ||
| - type: loadout | ||
| id: ClothingUniformMNKOfficeSkirt | ||
| price: 0 | ||
| equipment: | ||
| jumpsuit: ClothingUniformMNKOfficeSkirt | ||
|
|
||
| - type: loadout | ||
| id: ClothingUniformMNKUnderGarment | ||
| price: 0 | ||
| equipment: | ||
| jumpsuit: ClothingUniformMNKUnderGarment | ||
|
|
||
| - type: loadout | ||
| id: ClothingUniformMNKDressBlack | ||
| price: 0 | ||
| equipment: | ||
| jumpsuit: ClothingUniformMNKDressBlack | ||
|
|
||
| - type: loadout | ||
| id: ClothingUniformMNKGymBra | ||
| price: 0 | ||
| equipment: | ||
| jumpsuit: ClothingUniformMNKGymBra | ||
|
|
||
| - type: loadout | ||
| id: ClothingUniformMNKBlackOveralls | ||
| price: 0 | ||
| equipment: | ||
| jumpsuit: ClothingUniformMNKBlackOveralls | ||
|
|
||
| - type: loadout | ||
| id: ClothingUniformMNKBlackShoulder | ||
| price: 0 | ||
| equipment: | ||
| jumpsuit: ClothingUniformMNKBlackShoulder | ||
|
|
||
| - type: loadout | ||
| id: ClothingUniformMNKTracksuitBlack | ||
| price: 0 | ||
| equipment: | ||
| jumpsuit: ClothingUniformMNKTracksuitBlack |
17 changes: 17 additions & 0 deletions
17
Resources/Prototypes/_Triad/Loadouts/Jobs/Contractor/outer.yml
This file contains hidden or 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,17 @@ | ||
| - type: loadout | ||
| id: ClothingOuterCoatMNKBlackJacket | ||
| price: 0 | ||
| equipment: | ||
| outerClothing: ClothingOuterCoatMNKBlackJacket | ||
|
|
||
| - type: loadout | ||
| id: ClothingOuterCoatMNKWhiteHoodie | ||
| price: 0 | ||
| equipment: | ||
| outerClothing: ClothingOuterCoatMNKWhiteHoodie | ||
|
|
||
| - type: loadout | ||
| id: ClothingOuterCoatMNKBlackTopCoat | ||
| price: 0 | ||
| equipment: | ||
| outerClothing: ClothingOuterCoatMNKBlackTopCoat |
Binary file added
BIN
+7.3 KB
...s/Textures/Nyanotrasen/Clothing/Misc/black_dress.rsi/equipped-INNERCLOTHING.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.19 KB
Resources/Textures/Nyanotrasen/Clothing/Misc/black_dress.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
+6.97 KB
Resources/Textures/Nyanotrasen/Clothing/Misc/black_dress.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
+7.69 KB
Resources/Textures/Nyanotrasen/Clothing/Misc/black_dress.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/Misc/black_dress.rsi/meta.json
This file contains hidden or 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": "inhand-left", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "inhand-right", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "equipped-INNERCLOTHING", | ||
| "directions": 4 | ||
| } | ||
| ] | ||
| } |
Binary file added
BIN
+10.3 KB
.../Textures/Nyanotrasen/Clothing/Misc/black_jacket.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
+6.17 KB
Resources/Textures/Nyanotrasen/Clothing/Misc/black_jacket.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.04 KB
Resources/Textures/Nyanotrasen/Clothing/Misc/black_jacket.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
+7.32 KB
Resources/Textures/Nyanotrasen/Clothing/Misc/black_jacket.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/Misc/black_jacket.rsi/meta.json
This file contains hidden or 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": "inhand-left", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "inhand-right", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "equipped-OUTERCLOTHING", | ||
| "directions": 4 | ||
| } | ||
| ] | ||
| } |
Binary file added
BIN
+8.6 KB
...Textures/Nyanotrasen/Clothing/Misc/black_overall.rsi/equipped-INNERCLOTHING.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.42 KB
Resources/Textures/Nyanotrasen/Clothing/Misc/black_overall.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.57 KB
Resources/Textures/Nyanotrasen/Clothing/Misc/black_overall.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.04 KB
Resources/Textures/Nyanotrasen/Clothing/Misc/black_overall.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/Misc/black_overall.rsi/meta.json
This file contains hidden or 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": "inhand-left", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "inhand-right", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "equipped-INNERCLOTHING", | ||
| "directions": 4 | ||
| } | ||
| ] | ||
| } |
Binary file added
BIN
+7.6 KB
...extures/Nyanotrasen/Clothing/Misc/black_top_coat.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
+6.41 KB
Resources/Textures/Nyanotrasen/Clothing/Misc/black_top_coat.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.04 KB
Resources/Textures/Nyanotrasen/Clothing/Misc/black_top_coat.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
+7.32 KB
Resources/Textures/Nyanotrasen/Clothing/Misc/black_top_coat.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/Misc/black_top_coat.rsi/meta.json
This file contains hidden or 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": "inhand-left", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "inhand-right", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "equipped-OUTERCLOTHING", | ||
| "directions": 4 | ||
| } | ||
| ] | ||
| } |
Binary file added
BIN
+7.38 KB
...tures/Nyanotrasen/Clothing/Misc/exposed_shoulder.rsi/equipped-INNERCLOTHING.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.27 KB
Resources/Textures/Nyanotrasen/Clothing/Misc/exposed_shoulder.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.03 KB
Resources/Textures/Nyanotrasen/Clothing/Misc/exposed_shoulder.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
+7.54 KB
Resources/Textures/Nyanotrasen/Clothing/Misc/exposed_shoulder.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/Misc/exposed_shoulder.rsi/meta.json
This file contains hidden or 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": "inhand-left", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "inhand-right", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "equipped-INNERCLOTHING", | ||
| "directions": 4 | ||
| } | ||
| ] | ||
| } |
Binary file added
BIN
+8.31 KB
...urces/Textures/Nyanotrasen/Clothing/Misc/gym_bra.rsi/equipped-INNERCLOTHING.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.
Binary file added
BIN
+7.4 KB
Resources/Textures/Nyanotrasen/Clothing/Misc/gym_bra.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.17 KB
Resources/Textures/Nyanotrasen/Clothing/Misc/gym_bra.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.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.