diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 5dae53f8ed..86da8fb940 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: 2400 + cost: 2440 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 54a6ae2a19..a069833759 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -53,6 +53,8 @@ ClothingUniformJumpskirtCasualPurple: 2 ClothingUniformJumpsuitCasualRed: 2 ClothingUniformJumpskirtCasualRed: 2 + ClothingUniformJumpsuitCasualGreen: 2 + ClothingUniformJumpskirtCasualGreen: 2 # DO NOT ADD MORE, USE UNIFORM DYING ClothingShoesColorBlack: 8 ClothingShoesColorBrown: 4 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml index a2bf6b687a..3f48b0260f 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml @@ -222,24 +222,24 @@ sprite: Clothing/Uniforms/Jumpskirt/color.rsi layers: - state: icon - color: "#79CC26" + color: "#007923" - state: trinkets-icon - type: Item inhandVisuals: left: - state: inhand-left - color: "#79CC26" + color: "#007923" - state: trinkets-inhand-left right: - state: inhand-right - color: "#79CC26" + color: "#007923" - state: trinkets-inhand-right - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/color.rsi clothingVisuals: jumpsuit: - state: equipped-INNERCLOTHING - color: "#79CC26" + color: "#007923" - state: trinkets-equipped-INNERCLOTHING # Orange Jumpskirt diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml index f56afabeac..7a44409079 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml @@ -222,24 +222,24 @@ sprite: Clothing/Uniforms/Jumpsuit/color.rsi layers: - state: icon - color: "#79CC26" + color: "#007923" - state: trinkets-icon - type: Item inhandVisuals: left: - state: inhand-left - color: "#79CC26" + color: "#007923" - state: trinkets-inhand-left right: - state: inhand-right - color: "#79CC26" + color: "#007923" - state: trinkets-inhand-right - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/color.rsi clothingVisuals: jumpsuit: - state: equipped-INNERCLOTHING - color: "#79CC26" + color: "#007923" - state: trinkets-equipped-INNERCLOTHING # Orange Jumpsuit diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 9a91f92715..c4850954cd 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -822,6 +822,36 @@ - state: equipped-INNERCLOTHING-shirt color: "#b30000" +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtCasualGreen + name: casual green jumpskirt + description: A loose worn green shirt with a grey skirt, perfect for someone looking to relax. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/casual.rsi + layers: + - state: icon-jumpskirt + - state: icon-shirt + color: "#00661D" + - type: Item + inhandVisuals: + left: + - state: inhand-left-jumpskirt + - state: inhand-left-shirt + color: "#00661D" + right: + - state: inhand-right-jumpskirt + - state: inhand-right-shirt + color: "#00661D" + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/casual.rsi + clothingVisuals: + jumpsuit: + - state: equipped-INNERCLOTHING-jumpskirt + - state: equipped-INNERCLOTHING-shirt + color: "#00661D" + - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtOldDress diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 42a0b7069d..ef5c1164cf 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -1347,6 +1347,36 @@ - state: equipped-INNERCLOTHING-shirt color: "#b30000" +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitCasualGreen + name: casual green jumpsuit + description: A loose worn green shirt with a grey pants, perfect for someone looking to relax. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/casual.rsi + layers: + - state: icon-jumpsuit + - state: icon-shirt + color: "#00661D" + - type: Item + inhandVisuals: + left: + - state: inhand-left-jumpsuit + - state: inhand-left-shirt + color: "#00661D" + right: + - state: inhand-right-jumpsuit + - state: inhand-right-shirt + color: "#00661D" + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/casual.rsi + clothingVisuals: + jumpsuit: + - state: equipped-INNERCLOTHING-jumpsuit + - state: equipped-INNERCLOTHING-shirt + color: "#00661D" + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitFamilyGuy