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

[DO NOT MERGE]Добавление кнопок консолей и доступов для ИИ #2336

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

[DO NOT MERGE]Добавление кнопок консолей и доступов для ИИ #2336

wants to merge 13 commits into from

Conversation

Burenov
Copy link

@Burenov Burenov commented Dec 10, 2024 •
edited
Loading

Описание PR

Медиа

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я ознакомился с наставлениями по работе с репозиторием и следовал им при создании PR'а.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения
🆑 Burenov

  • add: Добавлены кнопки консолей в хотбар ИИ!
  • add: Добавлены новые доступы для ИИ

@github-actions github-actions bot added the Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" label Dec 10, 2024
UrPrice
UrPrice reviewed Dec 10, 2024
View reviewed changes
Resources/Prototypes/Entities/Mobs/Player/silicon.yml Outdated
transmitFrequencyId: ShuttleTimer
#SS220 Station Ai Actions start
Copy link
Collaborator

Choose a reason for hiding this comment

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

Лишняя метка

Resources/Prototypes/Entities/Mobs/Player/silicon.yml Show resolved Hide resolved
lexaSvarshik
lexaSvarshik suggested changes Dec 11, 2024
View reviewed changes
Copy link

@lexaSvarshik lexaSvarshik left a comment

Choose a reason for hiding this comment

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

Откати в файлах пустые изменения в самом конце, это автоформатирование IDE сделало.

@github-actions github-actions bot added the Changes: Sprites Изменение затронуло файлы ".rsu / .png" label Dec 12, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 12, 2024 •
edited
Loading

RSI Diff Bot; head commit 3327394 merging into 97e5040
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/SS220/Interface/Actions/actions_ai.rsi

State Old New Status
alert_console Added
cargo_console Added
criminal_records Added
power_console Added
rad_console Added
robotics_console Added
sm_console Added
solar_console Added
station_map Added

Edit: diff updated after 3327394

stalengd
stalengd requested changes Dec 12, 2024
View reviewed changes
Resources/Prototypes/Entities/Mobs/Player/silicon.yml
transmitFrequencyId: ShuttleTimer
- type: StationMap #SS220 Station Ai Actions end
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
- type: StationMap #SS220 Station Ai Actions end
- type: StationMap #SS220 Station Ai Actions

Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -527,4 +592,4 @@
prototypes:
- PlayerBorgSyndicateAssaultGhostRole
- PlayerBorgSyndicateAssaultGhostRole # Saboteurs are kinda like cyborg medics, we want less.
- PlayerBorgSyndicateSaboteurGhostRole
- PlayerBorgSyndicateSaboteurGhostRole
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
- PlayerBorgSyndicateSaboteurGhostRole
- PlayerBorgSyndicateSaboteurGhostRole

Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
- type: ReagentDispenser
pack: EmptyInventory
pack: EmptyInventory
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
pack: EmptyInventory
pack: EmptyInventory

Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
@@ -92,4 +93,4 @@
- type: GuideHelp
guides:
- Chemicals
- Chemist
- Chemist
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
- Chemist
- Chemist

Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1532,4 +1533,4 @@
- Wooden
- RawMaterial
- Plastic
- Ingot
- Ingot
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
- Ingot
- Ingot

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
@@ -449,4 +451,4 @@
pipeDirection: South
- type: Construction
graph: GasBinary
node: radiator
node: radiator
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
node: radiator
node: radiator

Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
@@ -265,4 +266,4 @@
description: You can't get away from them, even in space, and even after we started calling them 'spesos' instead.
components:
- type: BarSign
current: Spacebucks
current: Spacebucks
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
current: Spacebucks
current: Spacebucks

Resources/Prototypes/SS220/Entities/Structures/Machines/photocopier.yml
@@ -132,4 +134,4 @@
capacity: 10000
charges: 10000
- type: StaticPrice
price: 2500
price: 2500
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
price: 2500
price: 2500

Resources/Prototypes/SS220/Entities/Structures/Power/Generation/Supermatter/observer.yml
@@ -52,4 +53,4 @@
completetime: 4
materials:
Steel: 100
Glass: 500
Glass: 500
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
Glass: 500
Glass: 500

@stalengd stalengd self-assigned this Dec 12, 2024
@stalengd
Copy link
Collaborator

@UrPrice одобрено?

@stalengd stalengd requested a review from EstKemran December 12, 2024 16:33
@Burenov
Copy link
Author

Burenov commented Dec 12, 2024

Не мёржите, мне спрайты не одобрили ещё

@Burenov Burenov changed the title Добавление кнопок консолей и доступов для ИИ [DO NOT MERGE]Добавление кнопок консолей и доступов для ИИ Dec 12, 2024
@UrPrice
Copy link
Collaborator

UrPrice commented Dec 13, 2024

@UrPrice одобрено?

Да, это по задаче с дискорда

@Tris0r
Copy link

Tris0r commented Dec 13, 2024

@EstKemran ревьюить будешь??

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@UrPrice UrPrice UrPrice left review comments

@lexaSvarshik lexaSvarshik lexaSvarshik requested changes

@stalengd stalengd stalengd requested changes

@EstKemran EstKemran Awaiting requested review from EstKemran

Requested changes must be addressed to merge this pull request.

Assignees

@stalengd stalengd

Labels
Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" Changes: Sprites Изменение затронуло файлы ".rsu / .png" Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Burenov @stalengd @UrPrice @Tris0r @lexaSvarshik