From 93fd4ce940e3f07692116ad33d3753271b24dcbb Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 1 Sep 2024 08:59:45 -0400 Subject: [PATCH] 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