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

Tweak: Nearby Buckle (Second Try) #22828

Merged
merged 5 commits into from
Nov 29, 2023
Merged

Tweak: Nearby Buckle (Second Try) #22828

merged 5 commits into from
Nov 29, 2023

Conversation

AyIong
Copy link
Contributor

@AyIong AyIong commented Oct 10, 2023

What Does This PR Do

Allows you to sit on furniture not standing on it, but within its radius.
If you sit down yourself, it will happen instantly, but if you try to sit down someone else, there will be a delay of 1 second, which completely eliminates the use of buckling in combat.

Hopefully with the added delay the balance team will be happy with it, because it solves the problem with using buckle in combat.

Why It's Good For The Game

It's more comfortable to sit down, and it's more comfortable to put someone down too, like a prisoner. Also less accidental hugging :c

Images of changes

dreamseeker_QXNx9y99hl.mp4

Testing

Changelog

🆑
tweak: Buckle tweak. You do not have to be standing on a chair, for example, to buckle. You just need to be close by to buckle. In addition, a 1-second delay has been added to buckle other than yourself. You (or your target) will automatically be pulled and buckled to a chair, couch, pipe, and other things you can buckle.
/:cl:

@ParadiseSS13-Bot ParadiseSS13-Bot added the -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally label Oct 10, 2023
@SteelSlayer SteelSlayer added the Tweak This PR tweaks something ingame label Oct 13, 2023
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval internally and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Oct 13, 2023
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting approval This PR is waiting for approval internally labels Oct 26, 2023
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
AyIong added a commit to ss220club/Paradise-SS220 that referenced this pull request Nov 24, 2023
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то
может пойти не так. -->
<!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. -->

## Что этот PR делает
Позволяет баклиться в радиусе 1 тайла от цели.
Больше месяца висит ПР на оффах, конфликтов нет, думаю можно залить и
ждать пока у оффов дойдут руки.
ParadiseSS13#22828

<!-- Вкратце опишите изменения, которые вносите. -->
<!-- Опишите **все** изменения, так как противное может сказаться на
рассмотрении этого PR'а! -->
<!-- Если вы исправляете Issue, добавьте "Fixes #1234" (где 1234 - номер
Issue) где-нибудь в описании PR'а. Это автоматически закроет Issue после
принятия PR'а. -->

## Почему это хорошо для игры
Удобно

<!-- Опишите, почему, по вашему, следует добавить эти изменения в игру.
-->

## Changelog

:cl:
tweak: Можно снова удобно садиться на стулья, достаточно перетащить
куклу на него, стоя в упор к нему а не на нём.
/:cl:

<!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы
можете написать свой ник справа от первого :cl:, если хотите. Иначе
будет использован ваш ник на ГитХабе. -->
<!-- Вы можете использовать несколько записей с одинаковым префиксом
(Они используются только для иконки в игре) и удалить ненужные. Помните,
что чейнджлог должен быть понятен обычным игроком. -->
<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы
можете исключить всю секцию. -->

---------

Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
AyIong and others added 2 commits November 25, 2023 02:16
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
@AyIong AyIong requested a review from DGamerL November 25, 2023 00:19
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Nov 25, 2023
Copy link
Contributor

@lewcc lewcc left a comment

Choose a reason for hiding this comment

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

Looks fine

@lewcc lewcc merged commit effd9e2 into ParadiseSS13:master Nov 29, 2023
@AyIong AyIong deleted the nearby-buckle branch November 29, 2023 19:36
@HMBGERDO HMBGERDO mentioned this pull request Dec 3, 2023
Oyu07 pushed a commit to Oyu07/Paradise that referenced this pull request Jan 2, 2024
* Tweak: Nearby Buckle

* Adjacent

* It's definitely better

Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>

* Small cleanup

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting merge This PR is ready for merge Tweak This PR tweaks something ingame
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants