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

add: GreyTide strip #6296

Merged
merged 16 commits into from
Jan 11, 2025
Merged

add: GreyTide strip #6296

merged 16 commits into from
Jan 11, 2025

Conversation

Ssheya
Copy link
Contributor

@Ssheya Ssheya commented Dec 31, 2024

Описание

Добавляет в тир 3 лодаут новую нашивку "GreyTide Strip", доступна всем профам, стоимость 1 поинт, меняет диалоговое облачко над головой.

Причина создания ПР / Почему это хорошо для игры

https://discord.com/channels/617003227182792704/755125334097133628/1322360035027849309

Тесты

не делал, верю что робит

@github-actions github-actions bot added the DMI Affects DMI files label Dec 31, 2024
PlayerUnknown14
PlayerUnknown14 previously approved these changes Jan 6, 2025
Copy link
Member

@PlayerUnknown14 PlayerUnknown14 left a comment

Choose a reason for hiding this comment

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

ВедЛок одобрил.

@PlayerUnknown14
Copy link
Member

Да блять.

Copy link
Contributor

@Antoonij Antoonij left a comment

Choose a reason for hiding this comment

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

  1. Нужно обновить мастер и ветку
  2. После 1 пункта - сделать index_name для /datum/gear/donor/strip/greytide

@UnderwaterNeike
Copy link

Не знаю че там надо обновить, но чтобы завтра все ревью были выданы, а после завтра деплой, бабосы сквозь пальцы утекают.
Глав Кисик одобряет все.

Copy link
Contributor

@Antoonij Antoonij left a comment

Choose a reason for hiding this comment

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

по коду проблем нет

@Antoonij Antoonij added the Has Approve Have been approved by somebody from Review Team and awaiting for one more approve label Jan 11, 2025
@BeebBeebBoob BeebBeebBoob merged commit 844d99e into ss220-space:master220 Jan 11, 2025
12 checks passed
Ssheya added a commit to Ssheya/Paradise that referenced this pull request Jan 25, 2025
* NanoMap Auto-Update (Fri Oct  4 00:38:07 UTC 2024)

* СЕ дай пояс

* kisik myaukni

* kisik2

* Update code/modules/clothing/under/accessories/accessory.dm

* Update code/modules/clothing/under/accessories/accessory.dm

* Update code/modules/clothing/under/accessories/accessory.dm

* доработка

---------

Co-authored-by: NanoMap Generation <[email protected]>
Co-authored-by: PlayerUnknown14 <[email protected]>
Co-authored-by: Antoonij <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
DMI Affects DMI files Has Approve Have been approved by somebody from Review Team and awaiting for one more approve
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants