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.

Sign up for GitHub

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

Jump to bottom

add: Experimentor relics rework #5683

Merged
merged 30 commits into from
Oct 26, 2024
Merged

add: Experimentor relics rework #5683

merged 30 commits into from
Oct 26, 2024

Conversation

Anorak2024
Copy link
Contributor

@Anorak2024 Anorak2024 commented Aug 8, 2024 •
edited
Loading

Описание

Реворк взаимодействий экспериментора со странными объектами. Добавление четырех предметов из продукции реликвий и ядер аномалий.

Ссылка на предложение

ТЗ:
PR Experimentor.docx
Ссылка на прошедшую предложку:
https://discord.com/channels/617003227182792704/755125334097133628/1272513427893649440

Демонстрация изменений

Снимок экрана 2024-08-18 135816
Снимок экрана 2024-08-18 135829
Снимок экрана 2024-08-18 135839

@Anorak2024 Anorak2024 marked this pull request as ready for review August 12, 2024 08:32
@Anorak2024 Anorak2024 marked this pull request as draft August 12, 2024 18:04
@github-actions github-actions bot added the DMI Affects DMI files label Aug 15, 2024
@Anorak2024 Anorak2024 marked this pull request as ready for review August 17, 2024 17:35
@BoshyG
Copy link
Contributor

BoshyG commented Aug 20, 2024

Ожидаем мерджа....

Den109G
Den109G reviewed Aug 20, 2024
View reviewed changes
code/game/objects/effects/anomalies.dm Outdated Show resolved Hide resolved
code/game/objects/effects/anomalies.dm Outdated Show resolved Hide resolved
@Den109G
Copy link
Contributor

Den109G commented Aug 20, 2024

Лучше в названии ПРа добавить тэг, что этот ПР делает (add, del, и т.д.). Смотри CONTRIBUTING.md или закреп в дисе.

Den109G
Den109G reviewed Aug 21, 2024
View reviewed changes
code/modules/mob/living/simple_animal/hostile/hostile.dm Outdated Show resolved Hide resolved
code/modules/mob/living/simple_animal/hostile/hostile.dm Outdated Show resolved Hide resolved
code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm Outdated Show resolved Hide resolved
code/modules/mob/living/simple_animal/simple_animal.dm Outdated Show resolved Hide resolved
code/modules/research/experimentor.dm Outdated Show resolved Hide resolved
code/modules/research/experimentor.dm Outdated Show resolved Hide resolved
code/modules/research/experimentor.dm Outdated Show resolved Hide resolved
@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Aug 21, 2024
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Aug 21, 2024
@Anorak2024 Anorak2024 changed the title Experimentor relics rework add: Experimentor relics rework Aug 21, 2024
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: Experimentor relics rework (#5683) [testmerge][ca94646]
54eff23
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: Experimentor relics rework (#5683) [testmerge][ca94646]
6576068
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: Experimentor relics rework (#5683) [testmerge][ca94646]
4ddfe9d
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: Experimentor relics rework (#5683) [testmerge][ca94646]
4cd86c9
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: Experimentor relics rework (#5683) [testmerge][ca94646]
746e523
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: Experimentor relics rework (#5683) [testmerge][ca94646]
298e7db
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: Experimentor relics rework (#5683) [testmerge][ca94646]
c8e00d4
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: Experimentor relics rework (#5683) [testmerge][ca94646]
d2e986d
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: Experimentor relics rework (#5683) [testmerge][ca94646]
4eb38eb
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: Experimentor relics rework (#5683) [testmerge][ca94646]
c2d71b1
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: Experimentor relics rework (#5683) [testmerge][ca94646]
bfeafe2
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 6, 2024

Данный PR был добавлен в ветку "testmerge" для тестов. Он попадёт на сервер после деплоя.

github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: Experimentor relics rework (#5683) [testmerge][ca94646]
24f19fd
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 7, 2024

Данный PR был добавлен в ветку "testmerge" для тестов. Он попадёт на сервер после деплоя.

github-actions bot pushed a commit that referenced this pull request Oct 7, 2024
@actions-user
add: Experimentor relics rework (#5683) [testmerge][ca94646]
6834f49
Bizzonium pushed a commit that referenced this pull request Oct 7, 2024
@actions-user @Bizzonium
add: Experimentor relics rework (#5683) [testmerge][ca94646]
6a99ccb
github-actions bot pushed a commit that referenced this pull request Oct 9, 2024
@actions-user
add: Experimentor relics rework (#5683) [testmerge][ca94646]
2f45c60
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 9, 2024

Данный PR был добавлен в ветку "testmerge" для тестов. Он попадёт на сервер после деплоя.

github-actions bot pushed a commit that referenced this pull request Oct 9, 2024
@actions-user
add: Experimentor relics rework (#5683) [testmerge][ca94646]
3b7ffc4
@github-actions GitHub Actions
Copy link
Contributor

Данный PR был добавлен в ветку "testmerge" для тестов. Он попадёт на сервер после деплоя.

github-actions bot pushed a commit that referenced this pull request Oct 13, 2024
@actions-user
add: Experimentor relics rework (#5683) [testmerge][ca94646]
d2eb31a
@github-actions GitHub Actions
Copy link
Contributor

Данный PR был добавлен в ветку "testmerge" для тестов. Он попадёт на сервер после деплоя.

github-actions bot pushed a commit that referenced this pull request Oct 18, 2024
@actions-user
add: Experimentor relics rework (#5683) [testmerge][8c55b01]
adf0c88
@github-actions GitHub Actions
Copy link
Contributor

Данный PR был добавлен в ветку "testmerge" для тестов. Он попадёт на сервер после деплоя.

github-actions bot pushed a commit that referenced this pull request Oct 23, 2024
@actions-user
add: Experimentor relics rework (#5683) [testmerge][8c55b01]
538b0f5
@github-actions GitHub Actions
Copy link
Contributor

Данный PR был добавлен в ветку "testmerge" для тестов. Он попадёт на сервер после деплоя.

github-actions bot pushed a commit that referenced this pull request Oct 23, 2024
@actions-user
add: Experimentor relics rework (#5683) [testmerge][8c55b01]
68dacbf
@Bizzonium Bizzonium merged commit 233a9b5 into ss220-space:master220 Oct 26, 2024
12 checks passed
@Bizzonium Bizzonium removed the testmerge This PR is being tested right now on live test servers. label Oct 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Den109G Den109G Den109G left review comments

@Gottfrei Gottfrei Gottfrei left review comments

Assignees
No one assigned
Labels
DMI Affects DMI files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Anorak2024 @BoshyG @Den109G @Bizzonium @Gottfrei