Skip to content
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.

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

[Feature] Система передачи из рук в руки #29

Merged
merged 18 commits into from
Nov 10, 2024

Conversation

AwareFoxy
Copy link
Collaborator

@AwareFoxy AwareFoxy commented Nov 9, 2024

Описание PR

Порт системы передачи из рук-в-руки
@Spatison ❤️ спасибо тебе за это

Почему / Баланс

Технические детали

Как оно работает:

Челик с предметом в руках тыкает на F, затем тыкает на того кому он хочет передать предмет, высвечивается поп ап и у чела который берёт предмет появляется справа алёрт, он на него тыкает и берёт предмет! БИНГО!!!!

Медиа

2024-11-10-03-01-41.1.mp4

Требования

Критические изменения

Список изменений

🆑

  • add: Добавлена система передач из рук в руки!

* up 1

* refactor

* Update alerts.yml

* fix popups

* Update SharedOfferItemSystem.cs

---------

Co-authored-by: Zack Backmen <[email protected]>
Copy link

github-actions bot commented Nov 9, 2024

RSI Diff Bot; head commit 122bc29 merging into bd06ed9
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi

State Old New Status
offer_item Added

Resources/Textures/_CorvaxNext/Misc/give_item.rsi

State Old New Status
give_item Added

Edit: diff updated after 122bc29

Copy link

@trest100 trest100 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

@Spatison
Copy link

Так система не с бекмена:
Simple-Station/Einstein-Engines#476
Мой первый ПР в сосаку 😊

@trest100
Copy link

Так система не с бекмена: Simple-Station/Einstein-Engines#476 Мой первый ПР в сосаку 😊

братишка привет!!!

Copy link
Collaborator

@Tornado-Technology Tornado-Technology left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Не без недочетов, но сделано качественно. У меня нет времени на запуск кода ради проверки работоспособности, но с технической составляющей сделано неплохо

FireNameFN
FireNameFN previously approved these changes Nov 10, 2024
Resources/Locale/ru-RU/alerts/alerts.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/alerts/alerts.ftl Outdated Show resolved Hide resolved
Copy link
Collaborator

@Vonsant Vonsant left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Жду правок.

Content.Client/Options/UI/Tabs/MiscTab.xaml Outdated Show resolved Hide resolved
Content.Client/Options/UI/Tabs/MiscTab.xaml.cs Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/alerts/alerts.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl Outdated Show resolved Hide resolved
Resources/keybinds.yml Outdated Show resolved Hide resolved
@AwareFoxy
Copy link
Collaborator Author

Потом займусь.

@AwareFoxy AwareFoxy closed this Nov 10, 2024
@AwareFoxy AwareFoxy reopened this Nov 10, 2024
Copy link
Collaborator Author

@AwareFoxy AwareFoxy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.

Content.Client/Options/UI/Tabs/MiscTab.xaml Outdated Show resolved Hide resolved
Content.Client/Options/UI/Tabs/MiscTab.xaml.cs Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl Outdated Show resolved Hide resolved
Resources/keybinds.yml Outdated Show resolved Hide resolved
@AwareFoxy AwareFoxy requested a review from Vonsant November 10, 2024 14:43
Copy link
Collaborator Author

@AwareFoxy AwareFoxy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1

Copy link
Collaborator

@Vonsant Vonsant left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Пахнет нормально, выглядит нормально, кушать можно.

@Vonsant Vonsant merged commit c396a36 into space-syndicate:master Nov 10, 2024
14 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants