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.

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

Little things update #442

Merged
merged 16 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ ent-ADTCrateFunOktoberfestClothes = ящик одежды для Октобер

ent-ADTFunATV = ящик с квадроциклом
.desc = Ящик с квадроциклом и ключами от него внутри. Да, оно там поместилось.

ent-ADTCrateWedding = свадебный набор
.desc = Содержит набор костюмов, свадебных платьев и свадебных букетов.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ent-ADTClothingHandsRingPlazma = кольцо с плазмой
.desc = Очень элегантное кольцо только истинные ценители моды могут оценить ваше превосходное кольцо, с твердым ионизированным газа по центре. если вы зададите вопрос "Откуда достали твердый плазму", мы скажем - "Потому что". На кольце виднеется торговый марка производителя "brothers S&K - jewelry factory".
.suffix = { "" }
ent-ADTClothingHandsRingEmerald = кольцо с изумрудом
.desc = Золотая классика в мире колец аккуратный, модный и стильный идеальный подарок для любви всей вашей жизни. На кольце виднеется торговый марка производителя "brothers S&K - jewelry factory".
.suffix = { "" }
ent-ADTClothingHandsRingBlood = кольцо с кровавым алмазом
.desc = Кольцо из чистого золота, в центре которого находится красивый алмаз кроваво-красного оттенка. На кольце виднеется торговый марка производителя "brothers S&K - jewelry factory".
.suffix = { "" }
ent-ADTClothingHandsRingTurk = кольцо с туркенитом
.desc = Красивый кольцо ничем особенным не выделяется, но для своих цен они вполне приемлемы. На кольце виднеется торговый марка производителя "brothers S&K - jewelry factory".
.suffix = { "" }
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,24 @@ ent-ADTCapJumpskirtWarm = { ent-ADTCapJumpsuitWarm }
ent-ClothingUniformJumpskirtBlueshieldTurtleneck = юбка-водолазка офицера синего щита
.desc = Белая удобная водолазка с юбкой для Офицера Синего Щита с пришитыми золотыми погонами и ярким именным бейджиком. К сожалению, если вы её наденете, это не будет значить, что вам дадут отпуск.

ent-ADTClothingUniformWhiteShortWeddingDress = бело-золотое короткое свадебное платье
.desc = Белое платье с золотыми блестками. Для тех кто устал от платьев в пол!
ent-ADTClothingUniformShortDressBlackGold = черно-золотое короткое свадебное платье
.desc = Специально для принцессы!
ent-ADTClothingUniformBlackGhoticWeddingDress = чёрное готическое платье
.desc = Мортиша Аддамс ставит лайк. Лучше этого сексуального платья вы не найдете.
ent-ADTClothingUniformWhiteGhoticWeddingDress = белое готическое платье
.desc = Это платье так подчеркивает твою фигуру! Ты будешь самой сексуальной невестой.
ent-ADTClothingUniformLushRoseWeddingDress = пышное розовое платье
.desc = Специально для принцессы.
ent-ADTClothingUniformLushWhiteWeddingDress = пышное белое платье
.desc = Ты выглядишь так нежно... Как зефир!
ent-ADTClothingUniformRedCocktailDress = красное коктейльное платье
.desc = Девочка, это платье создано для вечеринки! Взорви танцпол!
ent-ADTClothingUniformBlackElegantDress = элегантное черное платье
.desc = Оно не слишком короткое? Мою попу не видно?
PyotrIgn marked this conversation as resolved.
Show resolved Hide resolved
ent-ADTClothingUniformOrangeBeachSuit = оранжевый пляжный костюм
.desc = Цвет настроения оранжевый. Для любителей апельсинов и хорошего загара.
ent-ADTClothingJumpskirtHopAlt = деловой костюм с юбкой главы персонала
.desc = Качетсвенно сделанная униформа для тех глав персонала, что могут себе такую позволить.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,22 @@ ent-ADTClothingUniformInvestigatorSuit = форма следователя Сл
ent-ADTClothingUniformNewMekka = униформа Новой Мекки
.desc = Эта униформа имеет очень долгую и кровавую историю...
.suffix = { "Новая Мекка" }

ent-ADTClothingUniformBlackWeddingSuit = чёрный мужской свадебный костюм
.desc = Чёрный костюм для знаменательного события.
ent-ADTClothingUniformBlueWeddingSuit = синий мужской свадебный костюм
.desc = Синий костюм для знаменательного события.
ent-ADTClothingUniformBrownWeddingSuit = коричневый мужской свадебный костюм
.desc = Коричневый костюм для знаменательного события.

