Skip to content

Плюшка Маси Армстронг #187

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.

Sign up for GitHub

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

Open
Alexnov33X wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Плюшка Маси Армстронг #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b655df9
test
Alexnov33X Jan 16, 2026
d52d4a0
Update toys.yml
Alexnov33X Jan 16, 2026
9a53a6c
Update meta.json
Alexnov33X Jan 21, 2026
cf6d7fa
Update meta.json
Alexnov33X Jan 23, 2026
3c2f304
Merge remote-tracking branch 'upstream/master' into Alexnov33/MasyaPlush
Alexnov33X Mar 3, 2026
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
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/_prototypes/_fish/entities/objects/fun/toys.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@ ent-PlushieIsaacLow = Плюшевый химик Исаак Лоу
.desc = Пушистый ниан, знающий химию как старую подругу. Он всегда может подсказать что делать, если вы запутались в рецептах. Даже в виде маленькой, плюшевой игрушки. На игрушке висит этикетка: «что много - то не есть хорошо »

plushie-mikhail-beerbeard-oboronovich-on-use = Пиво!!!

ent-PlushieMasya = Плюшевая Мася Армстронг
.desc = Плюшевая Мася Армстронг добрая фелинидка, которая любит внимание, ласку и тёплые слова, — маленькая, мягкая и мечтательная, она ценит справедливость, заботится о друзьях и создана для нежных объятий.

12 changes: 12 additions & 0 deletions Resources/Prototypes/_Fish/Catalog/sponsor_uplink_catalog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

17 changes: 16 additions & 1 deletion Resources/Prototypes/_Fish/Entities/Objects/Fun/toys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,4 +163,19 @@
path: /Audio/Voice/Moth/moth_chitter.ogg
- type: EmitSoundOnActivate
sound:
path: /Audio/Voice/Moth/moth_chitter.ogg
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

Binary file added Resources/Textures/_Fish/Objects/Fun/toys.rsi/centcom_masa.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion Resources/Textures/_Fish/Objects/Fun/toys.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
},
{
"name": "isaac"
}
},
{
"name": "centcom_masa"
}
]
}
Loading