Skip to content
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

Cosmetic Drip ~ INTERMISSION 2 #450

Merged
Merged
Show file tree
Hide file tree
Changes from 2 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
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@
ClothingHeadHatAnimalHeadslimeYellow: 2
ClothingHeadHatAnimalHeadslimePurple: 2
ClothingHeadHatAnimalHeadslimeLightgreen: 2
ClothingHeadHatCowboyDerbyBlack: 2
ClothingHeadHatCowboyDerbyBrown: 2
ClothingHeadHatCowboyDerbyWhite: 2
ClothingHeadHatCowboyGamblerBlack: 2
ClothingHeadHatCowboyGamblerBrown: 2
ClothingHeadHatCowboyGamblerWhite: 2
ClothingEyesBlindfold: 3
ClothingEyesEyepatch: 3
ClothingEyesGlassesJamjar: 2
Expand Down
68 changes: 68 additions & 0 deletions Resources/Prototypes/_CD/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,71 @@
- ClothMade
- HamsterWearable
- WhitelistChameleon

# Cowboy hat spam follows.

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatCowboyDerbyBlack
name: black derby hat
description: A black cowboy hat in the derby style
components:
- type: Sprite
sprite: _CD/Clothing/Head/Hats/Cowboy/derby_black.rsi
- type: Clothing
sprite: _CD/Clothing/Head/Hats/Cowboy/derby_black.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatCowboyDerbyBrown
name: brown derby hat
description: A brown cowboy hat in the derby style
components:
- type: Sprite
sprite: _CD/Clothing/Head/Hats/Cowboy/derby_brown.rsi
- type: Clothing
sprite: _CD/Clothing/Head/Hats/Cowboy/derby_brown.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatCowboyDerbyWhite
name: white derby hat
description: A white cowboy hat in the derby style
components:
- type: Sprite
sprite: _CD/Clothing/Head/Hats/Cowboy/derby_white.rsi
- type: Clothing
sprite: _CD/Clothing/Head/Hats/Cowboy/derby_white.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatCowboyGamblerBlack
name: black brick hat
description: A black cowboy hat in the gambler style
components:
- type: Sprite
sprite: _CD/Clothing/Head/Hats/Cowboy/gambler_black.rsi
- type: Clothing
sprite: _CD/Clothing/Head/Hats/Cowboy/gambler_black.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatCowboyGamblerBrown
name: brown brick hat
description: A brown cowboy hat in the gambler style
components:
- type: Sprite
sprite: _CD/Clothing/Head/Hats/Cowboy/gambler_brown.rsi
- type: Clothing
sprite: _CD/Clothing/Head/Hats/Cowboy/gambler_brown.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatCowboyGamblerWhite
name: white brick hat
description: A white cowboy hat in the gambler style
components:
- type: Sprite
sprite: _CD/Clothing/Head/Hats/Cowboy/gambler_white.rsi
- type: Clothing
sprite: _CD/Clothing/Head/Hats/Cowboy/gambler_white.rsi
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": "Adjusted from and Taken from tgstation at https://github.com/tgstation/tgstation/commit/8703eac50de6379c26f7eadb47b4f016854d1dcd by Github KittenColony / Discord kittencolony (297865728374210561)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
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": "Adjusted from and Taken from tgstation at https://github.com/tgstation/tgstation/commit/8703eac50de6379c26f7eadb47b4f016854d1dcd by Github KittenColony / Discord kittencolony (297865728374210561)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
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": "Adjusted from and Taken from tgstation at https://github.com/tgstation/tgstation/commit/8703eac50de6379c26f7eadb47b4f016854d1dcd by Github KittenColony / Discord kittencolony (297865728374210561)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
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": "Adjusted from and Taken from tgstation at https://github.com/tgstation/tgstation/commit/8703eac50de6379c26f7eadb47b4f016854d1dcd by Github KittenColony / Discord kittencolony (297865728374210561)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
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": "Adjusted from and Taken from tgstation at https://github.com/tgstation/tgstation/commit/8703eac50de6379c26f7eadb47b4f016854d1dcd by Github KittenColony / Discord kittencolony (297865728374210561)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
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": "Adjusted from and Taken from tgstation at https://github.com/tgstation/tgstation/commit/8703eac50de6379c26f7eadb47b4f016854d1dcd by Github KittenColony / Discord kittencolony (297865728374210561)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading