From 0a59b6579d135e90d107051f5ed49b6d87ad02d3 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 4 Sep 2024 14:29:30 -0400 Subject: [PATCH 1/3] Makes outfits that are/resemble skirts have the ClothingUniformSkirtBase parent, fixes small typos, gives UnsensoredClothingUniformSkirtBase the 'ClothMade' tag. --- .../Uniforms/base_clothinguniforms.yml | 5 +- .../Clothing/Uniforms/color_jumpskirts.yml | 33 +++--- .../Entities/Clothing/Uniforms/jumpskirts.yml | 61 ++++++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 111 +++++++++--------- .../equipped-INNERCLOTHING-monkey.png | Bin .../equipped-INNERCLOTHING.png | Bin .../bartender_purple.rsi/icon.png | Bin .../bartender_purple.rsi/inhand-left.png | Bin .../bartender_purple.rsi/inhand-right.png | Bin .../bartender_purple.rsi/meta.json | 0 .../gladiator.rsi/equipped-INNERCLOTHING.png | Bin .../gladiator.rsi/icon.png | Bin .../gladiator.rsi/meta.json | 0 .../kimono.rsi/equipped-INNERCLOTHING.png | Bin .../kimono.rsi/icon.png | Bin .../kimono.rsi/inhand-left.png | Bin .../kimono.rsi/inhand-right.png | Bin .../kimono.rsi/meta.json | 0 .../equipped-INNERCLOTHING-monkey.png | Bin .../equipped-INNERCLOTHING.png | Bin .../monastic_robe_dark.rsi/icon.png | Bin .../monastic_robe_dark.rsi/inhand-left.png | Bin .../monastic_robe_dark.rsi/inhand-right.png | Bin .../monastic_robe_dark.rsi/meta.json | 0 .../equipped-INNERCLOTHING-monkey.png | Bin .../equipped-INNERCLOTHING.png | Bin .../monastic_robe_light.rsi/icon.png | Bin .../monastic_robe_light.rsi/inhand-left.png | Bin .../monastic_robe_light.rsi/inhand-right.png | Bin .../monastic_robe_light.rsi/meta.json | 0 30 files changed, 140 insertions(+), 70 deletions(-) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/bartender_purple.rsi/equipped-INNERCLOTHING-monkey.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/bartender_purple.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/bartender_purple.rsi/icon.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/bartender_purple.rsi/inhand-left.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/bartender_purple.rsi/inhand-right.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/bartender_purple.rsi/meta.json (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/gladiator.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/gladiator.rsi/icon.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/gladiator.rsi/meta.json (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/kimono.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/kimono.rsi/icon.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/kimono.rsi/inhand-left.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/kimono.rsi/inhand-right.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/kimono.rsi/meta.json (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/monastic_robe_dark.rsi/equipped-INNERCLOTHING-monkey.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/monastic_robe_dark.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/monastic_robe_dark.rsi/icon.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/monastic_robe_dark.rsi/inhand-left.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/monastic_robe_dark.rsi/inhand-right.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/monastic_robe_dark.rsi/meta.json (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/monastic_robe_light.rsi/equipped-INNERCLOTHING-monkey.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/monastic_robe_light.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/monastic_robe_light.rsi/icon.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/monastic_robe_light.rsi/inhand-left.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/monastic_robe_light.rsi/inhand-right.png (100%) rename Resources/Textures/Clothing/Uniforms/{Jumpsuit => Jumpskirt}/monastic_robe_light.rsi/meta.json (100%) diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml index 9c896786c26..7e261c1bd77 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml index 1f77059841b..b5432eee074 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml @@ -1,6 +1,7 @@ +# All of the jumpskirts here have had their parent changed to ClothingUniformSkirtBase, as to allow harpies to wear them. # White Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorWhite name: white jumpskirt description: A generic white jumpskirt with no rank markings. @@ -27,7 +28,7 @@ # Grey Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorGrey name: grey jumpskirt description: A tasteful grey jumpskirt that reminds you of the good old days. @@ -58,7 +59,7 @@ # Black Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorBlack name: black jumpskirt description: A generic black jumpskirt with no rank markings. @@ -89,7 +90,7 @@ # Blue Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorBlue name: blue jumpskirt description: A generic blue jumpskirt with no rank markings. @@ -120,7 +121,7 @@ # Dark Blue Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorDarkBlue name: dark blue jumpskirt description: A generic dark blue jumpskirt with no rank markings. @@ -151,7 +152,7 @@ # Teal Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorTeal name: teal jumpskirt description: A generic teal jumpskirt with no rank markings. @@ -182,7 +183,7 @@ # Green Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorGreen name: green jumpskirt description: A generic green jumpskirt with no rank markings. @@ -213,7 +214,7 @@ # Dark Green Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorDarkGreen name: dark green jumpskirt description: A generic dark green jumpskirt with no rank markings. @@ -244,7 +245,7 @@ # Orange Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorOrange name: orange jumpskirt description: Don't wear this near paranoid security officers. @@ -275,7 +276,7 @@ # Pink Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorPink name: pink jumpskirt description: Just looking at this makes you feel fabulous. @@ -306,7 +307,7 @@ # Red Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorRed name: red jumpskirt description: A generic red jumpskirt with no rank markings. @@ -337,7 +338,7 @@ # Yellow Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorYellow name: yellow jumpskirt description: A generic yellow jumpskirt with no rank markings. @@ -368,7 +369,7 @@ # Purple Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorPurple name: purple jumpskirt description: A generic light purple jumpskirt with no rank markings. @@ -399,7 +400,7 @@ # Light Brown Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorLightBrown name: light brown jumpskirt description: A generic light brown jumpskirt with no rank markings. @@ -430,7 +431,7 @@ # Brown Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorBrown name: brown jumpskirt description: A generic brown jumpskirt with no rank markings. @@ -461,7 +462,7 @@ # Maroon Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorMaroon name: maroon jumpskirt description: A generic maroon jumpskirt with no rank markings. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 7cbf5c940ae..cbbf78b9a17 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 6c853374f29..2cbadefb1b1 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -46,16 +46,17 @@ 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 +# This has been moved to jumpskirts.yml, as it visually resembles a skirt. +# - 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 @@ -396,16 +397,16 @@ - 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: 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 @@ -892,27 +893,28 @@ - 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 +# Both the light and dark monastic robes have been relocated to jumpskirts.yml, as robes should be able to be worn by harpies. +# - 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 @@ -1065,7 +1067,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 @@ -1098,7 +1101,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 @@ -1191,16 +1195,17 @@ - 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 +# Moved to jumpskirts.yml, as I believe it resembles a chainmail skirt more than pants or shorts. +# - 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 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender_purple.rsi/equipped-INNERCLOTHING-monkey.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/equipped-INNERCLOTHING-monkey.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender_purple.rsi/equipped-INNERCLOTHING-monkey.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender_purple.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender_purple.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender_purple.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/icon.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender_purple.rsi/icon.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender_purple.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/inhand-left.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender_purple.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender_purple.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/inhand-right.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender_purple.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender_purple.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/meta.json rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender_purple.rsi/meta.json diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/gladiator.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/gladiator.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/gladiator.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/gladiator.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/gladiator.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/gladiator.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/gladiator.rsi/icon.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/gladiator.rsi/icon.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/gladiator.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/gladiator.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/gladiator.rsi/meta.json rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/gladiator.rsi/meta.json diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/kimono.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/kimono.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/kimono.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/icon.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/kimono.rsi/icon.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/kimono.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/inhand-left.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/kimono.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/kimono.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/inhand-right.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/kimono.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/kimono.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/meta.json rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/kimono.rsi/meta.json diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_dark.rsi/equipped-INNERCLOTHING-monkey.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/equipped-INNERCLOTHING-monkey.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_dark.rsi/equipped-INNERCLOTHING-monkey.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_dark.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_dark.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_dark.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/icon.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_dark.rsi/icon.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_dark.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/inhand-left.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_dark.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_dark.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/inhand-right.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_dark.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_dark.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/meta.json rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_dark.rsi/meta.json diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_light.rsi/equipped-INNERCLOTHING-monkey.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/equipped-INNERCLOTHING-monkey.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_light.rsi/equipped-INNERCLOTHING-monkey.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_light.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_light.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_light.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/icon.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_light.rsi/icon.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_light.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/inhand-left.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_light.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_light.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/inhand-right.png rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_light.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_light.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/meta.json rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/monastic_robe_light.rsi/meta.json From fd0ff77bdac655e2fbfb7d6f79a9901bd48d501e Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 7 Sep 2024 00:59:14 -0400 Subject: [PATCH 2/3] Removed commented-out outfits --- .../Entities/Clothing/Uniforms/jumpsuits.yml | 57 ------------------- 1 file changed, 57 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 2cbadefb1b1..db0fce489d4 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -46,18 +46,6 @@ randomMode: false mode: SensorCords -# This has been moved to jumpskirts.yml, as it visually resembles a skirt. -# - 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 @@ -397,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 @@ -893,29 +870,6 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/journalist.rsi -# Both the light and dark monastic robes have been relocated to jumpskirts.yml, as robes should be able to be worn by harpies. -# - 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 @@ -1195,17 +1149,6 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/loungewear.rsi -# Moved to jumpskirts.yml, as I believe it resembles a chainmail skirt more than pants or shorts. -# - 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 From e8978d1f51cd9d8d9132baebfb164258bf9f03d1 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 7 Sep 2024 01:02:41 -0400 Subject: [PATCH 3/3] This would frustrate the hell out of me if I just left it --- Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index db0fce489d4..565cc987b19 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -1149,7 +1149,6 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/loungewear.rsi - - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitCasualBlue