Skip to content

Commit

Permalink
Update Clothing Assignments of Suit/Skirt (#857)
Browse files Browse the repository at this point in the history
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Changes some outfits, notably the Operative Jumpskirt, Kimono,
Dark/Light Monastic Robes, and the Gladiator Uniform to be assigned as
skirts, rather than suits. This allows harpies to wear them. In
addition, the UnsensoredClothingSkirtBase base now possesses the
'ClothMade' tag, allowing moths to eat outfits with this base.

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- tweak: Fixes a few typos in outfit descriptions
- fix: The Kimono, Dark/Light Monastic Robes, Gladiator Uniform, and
Operative Jumpskirt should be properly considered jumpskirts, and are by
extension wearable for harpies.
- fix: Moths should be able to eat outfits with the
UnsensoredClothingSkirtBase parent.
  • Loading branch information
Tirochora authored Sep 9, 2024
1 parent d82aa20 commit 874f4f7
Show file tree
Hide file tree
Showing 30 changed files with 70 additions and 58 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@
- type: Clothing
slots: [innerclothing]
femaleMask: UniformTop

- type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts
tags:
- Skirt
- ClothMade

- type: entity
abstract: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# All of the jumpskirts here have had their parent changed to ClothingUniformSkirtBase, as to allow harpies to wear them.
# White Jumpskirt
- type: entity
parent: ClothingUniformSkirtBase
Expand Down
61 changes: 61 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,19 @@
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/bartender.rsi

# This has been placed here, as it visually resembles a skirt.
# Likewise, the sprite file location has been moved to jumpskirts and the parent has been changed to ClothingUniformSkirtBase.
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpsuitBartenderPurple
name: purple bartender's uniform
description: A special purple outfit to serve drinks.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpskirt/bartender_purple.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/bartender_purple.rsi

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtCaptain
Expand Down Expand Up @@ -218,6 +231,19 @@
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/janitor.rsi

# This has been moved here, as it visually resembles a skirt.
# Likewise, the sprite file location has been moved to jumpskirts and the parent has been changed to ClothingUniformSkirtBase.
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpsuitKimono
name: kimono
description: traditional chinese clothing
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpskirt/kimono.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/kimono.rsi

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtMedicalDoctor
Expand Down Expand Up @@ -592,6 +618,30 @@
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/skirtoflife.rsi

# Both the light and dark monastic robes have been moved here.
# They have also had their parent changed to ClothingUniformSkirtBase, and their sprite has likewise been moved to the jumpskirts directory.
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpsuitMonasticRobeDark
name: dark monastic robe
description: It's a dark robe, often worn by religious folk.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpskirt/monastic_robe_dark.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/monastic_robe_dark.rsi

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpsuitMonasticRobeLight
name: light monastic robe
description: It's a light robe, often worn by religious folk.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpskirt/monastic_robe_light.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/monastic_robe_light.rsi

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtSeniorEngineer
Expand Down Expand Up @@ -678,6 +728,17 @@
graph: WebObjects
node: jumpskirt

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpsuitGladiator
name: gladiator uniform
description: Made for true gladiators (or Ash Walkers).
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpskirt/gladiator.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/gladiator.rsi

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtCasualBlue
Expand Down
61 changes: 4 additions & 57 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,6 @@
randomMode: false
mode: SensorCords

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitBartenderPurple
name: purple bartender's uniform
description: A special purple outfit to serve drinks.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/bartender_purple.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/bartender_purple.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitCaptain
Expand Down Expand Up @@ -396,17 +385,6 @@
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/janitor.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitKimono
name: kimono
description: traditional chinese clothing
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/kimono.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/kimono.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitMedicalDoctor
Expand Down Expand Up @@ -892,28 +870,6 @@
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/journalist.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitMonasticRobeDark
name: dark monastic robe
description: It's a dark robe, often worn by religious folk.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitMonasticRobeLight
name: light monastic robe
description: It's a light robe, often worn by religious folk.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitMusician
Expand Down Expand Up @@ -1065,7 +1021,8 @@
parent: ClothingUniformBase
id: ClothingUniformJumpsuitHawaiRed
name: red hawaiian shirt
description: Red as a juicy watermelons.
# Fixed typo, "Red as a juicy watermelons."
description: Red as a juicy watermelon.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/hawaired.rsi
Expand Down Expand Up @@ -1098,7 +1055,8 @@
parent: ClothingUniformBase
id: ClothingUniformJumpsuitFlannel
name: flannel jumpsuit
description: Smells like someones been grillin'.
# Fixed a typo, there should be an apostrophe before the s in 'someone's."
description: Smells like someone's been grillin'.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/flannel.rsi
Expand Down Expand Up @@ -1191,17 +1149,6 @@
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/loungewear.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitGladiator
name: gladiator uniform
description: Made for true gladiators (or Ash Walkers).
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/gladiator.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/gladiator.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitCasualBlue
Expand Down

0 comments on commit 874f4f7

Please sign in to comment.