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: Entertainment monitor #5900

Merged
merged 21 commits into from
Nov 5, 2024
Merged

add: Entertainment monitor #5900

merged 21 commits into from
Nov 5, 2024

Conversation

dictor31
Copy link
Contributor

Описание

Теперь в телики, по которым идёт трансляция с камеры библиотекаря, можно смотреть с 6ти тайлов (Попытка 2)

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

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

Тесты

  1. Включить камеру библиотекаря
  2. Подойти к телевизору в баре
  3. Нажать на него

NightDawnFox
NightDawnFox previously approved these changes Sep 27, 2024
View reviewed changes
Copy link
Contributor

@NightDawnFox NightDawnFox 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 previously approved these changes Nov 2, 2024
View reviewed changes
Antoonij
Antoonij previously approved these changes Nov 2, 2024
View reviewed changes
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 Has Approve Have been approved by somebody from Review Team and awaiting for one more approve and removed Has Approve Have been approved by somebody from Review Team and awaiting for one more approve labels Nov 2, 2024
Antoonij
Antoonij reviewed Nov 3, 2024
View reviewed changes
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.

остался лишь кодстайл

code/game/machinery/computer/camera.dm Outdated Show resolved Hide resolved
code/game/machinery/computer/camera.dm Outdated Show resolved Hide resolved
Antoonij
Antoonij previously approved these changes Nov 3, 2024
View reviewed changes
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 Nov 3, 2024
@Vladisvell Vladisvell changed the title QOL: Entertainment_monitor add: Entertainment monitor Nov 4, 2024
Den109G
Den109G previously approved these changes Nov 5, 2024
View reviewed changes
Copy link
Contributor

@Den109G Den109G left a comment

Choose a reason for hiding this comment

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

Вроде выглядит хорошо со стороны кода.

@Vladisvell Vladisvell dismissed stale reviews from Den109G and Antoonij via 8929a27 November 5, 2024 13:32
@Vladisvell Vladisvell merged commit 9d5f519 into ss220-space:master220 Nov 5, 2024
12 checks passed
@dictor31 dictor31 deleted the entertainment_monitor branch November 5, 2024 13:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Vladisvell Vladisvell Vladisvell approved these changes

@NightDawnFox NightDawnFox NightDawnFox left review comments

@Den109G Den109G Den109G left review comments

@Antoonij Antoonij Antoonij left review comments

Assignees
No one assigned
Labels
Has Approve Have been approved by somebody from Review Team and awaiting for one more approve
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dictor31 @Antoonij @Vladisvell @Den109G @NightDawnFox