-
Notifications
You must be signed in to change notification settings - Fork 89
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
Frontier Clothes #448
Merged
Merged
Frontier Clothes #448
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
7e6490a
Merge pull request #42 from TheDenSS14/clothing-max
sleepyyapril f88ece9
Added Frontier Jackets to Loadout (#109)
KyuPolaris 943cc9c
Added Frontier Jackets to Loadout (#109)
KyuPolaris 3f86465
Fix Linter
VMSolidus 096ef8a
fixes
Fansana 90bc524
add chaplain sash
Fansana beb53da
fix tests
Fansana 464041d
Merge branch 'master' into frontier-clothes
Mnemotechnician File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
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
31 changes: 17 additions & 14 deletions
31
Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.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
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
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
149 changes: 149 additions & 0 deletions
149
Resources/Prototypes/Loadouts/Generic/outerClothing.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,149 @@ | ||
| - type: loadout | ||
| id: LoadoutOuterBomberAerostatic | ||
| category: Outer | ||
| cost: 0 | ||
| items: | ||
| - ClothingOuterCoatBomberAerostatic | ||
| requirements: | ||
| - !type:CharacterItemGroupRequirement | ||
| group: LoadoutOuter | ||
|
|
||
| - type: loadout | ||
| id: LoadoutOuterBomberPunkRed | ||
| category: Outer | ||
| cost: 0 | ||
| items: | ||
| - ClothingOuterCoatBomberPunkRed | ||
| requirements: | ||
| - !type:CharacterItemGroupRequirement | ||
| group: LoadoutOuter | ||
|
|
||
| - type: loadout | ||
| id: LoadoutOuterJacketLeather | ||
| category: Outer | ||
| cost: 0 | ||
| items: | ||
| - ClothingOuterCoatJacketLeather | ||
| requirements: | ||
| - !type:CharacterItemGroupRequirement | ||
| group: LoadoutOuter | ||
|
|
||
| - type: loadout | ||
| id: LoadoutOuterJacketBiker | ||
| category: Outer | ||
| cost: 0 | ||
| items: | ||
| - ClothingOuterCoatJacketBiker | ||
| requirements: | ||
| - !type:CharacterItemGroupRequirement | ||
| group: LoadoutOuter | ||
|
|
||
| - type: loadout | ||
| id: LoadoutOuterJacketJamrock | ||
| category: Outer | ||
| cost: 0 | ||
| items: | ||
| - ClothingOuterCoatJacketJamrock | ||
| requirements: | ||
| - !type:CharacterItemGroupRequirement | ||
| group: LoadoutOuter | ||
|
|
||
| - type: loadout | ||
| id: LoadoutOuterJacketLettermanBlue | ||
| category: Outer | ||
| cost: 0 | ||
| items: | ||
| - ClothingOuterCoatJacketLettermanBlue | ||
| requirements: | ||
| - !type:CharacterItemGroupRequirement | ||
| group: LoadoutOuter | ||
|
|
||
| - type: loadout | ||
| id: LoadoutOuterJacketLettermanBrown | ||
| category: Outer | ||
| cost: 0 | ||
| items: | ||
| - ClothingOuterCoatJacketLettermanBrown | ||
| requirements: | ||
| - !type:CharacterItemGroupRequirement | ||
| group: LoadoutOuter | ||
|
|
||
| - type: loadout | ||
| id: LoadoutOuterJacketLettermanMagenta | ||
| category: Outer | ||
| cost: 0 | ||
| items: | ||
| - ClothingOuterCoatJacketLettermanMagenta | ||
| requirements: | ||
| - !type:CharacterItemGroupRequirement | ||
| group: LoadoutOuter | ||
|
|
||
| - type: loadout | ||
| id: LoadoutOuterJacketLettermanRed | ||
| category: Outer | ||
| cost: 0 | ||
| items: | ||
| - ClothingOuterCoatJacketLettermanRed | ||
| requirements: | ||
| - !type:CharacterItemGroupRequirement | ||
| group: LoadoutOuter | ||
|
|
||
| - type: loadout | ||
| id: LoadoutOuterBomberPinkSleeves | ||
| category: Outer | ||
| cost: 0 | ||
| items: | ||
| - ClothingOuterCoatBomberPinkSleeves | ||
| requirements: | ||
| - !type:CharacterItemGroupRequirement | ||
| group: LoadoutOuter | ||
|
|
||
| - type: loadout | ||
| id: LoadoutOuterCoatAcidRaincoat | ||
| category: Outer | ||
| cost: 0 | ||
| items: | ||
| - ClothingOuterCoatAcidRaincoat | ||
| requirements: | ||
| - !type:CharacterItemGroupRequirement | ||
| group: LoadoutOuter | ||
|
|
||
| - type: loadout | ||
| id: LoadoutOuterCoatAcidRaincoatBlue | ||
| category: Outer | ||
| cost: 0 | ||
| items: | ||
| - ClothingOuterCoatAcidRaincoatBlue | ||
| requirements: | ||
| - !type:CharacterItemGroupRequirement | ||
| group: LoadoutOuter | ||
|
|
||
| - type: loadout | ||
| id: LoadoutOuterCoatAcidRaincoatGreen | ||
| category: Outer | ||
| cost: 0 | ||
| items: | ||
| - ClothingOuterCoatAcidRaincoatGreen | ||
| requirements: | ||
| - !type:CharacterItemGroupRequirement | ||
| group: LoadoutOuter | ||
|
|
||
| - type: loadout | ||
| id: LoadoutOuterCoatAcidRaincoatMagenta | ||
| category: Outer | ||
| cost: 0 | ||
| items: | ||
| - ClothingOuterCoatAcidRaincoatMagenta | ||
| requirements: | ||
| - !type:CharacterItemGroupRequirement | ||
| group: LoadoutOuter | ||
|
|
||
| - type: loadout | ||
| id: LoadoutOuterCoatAcidRaincoatYellow | ||
| category: Outer | ||
| cost: 0 | ||
| items: | ||
| - ClothingOuterCoatAcidRaincoatYellow | ||
| requirements: | ||
| - !type:CharacterItemGroupRequirement | ||
| group: LoadoutOuter |
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,34 @@ | ||
| - type: entity | ||
| parent: ClothingBeltStorageBase | ||
| id: ClothingBeltChaplainSash | ||
| name: chaplain sash | ||
| description: Who knew that scarves can be also tied around your waist? | ||
| components: | ||
| - type: Sprite | ||
| sprite: _NF/Clothing/Belt/chaplain_sash.rsi | ||
| - type: Clothing | ||
| sprite: _NF/Clothing/Belt/chaplain_sash.rsi | ||
| - type: ItemMapper | ||
| mapLayers: | ||
| book: | ||
| whitelist: | ||
| tags: | ||
| - Book | ||
| components: | ||
| - BibleComponent | ||
| - Paper | ||
| bottle: | ||
| whitelist: | ||
| tags: | ||
| - Bottle | ||
| - DrinkBottle | ||
| components: | ||
| - Drink | ||
| - Hypospray | ||
| crucifix: | ||
| whitelist: | ||
| tags: | ||
| - Crucifix | ||
| sprite: _NF/Clothing/Belt/chaplain_sash_overlay.rsi | ||
| - type: Appearance | ||
|
|
39 changes: 39 additions & 0 deletions
39
Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.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,39 @@ | ||
|
|
||
| - type: entity | ||
| parent: ClothingBeltStorageBase | ||
| id: ClothingBeltPunkRandomized | ||
| name: punk belt | ||
| description: A webbing with functional pockets. | ||
| suffix: Random visuals | ||
| components: | ||
| - type: Sprite | ||
| sprite: _NF/Clothing/Belt/punk.rsi | ||
| layers: | ||
| - state: base_belt_01 | ||
| map: [ "belt_main" ] | ||
| - state: decor_base_belt_01 | ||
| map: [ "belt_decor" ] | ||
| - state: mask_null | ||
| map: [ "belt_overlay" ] | ||
| - type: Clothing | ||
| sprite: _NF/Clothing/Belt/punk.rsi | ||
| clothingVisuals: | ||
| belt: | ||
| - state: base_belt_01 | ||
| map: [ "belt_main" ] | ||
| - state: decor_base_belt_01 | ||
| map: [ "belt_decor" ] | ||
| - state: mask_null | ||
| map: [ "belt_overlay" ] | ||
| - type: RandomSprite | ||
| available: | ||
| - belt_main: | ||
| base_belt_01: CyberpunkDark | ||
| belt_decor: | ||
| decor_base_belt_01: CyberpunkDark | ||
| belt_overlay: | ||
| decor_base_belt_02: CyberpunkDark | ||
| decor_base_belt_03: CyberpunkDark | ||
| decor_base_belt_04: CyberpunkDark | ||
| decor_base_belt_05: CyberpunkDark | ||
| mask_null: "" |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure we have the ash tag on floof/ee. It's why I added the Burnt tag to the ash entity in my bugfix PR, and it may be the reason tests are failing here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ash is there