From 9fe87bb291a8a615cfe5d3f69f777d9fa907bc01 Mon Sep 17 00:00:00 2001 From: pacable <77161122+pxc1984@users.noreply.github.com> Date: Sat, 7 Dec 2024 08:30:45 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BB=D1=8E=D1=88=D0=BA=D0=B8=20(#108)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fixes * upd --- .../_lust/entities/objects/fun/toys.ftl | 4 ++++ .../_Lust/Catalog/sponsor_uplink_catalog.yml | 11 +++++++++ .../_Lust/Entities/Objects/Fun/toys.yml | 22 +++++++++++++++++- .../_Lust/Objects/Fun/toys.rsi/meta.json | 6 +++++ .../Fun/toys.rsi/plushie-alice-simonova.png | Bin 0 -> 2428 bytes .../_Lust/Objects/Fun/toys.rsi/plushie-rx.png | Bin 0 -> 861 bytes 6 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_Lust/Objects/Fun/toys.rsi/plushie-alice-simonova.png create mode 100644 Resources/Textures/_Lust/Objects/Fun/toys.rsi/plushie-rx.png diff --git a/Resources/Locale/ru-RU/_prototypes/_lust/entities/objects/fun/toys.ftl b/Resources/Locale/ru-RU/_prototypes/_lust/entities/objects/fun/toys.ftl index 2717949bb5..9739287205 100644 --- a/Resources/Locale/ru-RU/_prototypes/_lust/entities/objects/fun/toys.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_lust/entities/objects/fun/toys.ftl @@ -32,3 +32,7 @@ ent-PlushieVaxel = Плюшевая Май Ваксель .desc = Неумеха-атмостех, в узких кругах известная, как "Курва-рататуй". Обожает курить возле канистр с тритием и плазмой. Была официально уволена из Синдиката за множественные провалы. Не подпускать к ТЭГу. ent-PlushiePinkers = Плюшевая Лола Пинкерс .desc = Странно, но при виде этой игрушки вам хочется дёрнуть её за хвостик... +ent-PlushieAliceSimonova = Плюшевая Алиса Симонова де Мори + .desc = Довольно мягкая и приятная игрушка офицера... На правой руке намертво приклеено позолоченное кольцо, а сама игрушка веет сладковатым запахом... Клубнички?... +ent-PlushieRx1984 = Плюшевый RX1984 + .desc = В помехах его экрана прослеживается число "1984"... diff --git a/Resources/Prototypes/_Lust/Catalog/sponsor_uplink_catalog.yml b/Resources/Prototypes/_Lust/Catalog/sponsor_uplink_catalog.yml index 7009beb502..8f08c80190 100644 --- a/Resources/Prototypes/_Lust/Catalog/sponsor_uplink_catalog.yml +++ b/Resources/Prototypes/_Lust/Catalog/sponsor_uplink_catalog.yml @@ -151,3 +151,14 @@ conditions: - !type:ListingLimitedStockCondition stock: 1 + +- type: listing + id: UplinkLustPlushieAliceSimonova + productEntity: PlushieAliceSimonova + cost: + Suntick: 4 + categories: + - SpecialThings + conditions: + - !type:ListingLimitedStockCondition + stock: 1 diff --git a/Resources/Prototypes/_Lust/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_Lust/Entities/Objects/Fun/toys.yml index f50ed24fb2..308e1a2b81 100644 --- a/Resources/Prototypes/_Lust/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/_Lust/Entities/Objects/Fun/toys.yml @@ -174,7 +174,7 @@ sprite: _Lust/Objects/Fun/toys.rsi state: kharsha - type: SpeakOnUse - pack: DobitchikPhrases + pack: KharshaPhrases - type: TTS voice: SironaRyan - type: UseDelay @@ -255,5 +255,25 @@ state: plushie_pinkers - type: SpeakOnUse pack: PinkersPhrases + - type: TTS + voice: Mana - type: UseDelay delay: 3 + +- type: entity + id: PlushieAliceSimonova + parent: BasePlushie + name: Plush Alice Simonova + components: + - type: Sprite + sprite: _Lust/Objects/Fun/toys.rsi + state: plushie-alice-simonova + +- type: entity + id: PlushieRx1984 + parent: BasePlushie + name: Plush RX1984 + components: + - type: Sprite + sprite: _Lust/Objects/Fun/toys.rsi + state: plushie-rx diff --git a/Resources/Textures/_Lust/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_Lust/Objects/Fun/toys.rsi/meta.json index 9980542e95..3f17d611a8 100644 --- a/Resources/Textures/_Lust/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/_Lust/Objects/Fun/toys.rsi/meta.json @@ -57,6 +57,12 @@ }, { "name": "plushie_pinkers" + }, + { + "name": "plushie-alice-simonova" + }, + { + "name": "plushie-rx" } ] } diff --git a/Resources/Textures/_Lust/Objects/Fun/toys.rsi/plushie-alice-simonova.png b/Resources/Textures/_Lust/Objects/Fun/toys.rsi/plushie-alice-simonova.png new file mode 100644 index 0000000000000000000000000000000000000000..d789b8403d08872c3e3c177138efb967bd78c995 GIT binary patch literal 2428 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 literal 0 HcmV?d00001