diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 6287710182a..2165fb4e585 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -33,8 +33,8 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockClothesFilled - cost: 7250 #DeltaV - category: Service + cost: 7245 + category: cargoproduct-category-name-service group: market - type: cargoProduct diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 8f40ce99de2..1dbc412a9c8 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -100,6 +100,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 79446d8633e..9af8edb0028 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