From 1a12509efbbcdf4e310d60d8839dddb5f5d99cfd Mon Sep 17 00:00:00 2001 From: Darki255 Date: Tue, 20 Aug 2024 14:42:16 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=9D=D0=BE=D1=80=D0=BC=D0=B0=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B2=D0=BE=D0=B4=D0=BE=D0=BB=D0=B0=D0=B7=D0=BA=D0=B8=20=D0=B2?= =?UTF-8?q?=20=D0=BE=D0=B4=D0=B5=D0=B6=D0=B4=D0=BE=D0=BC=D0=B0=D1=82=20?= =?UTF-8?q?=D0=B8=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20=D1=86?= =?UTF-8?q?=D0=B5=D0=BD=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Clothing/Uniforms/Jumpsuits.yml | 34 +++++++++---------- .../Entities/Clothing/Uniforms/jumpskirts.yml | 30 ++++++++-------- .../Inventories/clothesmate.yml | 15 ++++---- 3 files changed, 39 insertions(+), 40 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml index c56bd182bb6..c064ae37502 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml @@ -44,7 +44,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -57,7 +57,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -70,7 +70,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -83,7 +83,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -96,7 +96,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -109,7 +109,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -122,7 +122,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -135,7 +135,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -148,7 +148,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -161,7 +161,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -174,7 +174,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -187,7 +187,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -200,7 +200,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -213,7 +213,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/turleneck_blacksleeveless.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -226,7 +226,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/turleneck_whitesleeveless.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -239,7 +239,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/turleneck_whiteblacksleeveless.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -252,7 +252,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/newmekkauniform.rsi - type: StaticPrice - price: 5 + price: 15 - type: Armor modifiers: coefficients: diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml index 645c7f913af..cbaf798bc8b 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml @@ -33,7 +33,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -46,7 +46,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -59,7 +59,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -72,7 +72,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -85,7 +85,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -98,7 +98,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -111,7 +111,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -124,7 +124,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -137,7 +137,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -150,7 +150,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -163,7 +163,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -176,7 +176,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -189,7 +189,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -202,7 +202,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turleneck_black_womensleeveless.rsi - type: StaticPrice - price: 5 + price: 15 - type: entity parent: ClothingUniformBase @@ -215,4 +215,4 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turleneck_white_womensleeveless.rsi - type: StaticPrice - price: 5 \ No newline at end of file + price: 15 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 447a816ef8a..b6c35079d9c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -133,13 +133,6 @@ ClothingHandsGlovesColorOrange: 2 ClothingHandsGlovesColorPurple: 2 ClothingEyesGlassesCheapSunglasses: 3 - # DO NOT ADD MORE, USE UNIFORM DYING - contrabandInventory: - ClothingMaskNeckGaiter: 2 - ClothingUniformJumpsuitTacticool: 1 - ClothingUniformJumpskirtTacticool: 1 - # DO NOT ADD MORE, USE UNIFORM DYING - # ADT водолазки начало ADTClothingUniformTurtleneckBlack: 1 ADTClothingUniformTurtleneckBlackWomen: 1 @@ -175,4 +168,10 @@ ADTClothingUniformTurleneckWhiteSleeveless: 1 ADTClothingUniformTurleneckWhiteBlackSleeveless: 1 ADTClothingUniformTurleneckWhiteWomenSleeveless: 1 -# ADT водолазки конец \ No newline at end of file +# ADT водолазки конец +# DO NOT ADD MORE, USE UNIFORM DYING + contrabandInventory: + ClothingMaskNeckGaiter: 2 + ClothingUniformJumpsuitTacticool: 1 + ClothingUniformJumpskirtTacticool: 1 +# DO NOT ADD MORE, USE UNIFORM DYING \ No newline at end of file From 292ccfa2ed32d81c53c5a0baba58010653bd00da Mon Sep 17 00:00:00 2001 From: Darki255 Date: Wed, 21 Aug 2024 18:41:53 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D1=83=D0=B2=D0=B5=D0=BB=D0=B8=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D1=86=D0=B5=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Catalog/Cargo/cargo_vending.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index ab8584f0b51..e99b37ba40d 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: 3000 #ADT_Tweak + cost: 3050 #ADT_Tweak category: cargoproduct-category-name-service group: market