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

Classical Maid Dress #498

Merged
merged 3 commits into from
Jan 24, 2025
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
ClothingOuterWinterJani: 2
ClothingNeckScarfStripedPurple: 3
ClothingShoesBootsWinterJani: 2 #Delta V: Add departmental winter boots
ClothingUniformClassicalMaidDress: 2 # Floofstation: a Tider was here and bestowed upon us frills
ClothingUniformJumpskirtJanimaid: 2 # Delta V: the maiden outfits no longer require emagging.
ClothingUniformJumpskirtJanimaidmini: 1
ClothingHandsJanitorWarmers: 1 # Floofstation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
ClothingUniformJumpskirtPerformer: 2
ClothingShoesBootsPerformer: 2
ClothingNeckCloakMoth: 2
ClothingUniformClassicalMaidDress: 2 # Floofstation: a Tider was here and bestowed upon us frills
ClothingUniformJumpskirtJanimaid: 2
ClothingNeckCloakVoid: 2
ClothingHeadBandRed: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -839,3 +839,4 @@
sprite: Clothing/Uniforms/Jumpskirt/olddress.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/olddress.rsi

Mnemotechnician marked this conversation as resolved.
Show resolved Hide resolved
12 changes: 12 additions & 0 deletions Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,3 +206,15 @@
sprite: Floof/Clothing/Uniforms/musiciankingblack.rsi
- type: Clothing
sprite: Floof/Clothing/Uniforms/musiciankingblack.rsi

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformClassicalMaidDress
name: Classical Maid Dress
description: A modernised version of the victorian-era maid dress. Streamlined but frilly perfect for a hard working maid.
components:
- type: Sprite
sprite: Floof/Clothing/Uniforms/ClassicalMaidDress.rsi
- type: Clothing
sprite: Floof/Clothing/Uniforms/ClassicalMaidDress.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.
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,30 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "Dzordz#8811",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading