Skip to content

Commit

Permalink
Solution
Browse files Browse the repository at this point in the history
  • Loading branch information
ALEXPAN-DEV committed Dec 30, 2024
1 parent f81ca0d commit a801193
Show file tree
Hide file tree
Showing 22 changed files with 435 additions and 69 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,25 @@ ent-PlushieAliceSimonova = Плюшевая Алиса Симонова де М
.desc = Довольно мягкая и приятная игрушка офицера... На правой руке намертво приклеено позолоченное кольцо, а сама игрушка веет сладковатым запахом... Клубнички?...
ent-PlushieRx1984 = Плюшевый RX1984
.desc = В помехах его экрана прослеживается число "1984"...
ent-PlushieKlaraIsaeva = Плюшевая Клара Исаева
.desc = Главный потребитель алкоголя. От неё пахнет пивом.
ent-PlushieSaiHaks = Плюшевый Сай Хакс
.desc = Квартирмейстер в костюме карпа и с протокинетом. Ткань очень мягкая и приятная на ощупь.
ent-PlushieCosmicStarDust = Плюшевая Космическая Пыль Звезд
.desc = Очень ответственная ниан, заделывает все дыры в станции, но даже с ней происходят ЧП.
ent-PlushieRatmirSaphirov = Плюшевый Ратмир Сапфиров
.desc = Мягкая игрушка арканы в одежде робототехника, на вид уставший. От него исходит запах моторного масла и арбуза.
ent-PlushieMikeSchmidt = Плюшевый Майк Шмидт
.desc = Миниатюрная версия профессионального бармена со стаканом мохито. Игрушка имеет потрепанный внешний вид. Левая рука не плюшевая, а металлическая.
ent-PlushieBormanSerkiroboy = Плюшевый Борман Секиробой
.desc = Универсальный дворф из технических помещений, готовый протянуть руку помощи каждому, если его не донимать. Ходячее олицетворение неоднозначного нейтралитета.
ent-PlushieBlobaBlabo = Плюшевая Блоба Блабо
.desc = Cамый худший врач в Корпорации Qillu.
ent-PlushieDragonaft = Плюшевый I-102 "Драгонавт"
.desc = Настоящий носитель Пламени Свободы! Подарит 850 Градусную демократию в любой конец известной галактики, во имя Свободы!
ent-PlushieIgorVolkov = Плюшевый Игорь Волков
.desc = Плюшевая игрушка с суровым взглядом, который скрывает шлем. У неë снимается рубашка, на спине видна татуировка в виде скорпиона с цифрой 13 в центре. Пахнет гарью и тротилом.
ent-PlushieAlisaSaygak = Плюшевая Алиса Сайгак
.desc = Бюрократ медицинской наклонности. Пахнет химикатами.
ent-PlushieKuromiOlink = Плюшевая Куро'ми Олинк
.desc = Мягкая плюшевая вульпа-репортёр, с крайне оптимистичным настроем!
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
borman-serkiroboy-1 = Айо!
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/_strings/_lust/datasets/dragonaft.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
dragonaft-1 = Во имя Свободы
dragonaft-2 = Во имя Демократии!
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
igor-volkov-1 = Здравия желаю, товарищ!
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
klara-isaeva-1 = Пиво!!
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
mike-schmidt-1 = Йо
mike-schmidt-2 = Во-во
mike-schmidt-3 = Это такой конец...
111 changes: 111 additions & 0 deletions Resources/Prototypes/_Lust/Catalog/sponsor_uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,114 @@
conditions:
- !type:ListingLimitedStockCondition
stock: 1

- type: listing
id: UplinkLustPlushieKlaraIsaeva
productEntity: PlushieKlaraIsaeva
cost:
Suntick: 4
categories:
- SpecialThings
conditions:
- !type:ListingLimitedStockCondition
stock: 1

- type: listing
id: UplinkLustPlushieSaiHaks
productEntity: PlushieSaiHaks
cost:
Suntick: 4
categories:
- SpecialThings
conditions:
- !type:ListingLimitedStockCondition
stock: 1

- type: listing
id: UplinkPlushieCosmicStarDust
productEntity: PlushieCosmicStarDust
cost:
Suntick: 4
categories:
- SpecialThings
conditions:
- !type:ListingLimitedStockCondition
stock: 1

- type: listing
id: UplinkPlushieRatmirSaphirov
productEntity: PlushieRatmirSaphirov
cost:
Suntick: 4
categories:
- SpecialThings
conditions:
- !type:ListingLimitedStockCondition
stock: 1

- type: listing
id: UplinkPlushieMikeSchmidt
productEntity: PlushieMikeSchmidt
cost:
Suntick: 4
categories:
- SpecialThings
conditions:
- !type:ListingLimitedStockCondition
stock: 1

- type: listing
id: UplinkPlushieBormanSerkiroboy
productEntity: PlushieBormanSerkiroboy
cost:
Suntick: 4
categories:
- SpecialThings
conditions:
- !type:ListingLimitedStockCondition
stock: 1

- type: listing
id: UplinkPlushieBlobaBlabo
productEntity: PlushieBlobaBlabo
cost:
Suntick: 4
categories:
- SpecialThings
conditions:
- !type:ListingLimitedStockCondition
stock: 1

- type: listing
id: UplinkPlushieIgorVolkov
productEntity: PlushieIgorVolkov
cost:
Suntick: 4
categories:
- SpecialThings
conditions:
- !type:ListingLimitedStockCondition
stock: 1

- type: listing
id: UplinkPlushieAlisaSaygak
productEntity: PlushieAlisaSaygak
cost:
Suntick: 4
categories:
- SpecialThings
conditions:
- !type:ListingLimitedStockCondition
stock: 1

- type: listing
id: UplinkPlushieKuromiOlink
productEntity: PlushieKuromiOlink
cost:
Suntick: 4
categories:
- SpecialThings
conditions:
- !type:ListingLimitedStockCondition
stock: 1

191 changes: 190 additions & 1 deletion Resources/Prototypes/_Lust/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: plushie-alice-simonova
state: alisa_simonova_de_mori

- type: entity
id: PlushieRx1984
Expand All @@ -284,3 +284,192 @@
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: plushie-rx

- type: entity
id: PlushieKlaraIsaeva
parent: BasePlushie
name: Plush Klara Isaeva
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: klara_isaeva
- type: TriggerOnActivate
- type: SpeakOnTrigger
pack: KlaraIsaevaPhrases
- type: TTS
voice: KarinaPetrovaTB
- type: UseDelay
delay: 5

- type: localizedDataset
id: KlaraIsaevaPhrases
values:
prefix: klara-isaeva-
count: 1

- type: entity
id: PlushieSaiHaks
parent: BasePlushie
name: Plush Sai Haks
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: sai_haks2
- type: UseDelay
delay: 5

- type: entity
id: PlushieCosmicStarDust
parent: BasePlushie
name: Cosmic Star Dust
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: cosmic_star_dust
- type: EmitSoundOnUse
sound:
path: /Audio/Voice/Moth/moth_scream.ogg
params:
volume: 5
- type: UseDelay
delay: 5

- type: entity
id: PlushieRatmirSaphirov
parent: BasePlushie
name: Plush Ratmir Saphirov
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: ratmir_saphirov
- type: UseDelay
delay: 5

- type: entity
id: PlushieMikeSchmidt
parent: BasePlushie
name: Plush Mike Schmidt
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: mike_schmidt
- type: TriggerOnActivate
- type: SpeakOnTrigger
pack: MikeSchmidtPhrases
- type: TTS
voice: Warcraft3Artas2
- type: UseDelay
delay: 5

- type: localizedDataset
id: MikeSchmidtPhrases
values:
prefix: mike-schmidt-
count: 3

- type: entity
id: PlushieBormanSerkiroboy
parent: BasePlushie
name: Plushie Borman Serkiroboy
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: borman_sekiroboy
- type: TriggerOnActivate
- type: SpeakOnTrigger
pack: BormanSerkiroBoyPhrases
- type: TTS
voice: Warcraft3Artas2
- type: UseDelay
delay: 5

- type: localizedDataset
id: BormanSerkiroboyPhrases
values:
prefix:
count: 1

- type: entity
id: PlushieBlobaBlabo
parent: BasePlushie
name: Bloba Blabo
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: bloba_blabo
- type: EmitSoundOnUse
sound:
path: /Audio/Voice/Slime/slime_squish.ogg
params:
volume: 5
- type: UseDelay
delay: 5

- type: entity
id: PlushieDragonaft
parent: BasePlushie
name: Plushie Dragonaft
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: dragonaft
- type: TriggerOnActivate
- type: SpeakOnTrigger
pack: DragonaftPhrases
- type: TTS
voice: Crysis2Operator3v1
- type: UseDelay
delay: 5

- type: localizedDataset
id: DragonaftPhrases
values:
prefix: dragonaft-
count: 2

- type: entity
id: PlushieIgorVolkov
parent: BasePlushie
name: Igor Volkov
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: igor_volkov
- type: TriggerOnActivate
- type: SpeakOnTrigger
pack: IgorVolkovPhrases
- type: TTS
voice: TF2Soldier
- type: UseDelay
delay: 5

- type: localizedDataset
id: IgorVolkovPhrases
values:
prefix: igor-volkov-
count: 1

- type: entity
id: PlushieAlisaSaygak
parent: BasePlushie
name: Alisa Saygak
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: alisa_saygak
- type: TriggerOnActivate
- type: UseDelay
delay: 5

- type: entity
id: PlushieKuromiOlink
parent: BasePlushie
name: Kuromi Olink
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: kuromi_olink
- type: TriggerOnActivate
- type: UseDelay
delay: 5

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit a801193

Please sign in to comment.