From ae60520e1f462cbdffb525c258ce438bbedea1cc Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 23 Aug 2024 23:41:35 -0400 Subject: [PATCH 1/2] update clothing assignments of suit/skirt --- .../Uniforms/base_clothinguniforms.yml | 3 + .../Clothing/Uniforms/color_jumpskirts.yml | 32 +++++----- .../Entities/Clothing/Uniforms/jumpskirts.yml | 55 ++++++++++++++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 55 ------------------ .../Entities/Clothing/Uniforms/specific.yml | 2 +- .../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 31 files changed, 75 insertions(+), 72 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..c7a2e07cfbb 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -36,6 +36,9 @@ - type: Clothing slots: [innerclothing] femaleMask: UniformTop + - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts + tags: + - Skirt - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml index 1f77059841b..a2bf6b687a9 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml @@ -1,6 +1,6 @@ # White Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorWhite name: white jumpskirt description: A generic white jumpskirt with no rank markings. @@ -27,7 +27,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 +58,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 +89,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 +120,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 +151,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 +182,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 +213,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 +244,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 +275,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 +306,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 +337,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 +368,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 +399,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 +430,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 +461,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..3e2841c8511 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -9,6 +9,61 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/bartender.rsi +- 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: 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: 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: 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: ClothingUniformJumpskirtCaptain diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 6c853374f29..0a82b0218a6 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -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 @@ -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 @@ -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 @@ -1191,17 +1147,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 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml index ad02f4aa676..fa32c86d054 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpsuitChameleon name: black jumpsuit description: A generic black jumpsuit with no rank markings. 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 93fd4ce940e3f07692116ad33d3753271b24dcbb Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 1 Sep 2024 08:59:45 -0400 Subject: [PATCH 2/2] Commented out jumpsuits instead of deleting them, added comments to explain changes --- .../Uniforms/base_clothinguniforms.yml | 4 +- .../Clothing/Uniforms/color_jumpskirts.yml | 1 + .../Entities/Clothing/Uniforms/jumpskirts.yml | 5 ++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 60 +++++++++++++++++++ 4 files changed, 69 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml index c7a2e07cfbb..f95615acc65 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -36,6 +36,8 @@ - type: Clothing slots: [innerclothing] femaleMask: UniformTop +# Adds the 'skirt' tag to UnsensoredClothingUniformSkirtBase to, well, make it a skirt. +# By extension, the ClothingUniformSkirtBase is marked as a skirt as well. - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts tags: - Skirt @@ -69,6 +71,6 @@ slots: [innerclothing] femaleMask: UniformTop - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts +# Removed the subsequent 'skirt' tag from ClothingUniformSkirtBase, as the unsensored parent now has it. tags: - - Skirt - ClothMade # Delta-V - allows moths to eat this diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml index a2bf6b687a9..3f5948e8be4 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml @@ -1,3 +1,4 @@ +# Every jumpskirt in this file has been changed from having ClothingUniformBase to having ClothingUniformSkirtBase as a parent. # White Jumpskirt - type: entity parent: ClothingUniformSkirtBase diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 3e2841c8511..1ba43b3a3d7 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -9,6 +9,7 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/bartender.rsi +# Moved gladiator uniform here instead of jumpsuits.yml, changed its parent to ClothingUniformSkirtBase, and moved the sprite location to the jumpskirts directory. - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpsuitGladiator @@ -20,6 +21,7 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/gladiator.rsi +# Moved purple bartender's uniform here instead of jumpsuits.yml, changed its parent to ClothingUniformSkirtBase, and moved the sprite location to the jumpskirts directory. - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpsuitBartenderPurple @@ -31,6 +33,7 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/bartender_purple.rsi +# Moved dark monstic robe here instead of jumpsuits.yml, changed its parent to ClothingUniformSkirtBase, and moved the sprite location to the jumpskirts directory. - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpsuitMonasticRobeDark @@ -42,6 +45,7 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/monastic_robe_dark.rsi +# Moved light monastic here instead of jumpsuits.yml, changed its parent to ClothingUniformSkirtBase, and moved the sprite location to the jumpskirts directory. - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpsuitMonasticRobeLight @@ -53,6 +57,7 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/monastic_robe_light.rsi +# Moved kimono here instead of jumpsuits.yml, changed its parent to ClothingUniformSkirtBase, and moved the sprite location to the jumpskirts directory. - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpsuitKimono diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 0a82b0218a6..578c60548fc 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -46,6 +46,18 @@ randomMode: false mode: SensorCords +# Moved this to jumpskirts.yml, further modifications made there. +# - 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 @@ -385,6 +397,18 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/janitor.rsi +# Moved this to jumpskirts.yml, further modifications made there. +# - 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 @@ -870,6 +894,30 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/journalist.rsi +# Moved this to jumpskirts.yml, further modifications made there. +# - 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 + +# Moved this to jumpskirts.yml, further modifications made there. +# - 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 @@ -1147,6 +1195,18 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/loungewear.rsi +# Moved this to jumpskirts.yml, further modifications made there. +# - 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