Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Нормально добавил водолазки в одеждомат и изменил цену #316

Merged
merged 4 commits into from
Aug 21, 2024
Merged

Нормально добавил водолазки в одеждомат и изменил цену #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a12509
Нормально добавил водолазки в одеждомат и изменил цену
Darkiich Aug 20, 2024
a444312
Merge branch 'master' into fix
KashRas2 Aug 20, 2024
292ccfa
увеличена цена
Darkiich Aug 21, 2024
957ce35
Merge branch 'fix' of https://github.com/Darki255/space_station_ADT i…
Darkiich Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_aquamarine.rsi
- type: StaticPrice
price: 5
price: 15

- type: entity
parent: ClothingUniformBase
Expand All @@ -57,7 +57,7 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_white.rsi
- type: StaticPrice
price: 5
price: 15

- type: entity
parent: ClothingUniformBase
Expand All @@ -70,7 +70,7 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_azure.rsi
- type: StaticPrice
price: 5
price: 15

- type: entity
parent: ClothingUniformBase
Expand All @@ -83,7 +83,7 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_yellow.rsi
- type: StaticPrice
price: 5
price: 15

- type: entity
parent: ClothingUniformBase
Expand All @@ -96,7 +96,7 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_green.rsi
- type: StaticPrice
price: 5
price: 15

- type: entity
parent: ClothingUniformBase
Expand All @@ -109,7 +109,7 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brown.rsi
- type: StaticPrice
price: 5
price: 15

- type: entity
parent: ClothingUniformBase
Expand All @@ -122,7 +122,7 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_red.rsi
- type: StaticPrice
price: 5
price: 15

- type: entity
parent: ClothingUniformBase
Expand All @@ -135,7 +135,7 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_orange.rsi
- type: StaticPrice
price: 5
price: 15

- type: entity
parent: ClothingUniformBase
Expand All @@ -148,7 +148,7 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_pink.rsi
- type: StaticPrice
price: 5
price: 15

- type: entity
parent: ClothingUniformBase
Expand All @@ -161,7 +161,7 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_grey.rsi
- type: StaticPrice
price: 5
price: 15

- type: entity
parent: ClothingUniformBase
Expand All @@ -174,7 +174,7 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blue.rsi
- type: StaticPrice
price: 5
price: 15

- type: entity
parent: ClothingUniformBase
Expand All @@ -187,7 +187,7 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_purple.rsi
- type: StaticPrice
price: 5
price: 15

- type: entity
parent: ClothingUniformBase
Expand All @@ -200,7 +200,7 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_black.rsi
- type: StaticPrice
price: 5
price: 15

- type: entity
parent: ClothingUniformBase
Expand All @@ -213,7 +213,7 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/turleneck_blacksleeveless.rsi
- type: StaticPrice
price: 5
price: 15

- type: entity
parent: ClothingUniformBase
Expand All @@ -226,7 +226,7 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/turleneck_whitesleeveless.rsi
- type: StaticPrice
price: 5
price: 15

- type: entity
parent: ClothingUniformBase
Expand All @@ -239,7 +239,7 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/turleneck_whiteblacksleeveless.rsi
- type: StaticPrice
price: 5
price: 15

- type: entity
parent: ClothingUniformBase
Expand All @@ -252,7 +252,7 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/newmekkauniform.rsi
- type: StaticPrice
price: 5
price: 15
- type: Armor
modifiers:
coefficients:
Expand Down
30 changes: 15 additions & 15 deletions Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -215,4 +215,4 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/turleneck_white_womensleeveless.rsi
- type: StaticPrice
price: 5
price: 15
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
15 changes: 7 additions & 8 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -175,4 +168,10 @@
ADTClothingUniformTurleneckWhiteSleeveless: 1
ADTClothingUniformTurleneckWhiteBlackSleeveless: 1
ADTClothingUniformTurleneckWhiteWomenSleeveless: 1
# ADT водолазки конец
# ADT водолазки конец
# DO NOT ADD MORE, USE UNIFORM DYING
contrabandInventory:
ClothingMaskNeckGaiter: 2
ClothingUniformJumpsuitTacticool: 1
ClothingUniformJumpskirtTacticool: 1
# DO NOT ADD MORE, USE UNIFORM DYING
Loading