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

ЗАКАЗ SPACE SEC от ilja🤠 #755

Merged
merged 8 commits into from
Jul 3, 2024
Merged

ЗАКАЗ SPACE SEC от ilja🤠 #755

merged 8 commits into from
Jul 3, 2024

Conversation

Lonkuk
Copy link
Contributor

@Lonkuk Lonkuk commented Jun 16, 2024 •
edited by Schrodinger71
Loading

Описание PR

Screenshot_1107

Проверки

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

Изменения

🆑

  • add: Добавлены прототипы по заказу SPACE SEC

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 16, 2024 •
edited
Loading

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

Resources/Textures/ADT/Clothing/Ears/Headsets/space_sec_headset.rsi

State Old New Status
equipped-EARS Added
icon Added

Resources/Textures/ADT/Clothing/Ears/Headsets/space_sec_headset_full.rsi

State Old New Status
equipped-EARS Added
icon Added

Resources/Textures/ADT/Clothing/Head/Hardsuits/space_sec_commander_hardsuithead.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/ADT/Clothing/Head/Hardsuits/space_sec_officer_hardsuithead.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/ADT/Clothing/Head/Hardsuits/space_sec_pilot_hardsuithead.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/ADT/Clothing/Neck/space_sec_token.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/space_sec_commander_hardsuit.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/space_sec_officer_hardsuit.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/space_sec_pilot_hardsuit.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/space_sec_cadet.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/space_sec_commander.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/space_sec_officer.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/space_sec_pilot.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/space_sec_service.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Interface/Misc/space_sec_icons.rsi

State Old New Status
ADTSpaceSecCadetStatusIcon Added
ADTSpaceSecCommanderStatusIcon Added
ADTSpaceSecOfficerStatusIcon Added
ADTSpaceSecPilotStatusIcon Added
ADTSpaceSecServiceStatusIcon Added

Resources/Textures/ADT/Objects/Misc/space_sec_ids.rsi

State Old New Status
default-inhand-left Added
default-inhand-right Added
default Added
id-cadet Added
id-commander Added
id-officer Added
id-pilot Added
id-service Added

Resources/Textures/ADT/Structures/Doors/Airlocks/Glass/space_sec.rsi

State Old New Status
assembly Added
bolted_open_unlit Added
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_open_unlit Added
emergency_unlit Added
open Added
open_unlit Added
opening Added
opening_unlit Added
panel_closed Added
panel_closing Added
panel_open Added
panel_opening Added
sparks Added
sparks_broken Added
sparks_damaged Added
sparks_open Added
welded Added

Resources/Textures/ADT/Structures/Doors/Airlocks/Glass/space_sec_shuttle.rsi

State Old New Status
assembly Added
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_unlit Added
open Added
open_unlit Added
opening Added
opening_unlit Added
panel_closing Added
panel_open Added
panel_opening Added
welded Added

Resources/Textures/ADT/Structures/Doors/Airlocks/Standard/space_sec.rsi

State Old New Status
assembly Added
bolted_open_unlit Added
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_open_unlit Added
emergency_unlit Added
open Added
open_unlit Added
opening Added
opening_unlit Added
panel_closed Added
panel_closing Added
panel_open Added
panel_opening Added
sparks Added
sparks_broken Added
sparks_damaged Added
sparks_open Added
welded Added

Resources/Textures/ADT/Structures/Machines/space_sec_computer.rsi

State Old New Status
id Added

Resources/Textures/ADT/Structures/Wallmounts/space_sec_poster.rsi

State Old New Status
poster_spacesec Added

Resources/Textures/ADT/Structures/Walls/space_sec_diagonal.rsi

State Old New Status
state0 Added
state1 Added

Resources/Textures/ADT/Structures/Walls/space_sec_wall.rsi

State Old New Status
full Added
state0 Added
state1 Added
state2 Added
state3 Added
state4 Added
state5 Added
state6 Added
state7 Added

Resources/Textures/ADT/Structures/Windows/space_sec_diagonal.rsi

State Old New Status
state0 Added
state1 Added

Resources/Textures/ADT/Structures/Windows/space_sec_window.rsi

State Old New Status
full Added
swindow0 Added
swindow1 Added
swindow2 Added
swindow3 Added
swindow4 Added
swindow5 Added
swindow6 Added
swindow7 Added

Edit: diff updated after c36bd39

Schrodinger71
Schrodinger71 requested changes Jun 16, 2024
View reviewed changes
Copy link
Collaborator

@Schrodinger71 Schrodinger71 left a comment

Choose a reason for hiding this comment

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

Ругается мол нет такого

image

@modern-nm
Copy link
Collaborator

modern-nm commented Jun 16, 2024 •
edited
Loading

Изменения

🆑

  • add: Добавлены прототипы по заказу SPACE SEC
    Screenshot_1107

блок с изменениями, начинающийся с 🆑, предназначен для парсера и не должен содержать скриншоты.

@1Stepka1
Copy link
Collaborator

Если space sec humanoid то какого хрена они в отдельном файле? Resources/Prototypes/ADT/Entities/Mobs/player/space_sec_humanoid.yml перенести в Resources/Prototypes/ADT/Entities/Mobs/player/humanoid.yml
Resources/Prototypes/ADT/Entities/Objects/Misc/space_sec_id.yml это не уникальные айди, перенести в Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml
Resources/Prototypes/ADT/StatusEffects/space_sec_job.yml это не уникальные иконки, перенести в Resources/Prototypes/ADT/StatusEffects/job.yml
Так же есть придирки к названию папок и файлов,к примеру Resources/Prototypes/ADT/StartingGear/SpaceSec/SpaceSecCadet.yml это уже в папке SpaceSec,зачем повторять ещё раз?

@Lonkuk
Copy link
Contributor Author

Lonkuk commented Jun 21, 2024

Вроде всё поправил

@Schrodinger71 Schrodinger71 self-requested a review June 27, 2024 07:22
@Schrodinger71
Copy link
Collaborator

@Lonkuk Теперь такая ошибка

image

@Schrodinger71 Schrodinger71 added Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. and removed Status: Needs Review labels Jun 27, 2024
@Schrodinger71
Copy link
Collaborator

Даже не знаю, ты создал отдельную папку в ADT под SpaceSec что-то это не очень хорошо. Разниться с визардовской структурой
И меняешь официальные файлы без комментирования их, что это наши # ADT tweak изменения

Решай или ты сейчас тут починишь чтобы легче было при переносе, или замерджим, и переносить уже будет немного трудозатратнее в новую репу

image

@Schrodinger71 Schrodinger71 mentioned this pull request Jul 3, 2024
Open
@Schrodinger71 Schrodinger71 merged commit 8666a04 into AdventureTimeSS14:master Jul 3, 2024
11 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Schrodinger71 Schrodinger71 Schrodinger71 approved these changes

Assignees

@Lonkuk Lonkuk

Labels
Changes: Localization Changes: Sprites No C# Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Lonkuk @modern-nm @1Stepka1 @Schrodinger71