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

Небольшое дополнение для рескинов одежды СБ #1920

Merged
merged 1 commit into from
Feb 11, 2024

Conversation

Iajret
Copy link
Collaborator

@Iajret Iajret commented Feb 10, 2024

О Pull Request

Добавляет скины:

  • тонкий синий пояс (который уже давно у нас был, но на нове его удалили)
  • красная разгрузка (а именно скин армадайн разгрузки для peacekeeper webbing
  • скин красного messenger bag, а так же сам синий мессенджер в вендомат СБ

Как это может улучшит/повлиять на игровой процесс/ролевую игру

Красный круто. Синий тоже норм (а ещё мне просто нравился синий слим пояс......)

Доказательства тестирования

Скриншоты/Видео

image
image
image

Changelog

🆑
add: Added Blue slim reskin for security belt, armadyne skin for webbing and red messenger bag skin for messenger bag
/:cl:

@ReezeBL ReezeBL merged commit e925a9a into Fluffy-Frontier:master Feb 11, 2024
25 checks passed
AnywayFarus added a commit that referenced this pull request Feb 11, 2024
@Iajret Iajret deleted the moreredec branch February 12, 2024 15:19
Iajret pushed a commit that referenced this pull request Apr 11, 2024
* Fixes incorrect operator usage in mecha code (#82570)

## About The Pull Request

I completely screwed up and told the original PR author of #82415
(9922d2f2377c3ab571d34c857174c45f5521a5ae) to use the `XOR` operator
instead of the `OR` operator (I wasn't thinking right for some reason
when I was reading the ref), anyways this PR just fixes that because I
misled the contributor into doing something that wasn't correct and
actually would BREAK functionality instead.

* Fixes incorrect operator usage in mecha code

---------

Co-authored-by: san7890 <[email protected]>
ReezeBL pushed a commit that referenced this pull request Apr 11, 2024
* Fixes incorrect operator usage in mecha code (#82570)

## About The Pull Request

I completely screwed up and told the original PR author of #82415
(9922d2f2377c3ab571d34c857174c45f5521a5ae) to use the `XOR` operator
instead of the `OR` operator (I wasn't thinking right for some reason
when I was reading the ref), anyways this PR just fixes that because I
misled the contributor into doing something that wasn't correct and
actually would BREAK functionality instead.

* Fixes incorrect operator usage in mecha code

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: san7890 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants