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: fishing rod is now craftable in R&D #6045

Merged
merged 5 commits into from
Nov 5, 2024

Conversation

Ssheya
Copy link
Contributor

@Ssheya Ssheya commented Oct 18, 2024

Описание

Добавление крафта удочки в протолаты РНД с соответствующим технологиями:
Material Research 5
Biologie Research 6
Ingenring Research 4
Plasma Research 6
Отдел: Equipment
С требованиями в материалах:
15 000 титана(7.5 листов),10 000 металл(5 листов),2 500 серебра(1.25 листов),2 500 алмазов(1.25 листов).
Для облегчения жизни парамедикам/шахтёрам

Ссылка на предложение/Причина создания ПР

https://discord.com/channels/617003227182792704/1291762866940285039/1293180899004907592

Тесты

Не делал, верю что работает.

@Ssheya Ssheya force-pushed the Hey!-I-caught-a-miner! branch from d7a1381 to 7b0063b Compare October 18, 2024 21:31
Copy link
Member

@Daeberdir Daeberdir left a comment

Choose a reason for hiding this comment

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

Перетащи в раздел шахтёрских приколов.

@Ssheya
Copy link
Contributor Author

Ssheya commented Oct 20, 2024

Перетащи в раздел шахтёрских приколов.

в предлоги тут, а не у них, УВЫ

@Daeberdir
Copy link
Member

Г**ноТЗ не причина идти против геймдизайна. Даже в таких мелочах. Делай адекватно. Если будут возмущаться - разработка решит вопрос.

@Ssheya Ssheya requested a review from Daeberdir November 2, 2024 01:19
Daeberdir
Daeberdir previously approved these changes Nov 2, 2024
@Daeberdir Daeberdir added the Has Approve Have been approved by somebody from Review Team and awaiting for one more approve label Nov 2, 2024
Antoonij
Antoonij previously approved these changes Nov 2, 2024
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.

Теперь выглядит хорошо.

@Ssheya
Copy link
Contributor Author

Ssheya commented Nov 2, 2024

Теперь выглядит хорошо.

ну ты бы хоть кинул в мердж очередь

@Daeberdir
Copy link
Member

У нас права сломались кидать в очередь. Сейчас из ревьюверов только Владисвель с Бибом могут.

@Ssheya
Copy link
Contributor Author

Ssheya commented Nov 3, 2024

У нас права сломались кидать в очередь. Сейчас из ревьюверов только Владисвель с Бибом могут.

Круто

@Vladisvell Vladisvell changed the title add: ol' reliable craftable add: fishing rod is now craftable in R&D Nov 5, 2024
@Vladisvell Vladisvell dismissed stale reviews from Daeberdir and Antoonij via 24d6c4c November 5, 2024 12:58
@github-actions github-actions bot added TGUI Affects TGUI javascript Pull requests that update Javascript code Merge Conflict This doesn't seem right labels Nov 5, 2024
@Vladisvell Vladisvell force-pushed the Hey!-I-caught-a-miner! branch from 24d6c4c to cacd4f2 Compare November 5, 2024 12:59
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Nov 5, 2024
@Vladisvell Vladisvell merged commit dc03e1b into ss220-space:master220 Nov 5, 2024
12 checks passed
@Daeberdir Daeberdir removed TGUI Affects TGUI javascript Pull requests that update Javascript code Has Approve Have been approved by somebody from Review Team and awaiting for one more approve labels Nov 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants