From e9bdb23d28fca41a12b98d69ab7cd86113467101 Mon Sep 17 00:00:00 2001 From: shamp <140359015+shampunj@users.noreply.github.com> Date: Fri, 15 Mar 2024 04:56:33 +0100 Subject: [PATCH] Added cheap sunglasses into ClothesMate (#25479) * cheap sunglasses * Update glasses.yml * Update Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml * Fix price --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: metalgearsloth (cherry picked from commit d370f16e04fc12c8fa2b89c41c3fce12225334b4) --- .../Catalog/Cargo/cargo_vending.yml | 2 +- .../Inventories/clothesmate.yml | 1 + .../Entities/Clothing/Eyes/glasses.yml | 19 +++++++++++++------ RobustToolbox | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 2d00bf780e..d77bef3757 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -33,7 +33,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockClothesFilled - cost: 7250 #DeltaV + cost: 8000 #DeltaV category: cargoproduct-category-name-service group: market diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 9085bcb4fb..d83e5a939b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -99,6 +99,7 @@ ClothingHandsGlovesColorGreen: 2 ClothingHandsGlovesColorOrange: 2 ClothingHandsGlovesColorPurple: 2 + ClothingEyesGlassesCheapSunglasses: 3 contrabandInventory: ClothingMaskNeckGaiter: 2 ClothingUniformJumpsuitTacticool: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 79446d8633..9af8edb002 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -129,17 +129,14 @@ - type: entity parent: ClothingEyesBase - id: ClothingEyesGlassesSunglasses - name: sun glasses - description: A pair of black sunglasses. + id: ClothingEyesGlassesCheapSunglasses + name: cheap sunglasses + description: A pair of black sunglasses. Doesn't block light well, more of an accessory than something useful. components: - type: Sprite sprite: Clothing/Eyes/Glasses/sunglasses.rsi - type: Clothing sprite: Clothing/Eyes/Glasses/sunglasses.rsi - - type: FlashImmunity - - type: EyeProtection - protectionTime: 5 - type: Tag tags: - HamsterWearable @@ -148,6 +145,16 @@ - type: IdentityBlocker coverage: EYES +- type: entity + parent: ClothingEyesGlassesCheapSunglasses + id: ClothingEyesGlassesSunglasses + name: sun glasses + description: A pair of black sunglasses. + components: + - type: FlashImmunity + - type: EyeProtection + protectionTime: 5 + - type: entity parent: ClothingEyesBase id: ClothingEyesGlassesSecurity diff --git a/RobustToolbox b/RobustToolbox index 4af67b1394..2b6381c332 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 4af67b1394556dae369d3180b1dcc5bf129dcc85 +Subproject commit 2b6381c332793b6207db2d865234674f36824bbe