-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #116 from DakoDemon/dev-enviro
Socks, Arm-Warmers, and Uniforms
- Loading branch information
Showing
276 changed files
with
3,306 additions
and
1 deletion.
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
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
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
135 changes: 135 additions & 0 deletions
135
Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.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,135 @@ | ||
| - type: entity | ||
| parent: ClothingHandsBase | ||
| id: ClothingHandsPlainWarmers | ||
| name: plain arm-warmers | ||
| description: A pair of rather plain arm-warmers | ||
| components: | ||
| - type: Sprite | ||
| sprite: Floof/Clothing/Under/Gloves/plainwarmer.rsi | ||
| - type: Clothing | ||
| sprite: Floof/Clothing/Under/Gloves/plainwarmer.rsi | ||
| - type: Fiber | ||
| fiberMaterial: fibers-synthetic | ||
| fiberColor: fibers-black | ||
| - type: FingerprintMask | ||
|
|
||
| - type: entity | ||
| parent: ClothingHandsBase | ||
| id: ClothingHandsBeeWarmers | ||
| name: bee arm-warmers | ||
| description: A pair of rather buzzy arm-warmers | ||
| components: | ||
| - type: Sprite | ||
| sprite: Floof/Clothing/Under/Gloves/beewarmer.rsi | ||
| - type: Clothing | ||
| sprite: Floof/Clothing/Under/Gloves/beewarmer.rsi | ||
| - type: Fiber | ||
| fiberMaterial: fibers-synthetic | ||
| fiberColor: fibers-yellow | ||
| - type: FingerprintMask | ||
|
|
||
| - type: entity | ||
| parent: ClothingHandsBase | ||
| id: ClothingHandsCoderWarmers | ||
| name: coder arm-warmers | ||
| description: A pair of rather nice arm-warmers | ||
| components: | ||
| - type: Sprite | ||
| sprite: Floof/Clothing/Under/Gloves/coderwarmer.rsi | ||
| - type: Clothing | ||
| sprite: Floof/Clothing/Under/Gloves/coderwarmer.rsi | ||
| - type: Fiber | ||
| fiberMaterial: fibers-synthetic | ||
| fiberColor: fibers-white | ||
| - type: FingerprintMask | ||
|
|
||
| - type: entity | ||
| parent: ClothingHandsBase | ||
| id: ClothingHandsCoderValidWarmers | ||
| name: coder valid arm-warmers | ||
| description: A pair of rather nice arm-warmers | ||
| components: | ||
| - type: Sprite | ||
| sprite: Floof/Clothing/Under/Gloves/codervalidwarmer.rsi | ||
| - type: Clothing | ||
| sprite: Floof/Clothing/Under/Gloves/codervalidwarmer.rsi | ||
| - type: Fiber | ||
| fiberMaterial: fibers-synthetic | ||
| fiberColor: fibers-red | ||
| - type: FingerprintMask | ||
|
|
||
| - type: entity | ||
| parent: ClothingHandsBase | ||
| id: ClothingHandsStripeWhiteWarmers | ||
| name: striped white arm-warmers | ||
| description: A pair of rather nice arm-warmers | ||
| components: | ||
| - type: Sprite | ||
| sprite: Floof/Clothing/Under/Gloves/stripewarmerwhite.rsi | ||
| - type: Clothing | ||
| sprite: Floof/Clothing/Under/Gloves/stripewarmerwhite.rsi | ||
| - type: Fiber | ||
| fiberMaterial: fibers-synthetic | ||
| fiberColor: fibers-white | ||
| - type: FingerprintMask | ||
|
|
||
| - type: entity | ||
| parent: ClothingHandsBase | ||
| id: ClothingHandsStripePurpleWarmers | ||
| name: striped purple arm-warmers | ||
| description: A pair of rather nice arm-warmers | ||
| components: | ||
| - type: Sprite | ||
| sprite: Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi | ||
| - type: Clothing | ||
| sprite: Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi | ||
| - type: Fiber | ||
| fiberMaterial: fibers-synthetic | ||
| fiberColor: fibers-purple | ||
| - type: FingerprintMask | ||
|
|
||
| - type: entity | ||
| parent: ClothingHandsBase | ||
| id: ClothingHandsStripeRainbowWarmers | ||
| name: striped rainbow arm-warmers | ||
| description: A pair of rather nice arm-warmers | ||
| components: | ||
| - type: Sprite | ||
| sprite: Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi | ||
| - type: Clothing | ||
| sprite: Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi | ||
| - type: Fiber | ||
| fiberMaterial: fibers-synthetic | ||
| fiberColor: fibers-colorful | ||
| - type: FingerprintMask | ||
|
|
||
| - type: entity | ||
| parent: ClothingHandsBase | ||
| id: ClothingHandsSexCompGlovesRed | ||
| name: red sex competition gloves | ||
| description: It looks like it should be part of a competition. | ||
| components: | ||
| - type: Sprite | ||
| sprite: Floof/Clothing/Under/Gloves/sexcompredgloves.rsi | ||
| - type: Clothing | ||
| sprite: Floof/Clothing/Under/Gloves/sexcompredgloves.rsi | ||
| - type: Fiber | ||
| fiberMaterial: fibers-synthetic | ||
| fiberColor: fibers-red | ||
| - type: FingerprintMask | ||
|
|
||
| - type: entity | ||
| parent: ClothingHandsBase | ||
| id: ClothingHandsSexCompGlovesBlue | ||
| name: blue sex competition gloves | ||
| description: It looks like it should be part of a competition. | ||
| components: | ||
| - type: Sprite | ||
| sprite: Floof/Clothing/Under/Gloves/sexcompbluegloves.rsi | ||
| - type: Clothing | ||
| sprite: Floof/Clothing/Under/Gloves/sexcompbluegloves.rsi | ||
| - type: Fiber | ||
| fiberMaterial: fibers-synthetic | ||
| fiberColor: fibers-blue | ||
| - type: FingerprintMask | ||
|
|
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
55 changes: 55 additions & 0 deletions
55
Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/MiscOuterwear.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,55 @@ | ||
| - type: entity | ||
| parent: ClothingOuterBase | ||
| id: ClothingOuterSexCompBeltBronze | ||
| name: bronze sex competition belt | ||
| description: Looks like you came third in a competion. | ||
| components: | ||
| - type: Sprite | ||
| sprite: Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi | ||
| - type: Clothing | ||
| sprite: Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi | ||
|
|
||
| - type: entity | ||
| parent: ClothingOuterBase | ||
| id: ClothingOuterSexCompBeltSilver | ||
| name: silver sex competition belt | ||
| description: Looks like you came second in a competion. | ||
| components: | ||
| - type: Sprite | ||
| sprite: Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi | ||
| - type: Clothing | ||
| sprite: Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi | ||
|
|
||
| - type: entity | ||
| parent: ClothingOuterBase | ||
| id: ClothingOuterSexCompBeltGold | ||
| name: gold sex competition belt | ||
| description: Looks like you came in first in a competion. | ||
| components: | ||
| - type: Sprite | ||
| sprite: Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi | ||
| - type: Clothing | ||
| sprite: Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi | ||
|
|
||
| - type: entity | ||
| parent: ClothingOuterBase | ||
| id: ClothingOuterBeltedOutfit | ||
| name: belted outerwear | ||
| description: What? Do you think youre an anime protagonist or something? | ||
| components: | ||
| - type: Sprite | ||
| sprite: Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi | ||
| - type: Clothing | ||
| sprite: Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi | ||
|
|
||
| - type: entity | ||
| parent: ClothingOuterWinterCoatToggleable | ||
| id: ClothingOuterMarsHoodie | ||
| name: pink hoodie | ||
| components: | ||
| - type: Sprite | ||
| sprite: Floof/Clothing/OuterClothing/Misc/marshoodie.rsi | ||
| - type: Clothing | ||
| sprite: Floof/Clothing/OuterClothing/Misc/marshoodie.rsi | ||
| - type: ToggleableClothing | ||
| clothingPrototype: ClothingHeadHatHoodMarsHoodieHood |
Oops, something went wrong.