collar-and-leash-one

[dng-cher]

Краткое описание

Добавлены... Господи, упаси,.. ошейники... и.. поводки. Я этого не хотел, меня заставили.. Так же есть цветные их вариации и пет-о-мат с ними
Кайтен, не мерджи до тех пор, пока мы не перейдём на новый движок.

Ссылка на багрепорт/Предложение

https://discord.com/channels/837289702369263676/1522686214065619074

Медиа (Видео/Скриншоты)

TODO

• Локализация
• Ещё больше вариаций
• Картинки сюда
• Фиксы багов

Требования к картам

Не добавляйте эти штуки на станции. Прошу

Changelog

🆑 dng-cher

• add: Ошейники и поводки, а так же торгомат с ними
• remove: -
• tweak: -
• fix: -

[github-actions]

RSI Diff Bot; head commit 54f9e66 merging into 442805b
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_Fish/Clothing/Neck/Misc/collar.rsi

State	Old	New	Status
equipped-NECK			Added
icon			Added

Resources/Textures/_Fish/Objects/Fun/leash.rsi

State	Old	New	Status
icon			Added
inhand-left			Added
inhand-right			Added
leash-icon			Added
leash			Added

Resources/Textures/_Fish/Objects/Fun/leash_line.rsi

State	Old	New	Status
line			Added

Resources/Textures/_Fish/Structures/Machines/petmate.rsi

State	Old	New	Status
broken			Added
deny-unshaded			Added
normal-unshaded			Added
off			Added
panel			Added

Edit: diff updated after 54f9e66

[github-actions]

Этот PR содержит конфликты, пожалуйста, разрешите их, прежде чем мы сможем его оценить.

[coderabbitai]

Warning

Review limit reached

Next included review available in 59 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used the included review currently available.

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

Learn how review limits work.

Review configuration:

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Advanced

Run ID: e5383373-48f7-4997-b73f-bd899eb27707

📥 Commits

Reviewing files that changed from the base of the PR and between 442805b and 54f9e66.

⛔ Files ignored due to path filters (13)

• Resources/Textures/_Fish/Clothing/Neck/Misc/collar.rsi/equipped-NECK.png is excluded by !**/*.png
• Resources/Textures/_Fish/Clothing/Neck/Misc/collar.rsi/icon.png is excluded by !**/*.png
• Resources/Textures/_Fish/Objects/Fun/leash.rsi/icon.png is excluded by !**/*.png
• Resources/Textures/_Fish/Objects/Fun/leash.rsi/inhand-left.png is excluded by !**/*.png
• Resources/Textures/_Fish/Objects/Fun/leash.rsi/inhand-right.png is excluded by !**/*.png
• Resources/Textures/_Fish/Objects/Fun/leash.rsi/leash-icon.png is excluded by !**/*.png
• Resources/Textures/_Fish/Objects/Fun/leash.rsi/leash.png is excluded by !**/*.png
• Resources/Textures/_Fish/Objects/Fun/leash_line.rsi/line.png is excluded by !**/*.png
• Resources/Textures/_Fish/Structures/Machines/petmate.rsi/broken.png is excluded by !**/*.png
• Resources/Textures/_Fish/Structures/Machines/petmate.rsi/deny-unshaded.png is excluded by !**/*.png
• Resources/Textures/_Fish/Structures/Machines/petmate.rsi/normal-unshaded.png is excluded by !**/*.png
• Resources/Textures/_Fish/Structures/Machines/petmate.rsi/off.png is excluded by !**/*.png
• Resources/Textures/_Fish/Structures/Machines/petmate.rsi/panel.png is excluded by !**/*.png

📒 Files selected for processing (21)

• Content.Server/_Fish/Leash/Components/LeashComponent.cs
• Content.Server/_Fish/Leash/Systems/LeashSystem.cs
• Content.Shared/_Fish/Leash/CollarEvents.cs
• Content.Shared/_Fish/Leash/Components/CollarComponent.cs
• Content.Shared/_Fish/Leash/Components/CollarWearerComponent.cs
• Content.Shared/_Fish/Leash/Components/LeashHolderComponent.cs
• Content.Shared/_Fish/Leash/Systems/SharedCollarSystem.cs
• MSBuild/Content.props
• Resources/Locale/ru-RU/_prototypes/_fish/entities/fun/alerts/leash.ftl
• Resources/Locale/ru-RU/_prototypes/_fish/entities/fun/collars.ftl
• Resources/Locale/ru-RU/_prototypes/_fish/entities/fun/leash.ftl
• Resources/Locale/ru-RU/_prototypes/_fish/entities/structures/machines/vending_machines.ftl
• Resources/Prototypes/_Fish/Alerts/alerts.yml
• Resources/Prototypes/_Fish/Catalog/VendingMachines/petomat_catalog.yml
• Resources/Prototypes/_Fish/Entities/Clothing/Neck/collars.yml
• Resources/Prototypes/_Fish/Entities/Objects/Fun/leash.yml
• Resources/Prototypes/_Fish/Entities/Structures/Machines/vending_machines.yml
• Resources/Textures/_Fish/Clothing/Neck/Misc/collar.rsi/meta.json
• Resources/Textures/_Fish/Objects/Fun/leash.rsi/meta.json
• Resources/Textures/_Fish/Objects/Fun/leash_line.rsi/meta.json
• Resources/Textures/_Fish/Structures/Machines/petmate.rsi/meta.json

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}