From d84049f7280944045b6b517d2bc96f11d2f42494 Mon Sep 17 00:00:00 2001 From: Lamrr <96937466+Lamrr@users.noreply.github.com> Date: Fri, 7 Jan 2022 14:58:41 +1100 Subject: [PATCH] Adds filled versions of coloured wardrobes (#6012) --- .../Catalog/Fills/Lockers/wardrobe_colors.yml | 190 +++++++++++++++--- .../Structures/Storage/Closets/wardrobe.yml | 8 + 2 files changed, 170 insertions(+), 28 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml index 7139474206..56364ee108 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml @@ -1,39 +1,173 @@ -#- type: entity -# id: WardrobeGreyFilled -# suffix: Filled -# parent: WardrobeGrey +- type: entity + id: WardrobeGreyFilled + suffix: Filled + parent: WardrobeGrey + components: + - type: StorageFill + contents: + - id: ClothingUniformJumpsuitColorGrey + amount: 2 + - id: ClothingUniformJumpskirtColorGrey + amount: 2 + - id: ClothingShoesColorBlack + amount: 3 + - id: ClothingHeadHatGreysoft + amount: 1 + - id: ClothingBackpackDuffel + prob: 0.5 + - id: ClothingOuterCoatBomber + prob: 0.3 -#- type: entity -# id: WardrobeMixedFilled -# suffix: Filled -# parent: WardrobeMixed +- type: entity + id: WardrobeMixedFilled + suffix: Filled + parent: WardrobeMixed + components: + - type: StorageFill + contents: + - id: ClothingUniformJumpsuitColorWhite + prob: 0.25 + - id: ClothingUniformJumpskirtColorWhite + prob: 0.25 + - id: ClothingUniformJumpsuitColorBlue + prob: 0.25 + - id: ClothingUniformJumpskirtColorBlue + prob: 0.25 + - id: ClothingUniformJumpsuitColorYellow + prob: 0.25 + - id: ClothingUniformJumpskirtColorYellow + prob: 0.25 + - id: ClothingUniformJumpsuitColorGreen + prob: 0.25 + - id: ClothingUniformJumpskirtColorGreen + prob: 0.25 + - id: ClothingUniformJumpsuitColorOrange + prob: 0.25 + - id: ClothingUniformJumpskirtColorOrange + prob: 0.25 + - id: ClothingUniformJumpsuitColorPink + prob: 0.25 + - id: ClothingUniformJumpskirtColorPink + prob: 0.25 + - id: ClothingUniformJumpsuitColorRed + prob: 0.25 + - id: ClothingUniformJumpskirtColorRed + prob: 0.25 + - id: ClothingUniformJumpsuitColorDarkBlue + prob: 0.25 + - id: ClothingUniformJumpskirtColorDarkBlue + prob: 0.25 + - id: ClothingUniformJumpsuitColorTeal + prob: 0.25 + - id: ClothingUniformJumpskirtColorTeal + prob: 0.25 + - id: ClothingUniformJumpsuitColorPurple + prob: 0.25 + - id: ClothingUniformJumpskirtColorPurple + prob: 0.25 + - id: ClothingShoesColorBlack + amount: 1 + - id: ClothingShoesColorBrown + amount: 1 + - id: ClothingShoesColorWhite + amount: 1 + - id: ClothingOuterCoatBomber + prob: 0.4 + - id: ClothingOuterCoatGentle + prob: 0.3 + +- type: entity + id: WardrobeYellowFilled + suffix: Filled + parent: WardrobeYellow + components: + - type: StorageFill + contents: + - id: ClothingUniformJumpsuitColorYellow + amount: 1 + - id: ClothingUniformJumpskirtColorYellow + amount: 1 + - id: ClothingShoesColorOrange + amount: 2 + - id: HatBandGold + amount: 1 -#- type: entity -# id: WardrobeYellowFilled -# suffix: Filled -# parent: WardrobeYellow - type: entity id: WardrobeWhiteFilled suffix: Filled parent: WardrobeWhite + components: + - type: StorageFill + contents: + - id: ClothingUniformJumpsuitColorWhite + amount: 1 + - id: ClothingUniformJumpskirtColorWhite + amount: 1 + - id: ClothingShoesColorWhite + amount: 2 + - id: ClothingHeadHatMimesoft + amount: 1 -#- type: entity -# id: WardrobeBlueFilled -# suffix: Filled -# parent: WardrobeBlue +- type: entity + id: WardrobeBlueFilled + suffix: Filled + parent: WardrobeBlue + components: + - type: StorageFill + contents: + - id: ClothingUniformJumpsuitColorBlue + amount: 1 + - id: ClothingUniformJumpskirtColorBlue + amount: 1 + - id: ClothingShoesColorBrown + amount: 2 -#- type: entity -# id: WardrobePinkFilled -# suffix: Filled -# parent: WardrobePink +- type: entity + id: WardrobePinkFilled + suffix: Filled + parent: WardrobePink + components: + - type: StorageFill + contents: + - id: ClothingUniformJumpsuitColorPink + amount: 1 + - id: ClothingUniformJumpskirtColorPink + amount: 1 + - id: ClothingShoesColorBrown + amount: 2 -#- type: entity -# id: WardrobeBlackFilled -# suffix: Filled -# parent: WardrobeBlack +- type: entity + id: WardrobeBlackFilled + suffix: Filled + parent: WardrobeBlack + components: + - type: StorageFill + contents: + - id: ClothingUniformJumpsuitColorBlack + amount: 1 + - id: ClothingUniformJumpskirtColorBlack + amount: 1 + - id: ClothingShoesColorBlack + amount: 2 + - id: HatBandBlack + amount: 1 + - id: HatBandSkull + prob: 0.4 + +- type: entity + id: WardrobeGreenFilled + suffix: Filled + parent: WardrobeGreen + components: + - type: StorageFill + contents: + - id: ClothingUniformJumpsuitColorGreen + amount: 1 + - id: ClothingUniformJumpskirtColorGreen + amount: 1 + - id: ClothingShoesColorBlack + amount: 2 + - id: HatBandGreen + amount: 1 -#- type: entity -# id: WardrobeGreenFilled -# suffix: Filled -# parent: WardrobeGreen diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml index 4404185472..6cf536ece3 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml @@ -12,6 +12,7 @@ id: WardrobeBlue parent: WardrobeBase name: blue wardrobe + description: "A wardrobe packed with stylish blue clothing." components: - type: Appearance visuals: @@ -25,6 +26,7 @@ id: WardrobePink parent: WardrobeBase name: pink wardrobe + description: "A wardrobe packed with fabulous pink clothing." components: - type: Appearance visuals: @@ -38,6 +40,7 @@ id: WardrobeBlack parent: WardrobeBase name: black wardrobe + description: "A wardrobe packed with stylish black clothing." components: - type: Appearance visuals: @@ -51,6 +54,7 @@ id: WardrobeGreen parent: WardrobeBase name: green wardrobe + description: "A wardrobe packed with stylish green clothing." components: - type: Appearance visuals: @@ -77,6 +81,7 @@ id: WardrobeYellow parent: WardrobeBase name: yellow wardrobe + description: "A wardrobe packed with stylish yellow clothing." components: - type: Appearance visuals: @@ -90,6 +95,7 @@ id: WardrobeWhite parent: WardrobeBase name: white wardrobe + description: "A wardrobe packed with stylish white clothing." components: - type: Appearance visuals: @@ -103,6 +109,7 @@ id: WardrobeGrey parent: WardrobeBase name: grey wardrobe + description: "A wardrobe packed with a tide of grey clothing." components: - type: Appearance visuals: @@ -116,6 +123,7 @@ id: WardrobeMixed parent: WardrobeBase name: mixed wardrobe + description: "A wardrobe packed with a mix of colorful clothing." components: - type: Appearance visuals: