Skip to content

Commit

Permalink
Solution
Browse files Browse the repository at this point in the history
  • Loading branch information
ALEXPAN-DEV committed Jan 1, 2025
1 parent 4c44b20 commit 1b0a13f
Show file tree
Hide file tree
Showing 15 changed files with 255 additions and 4 deletions.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,17 @@ ent-PlushieAlisaSaygak = Плюшевая Алиса Сайгак
.desc = Бюрократ медицинской наклонности. Пахнет химикатами.
ent-PlushieKuromiOlink = Плюшевая Куро'ми Олинк
.desc = Мягкая плюшевая вульпа-репортёр, с крайне оптимистичным настроем!
ent-PlushieSonyaKarpova = Плюшевая Соня Карпова
.desc = Это вульпа горничная. Она любит, когда ее гладит хозяин, шепчут на ушко и тискают.
ent-PlushieIvanBykov = Плюшевый Иван Быков
.desc = Плюшевая игрушка известного грейтайда. Делайте с ней, что хотите. На обратной стороне игрушки есть этикетка, с надписью "Made by Syndicate".
ent-PlushieMichaelScott = Плюшевый Майкл Скотт
.desc = Некогда главный душнила в Корпорации Qillu. Теперь плюшевая игрушка лучшего работника месяца! На бирке написано "Сшито из плащей уволенных гсб".
ent-PlushieStrickland = Плюшевый Щиткур Стрикленд
.desc = Карманный Стрикленд в форме офицера "Синего щита". Он будет напоминать вам о самых "светлых" воспоминаниях, связанных со встречей с доблестными сотрудниками Брига и Командным составом!
ent-PlushieCarolinaKalinina = Плюшевая Каролина Калинина
.desc = Дешевого вида плюшка, пахнущая напалмом и плазмой. На этикетке виднеется надпись: "Чрезвычайно взрывоопасно!".
ent-PlushieAlexanderTarando = Плюшевый Александр Тарандо
.desc = Плюшевая версия известного военного преступника, человека продавшего свободу. Пахнет сигарами и алкоголем.
ent-PlushieChars = Плюшевый Шарс.
.desc = Если вы будете бить его об стенку, вам захочется его обнять и пожалеть, прямо как Грей-Шарса. Почему он голый?
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/_strings/_lust/datasets/chars.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chars-1 = Хей! Не надо!
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/_strings/_lust/datasets/ivan-bykov.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ivan-bykov-1 = Ненавижу, блин, Щиткуров
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
michael-scott-1 = Ахуй
michael-scott-2 = ЦК звонили, сказали вы - уволены
michael-scott-3 = Расстрелять Капитана по 202
76 changes: 76 additions & 0 deletions Resources/Prototypes/_Lust/Catalog/sponsor_uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -284,3 +284,79 @@
- !type:ListingLimitedStockCondition
stock: 1

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

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

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

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

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

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

- type: listing
id: UplinkPlushieChars
productEntity: PlushieChars
cost:
Suntick: 4
categories:
- SpecialThings
conditions:
- !type:ListingLimitedStockCondition
stock: 1
142 changes: 138 additions & 4 deletions Resources/Prototypes/_Lust/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -314,9 +314,14 @@
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: sai_haks2
state: sai_haks1
- type: EmitSoundOnUse
sound:
path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg
params:
volume: 100
- type: UseDelay
delay: 5
delay: 10

- type: entity
id: PlushieCosmicStarDust
Expand All @@ -330,7 +335,7 @@
sound:
path: /Audio/Voice/Moth/moth_scream.ogg
params:
volume: 5
volume: 100
- type: UseDelay
delay: 5

Expand Down Expand Up @@ -401,7 +406,7 @@
sound:
path: /Audio/Voice/Slime/slime_squish.ogg
params:
volume: 5
volume: 100
- type: UseDelay
delay: 5

Expand Down Expand Up @@ -473,3 +478,132 @@
- type: UseDelay
delay: 5

- type: entity
id: PlushieSonyaKarpova
parent: BasePlushie
name: Sonya Karpova
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: sonya_karpova
- type: EmitSoundOnUse
sound:
path: /Audio/_Sunrise/Voice/Vulpkanin/dog_growl3.ogg
params:
volume: 100
- type: UseDelay
delay: 5

- type: entity
id: PlushieIvanBykov
parent: BasePlushie
name: Ivan Bykov
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: ivan_bykov
- type: TriggerOnActivate
- type: SpeakOnTrigger
pack: IvanBykovPhrases
- type: TTS
voice: Horner
- type: UseDelay
delay: 5

- type: localizedDataset
id: IvanBykovPhrases
values:
prefix: ivan-bykov-
count: 1

- type: entity
id: PlushieMichaelScott
parent: BasePlushie
name: Michael Scott
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: michael_scott
- type: TriggerOnActivate
- type: SpeakOnTrigger
pack: MichaelScottPhrases
- type: TTS
voice: Jackie
- type: UseDelay
delay: 5

- type: localizedDataset
id: MichaelScottPhrases
values:
prefix: michael-scott-
count: 3

- type: entity
id: PlushieStrickland
parent: BasePlushie
name: Strickland
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: strickland
- type: EmitSoundOnUse
sound:
path: /Audio/Voice/Moth/moth_squeak.ogg
params:
volume: 100
- type: UseDelay
delay: 5

- type: entity
id: PlushieCarolinaKalinina
parent: BasePlushie
name: Carolina Kalinina
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: carolina_kalinina
- type: EmitSoundOnUse
sound:
path: /Audio/Effects/explosionfar.ogg
params:
volume: 100
- type: UseDelay
delay: 60

- type: entity
id: PlushieAlexanderTarando
parent: BasePlushie
name: Alexander Tarando
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: alexander_tarando
- type: EmitSoundOnUse
sound:
path: /Audio/_Lust/Plushie/kept_you_waiting_huh.ogg"
params:
volume: 100
- type: UseDelay
delay: 15

- type: entity
id: PlushieChars
parent: BasePlushie
name: Chars
components:
- type: Sprite
sprite: _Lust/Objects/Fun/toys.rsi
state: plushie_chars
- type: TriggerOnActivate
- type: SpeakOnTrigger
pack: CharsPhrases
- type: TTS
voice: VictorRookwood
- type: UseDelay
delay: 5

- type: localizedDataset
id: CharsPhrases
values:
prefix: Chars-
count: 1
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.
21 changes: 21 additions & 0 deletions Resources/Textures/_Lust/Objects/Fun/toys.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,27 @@
},
{
"name": "charlie_fleur"
},
{
"name": "sonya_karpova"
},
{
"name": "ivan_bykov"
},
{
"name": "michael_scott"
},
{
"name": "strickland"
},
{
"name": "carolina_kalinina"
},
{
"name": "alexander_tarando"
},
{
"name": "plushie_chars"
}
]
}
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.

0 comments on commit 1b0a13f

Please sign in to comment.