diff --git a/Resources/Locale/ru-RU/_prototypes/_fish/entities/objects/fun/toys.ftl b/Resources/Locale/ru-RU/_prototypes/_fish/entities/objects/fun/toys.ftl index 8187673e7a1..3e5d0f394ff 100644 --- a/Resources/Locale/ru-RU/_prototypes/_fish/entities/objects/fun/toys.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_fish/entities/objects/fun/toys.ftl @@ -14,3 +14,7 @@ ent-PlushieIsaacLow = Плюшевый химик Исаак Лоу .desc = Пушистый ниан, знающий химию как старую подругу. Он всегда может подсказать что делать, если вы запутались в рецептах. Даже в виде маленькой, плюшевой игрушки. На игрушке висит этикетка: «что много - то не есть хорошо » plushie-mikhail-beerbeard-oboronovich-on-use = Пиво!!! + +ent-PlushieMasya = Плюшевая Мася Армстронг + .desc = Плюшевая Мася Армстронг добрая фелинидка, которая любит внимание, ласку и тёплые слова, — маленькая, мягкая и мечтательная, она ценит справедливость, заботится о друзьях и создана для нежных объятий. + diff --git a/Resources/Prototypes/_Fish/Catalog/sponsor_uplink_catalog.yml b/Resources/Prototypes/_Fish/Catalog/sponsor_uplink_catalog.yml index fdde3c175ed..9ebb0d9edb5 100644 --- a/Resources/Prototypes/_Fish/Catalog/sponsor_uplink_catalog.yml +++ b/Resources/Prototypes/_Fish/Catalog/sponsor_uplink_catalog.yml @@ -132,3 +132,15 @@ conditions: - !type:ListingLimitedStockCondition stock: 1 + +- type: listing + id: UplinkFishPlushieMasya + productEntity: PlushieMasya + cost: + Suntick: 4 + categories: + - SpecialThings + conditions: + - !type:ListingLimitedStockCondition + stock: 1 + diff --git a/Resources/Prototypes/_Fish/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_Fish/Entities/Objects/Fun/toys.yml index b132edf2de8..7a59ba98645 100644 --- a/Resources/Prototypes/_Fish/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/_Fish/Entities/Objects/Fun/toys.yml @@ -163,4 +163,19 @@ path: /Audio/Voice/Moth/moth_chitter.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Voice/Moth/moth_chitter.ogg \ No newline at end of file + path: /Audio/Voice/Moth/moth_chitter.ogg + +- type: entity + parent: BasePlushie + id: PlushieMasya + name: Plushie Masya Armstrong + components: + - type: Sprite + sprite: _Fish/Objects/Fun/toys.rsi + state: centcom_masa + - type: UseDelay + delay: 4 + - type: EmitSoundOnUse + sound: + path: /Audio/_Sunrise/Voice/Felinid/cat_meow2.ogg + diff --git a/Resources/Textures/_Fish/Objects/Fun/toys.rsi/centcom_masa.png b/Resources/Textures/_Fish/Objects/Fun/toys.rsi/centcom_masa.png new file mode 100644 index 00000000000..b80d9d033ff Binary files /dev/null and b/Resources/Textures/_Fish/Objects/Fun/toys.rsi/centcom_masa.png differ diff --git a/Resources/Textures/_Fish/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_Fish/Objects/Fun/toys.rsi/meta.json index 4955a1dc41c..8179cbd7797 100644 --- a/Resources/Textures/_Fish/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/_Fish/Objects/Fun/toys.rsi/meta.json @@ -43,6 +43,9 @@ }, { "name": "isaac" - } + }, + { + "name": "centcom_masa" + } ] }