ent-ADTClothingUniformBlackWeddingWomenSuit = женский свадебный костюм черный
.desc = Это женский костюм, для тех кому надоели платья. Выглядит сексуально.
ent-ADTClothingUniformWhiteWeddingWomenSuit = женский свадебный костюм белый
.desc = Это женский костюм, для тех кому надоели платья. Выглядит сексуально.
ent-ADTClothingUniformAiryWhiteSuit = белый воздушный костюм
.desc = Такой же, только белый. Не надевайте под белую рукашку черный лифик!
ent-ADTClothingUniformAiryBlackSuit = черный воздушный костюм
.desc = Готично, строго, сексуально. Для тех кто любит показывать свой красивый лифчик.

ent-ADTClothingJumpsuitHopAlt = деловой костюм главы персонала
.desc = Качетсвенно сделанная униформа для тех глав персонала, что могут себе такую позволить.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTBathBroom = банный веник
.desc = Веник из сушеных листьев, для тех, что ценят классическую баню. Поддать пару!
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ent-ADTObjectWhiteBouquet = белый букет
.desc = Букет из белых роз. Классика.
ent-ADTObjectRoseBouquet = розовый букет
.desc = Нежный букет из розовых цветов гибискуса. Специально для нее.
ent-ADTObjectYellowBouquet = желтый букет
.desc = Это букет из желтых пионов. Специально для ценителей пионов.
ent-ADTObjectBlackBouquet = чёрный букет
.desc = Эти розы точно не окрашены. Они такие были всегда.
ent-ADTObjectBouquetWithBeer = пивной букет
.desc = Будьте уникальным! Подарите букет который можно съесть, заодно опрокинув по бутылочке пивасика.
ent-ADTObjectLiliacBouquet = сиреневый букет
.desc = Маленький шедевр генетики - розы сорта "Флидефарбен Розен". Приобрели не только цвет, но и запах сирени
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ent-ADTRingBox = коробка с кольцами
.desc = Коробка, дороже чем твоя жизнь.
.suffix = { "" }
18 changes: 18 additions & 0 deletions Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,21 @@
cost: 3500
category: cargoproduct-category-name-fun
group: market

- type: cargoProduct
id: ADTFunCrateWedding
icon:
sprite: ADT/Objects/Specific/Service/white_bouquet.rsi
state: icon
product: ADTCrateWedding
category: cargoproduct-category-name-fun
cost: 1500

- type: cargoProduct
id: FunRingBox
icon:
sprite: ADT/Objects/Specific/Service/RingBox.rsi
state: box
product: ADTRingBox
category: cargoproduct-category-name-fun
cost: 8000
28 changes: 28 additions & 0 deletions Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
- type: entity
id: ADTCrateWedding
parent: CrateGenericSteel
name: wedding crate
description: Contains a set of wedding dresses and bouquets for the bride!
components:
- type: StorageFill
contents:
- id: ADTClothingUniformWhiteShortWeddingDress
- id: ADTClothingUniformShortDressBlackGold
- id: ADTClothingUniformBlackGhoticWeddingDress
- id: ADTClothingUniformWhiteGhoticWeddingDress
- id: ADTClothingUniformLushRoseWeddingDress
- id: ADTClothingUniformLushWhiteWeddingDress
- id: ADTClothingUniformBlackElegantDress
- id: ADTClothingUniformBlackWeddingSuit
- id: ADTClothingUniformBlueWeddingSuit
- id: ADTClothingUniformBrownWeddingSuit
- id: ADTClothingUniformBlackWeddingWomenSuit
- id: ADTClothingUniformAiryBlackSuit
- id: ADTClothingUniformAiryWhiteSuit
- id: ADTObjectWhiteBouquet
- id: ADTObjectRoseBouquet
- id: ADTObjectYellowBouquet
- id: ADTObjectBlackBouquet
- id: ADTObjectBouquetWithBeer
- id: ADTObjectLiliacBouquet

- type: entity
id: ADTCrateFunOktoberfestClothes
parent: CratePlastic
Expand Down
59 changes: 59 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Hands/rings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
- type: entity
parent: ClothingHandsBase
id: ADTClothingHandsRingBlood
name: blood ring
description: Good ring.
components:
- type: Sprite
sprite: ADT/Clothing/Hands/Rings/RingBlood.rsi
- type: Clothing
sprite: ADT/Clothing/Hands/RingBlood.rsi
- type: Item
size: Tiny
- type: StaticPrice
price: 1000

- type: entity
parent: ClothingHandsBase
id: ADTClothingHandsRingEmerald
name: emerald ring
description: Good ring.
components:
- type: Sprite
sprite: ADT/Clothing/Hands/Rings/RingEmerald.rsi
- type: Clothing
sprite: ADT/Clothing/Hands/Rings/RingEmerald.rsi
- type: Item
size: Tiny
- type: StaticPrice
price: 1000

- type: entity
parent: ClothingHandsBase
id: ADTClothingHandsRingPlazma
name: plazma ring
description: Good ring.
components:
- type: Sprite
sprite: ADT/Clothing/Hands/Rings/RingPlazma.rsi
- type: Clothing
sprite: ADT/Clothing/Hands/Rings/RingPlazma.rsi
- type: Item
size: Tiny
- type: StaticPrice
price: 1000

- type: entity
parent: ClothingHandsBase
id: ADTClothingHandsRingTurk
name: turk ring
description: Good ring.
components:
- type: Sprite
sprite: ADT/Clothing/Hands/Rings/RingTurk.rsi
- type: Clothing
sprite: ADT/Clothing/Hands/Rings/RingTurk.rsi
- type: Item
size: Tiny
- type: StaticPrice
price: 1000
78 changes: 78 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,84 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformBlackWeddingSuit
name: Black Wedding Suit
description: A black suit for a significant event.
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpsuit/black_wedding_suit_male.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/black_wedding_suit_male.rsi

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformBlueWeddingSuit
name: Blue Wedding suit
description: A blue suit for a significant event.
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpsuit/blue_wedding_suit_male.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/blue_wedding_suit_male.rsi

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformBrownWeddingSuit
name: Brown Wedding suit
description: A brown suit for a significant event.
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpsuit/brown_wedding_suit_male.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/brown_wedding_suit_male.rsi

#Luna
- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformWhiteWeddingWomenSuit
name: White wedding women suit
description: This is a women's suit. For those who are tired of dresses. Looks sexy
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpsuit/white_wedding_women_suit.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/white_wedding_women_suit.rsi

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformBlackWeddingWomenSuit
name: Black wedding women suit
description: This is a women's suit. For those who are tired of dresses. Looks sexy
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpsuit/black_wedding_women_suit.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/black_wedding_women_suit.rsi

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformAiryWhiteSuit
name: Airy White suit
description: The same, only white. Do not wear a black bra under a white sleeve!
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpsuit/airy_white_suit.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/airy_white_suit.rsi

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformAiryBlackSuit
name: Airy White suit
description: Gothic, strict, sexy. For those who like to show their beautiful bra.
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpsuit/airy_black_suit.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/airy_black_suit.rsi

#Альтернативная одежда для ГП
- type: entity
parent: ClothingUniformBase
Expand Down
99 changes: 99 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,105 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi

# Luna
- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformLushWhiteWeddingDress
name: Lush white wedding dress
description: You look so tender.. like a marshmallow!
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/lush_white_wedding_dress.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/lush_white_wedding_dress.rsi

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformLushRoseWeddingDress
name: Rose white wedding dress
description: Specially for a princess!
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/lush_rose_wedding_dress.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/lush_rose_wedding_dress.rsi

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformWhiteGhoticWeddingDress
name: White ghotic wedding dress
description: This dress really flatters your figure. YOu will be the sexiest bride
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/white_ghotic_dress.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/white_ghotic_dress.rsi

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformBlackGhoticWeddingDress
name: Black ghotic wedding dress
description: Morticia Addams likes. You will not find better than this sexy dress
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/black_ghotic_dress.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/black_ghotic_dress.rsi

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformWhiteShortWeddingDress
name: White short wedding dress
description: White dress with gold sequins. For those who are tired of floor length dresses!
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/white_short_wedding_dress.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/white_short_wedding_dress.rsi

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformShortDressBlackGold
name: Rose white wedding dress
description: Specially for a princess!
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformRedCocktailDress
name: Red Cocktail Dress
description: Girl, this dress is made for this party! Blow up the dance floor!
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/red_cocktail_dress.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/red_cocktail_dress.rsi

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformBlackElegantDress
name: Black Elegant Dress
description: Isn't it too short? Can't see my behind?
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/black_elegant_dress.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/black_elegant_dress.rsi

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformOrangeBeachSuit
name: Orange Beach Suit
description: The mood color is orange. For the fans of oranges and a good tan.
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/orange_beach_suit.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/orange_beach_suit.rsi

- type: entity
parent: ClothingUniformSkirtBase
Expand Down
Loading
Loading