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

[ПЕРЕНОС] Добавление кастомных вещей в одеждомат #278

Merged
merged 11 commits into from
Aug 18, 2024
Merged

[ПЕРЕНОС] Добавление кастомных вещей в одеждомат #278

merged 11 commits into from
Aug 18, 2024

Conversation

Darkiich
Copy link
Contributor

@Darkiich Darkiich commented Aug 15, 2024 •
edited
Loading

Описание PR

Этот ПР переносит кастомные вещи в одеждомат
Медиа

Проверки

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

Изменения

  • add: Добавлены вещи в одеждомат

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации labels Aug 15, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 15, 2024 •
edited
Loading

RSI Diff Bot; head commit 28ba411 merging into 7d5ffa6
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Clothing/Back/blacklady_satchel.rsi

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

Resources/Textures/ADT/Clothing/Back/leatherlady_satchel.rsi

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

Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi

State Old New Status
equipped-HELMET-hamster Added
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Neck/Cloaks/darkgrey_cloak.rsi

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

Resources/Textures/ADT/Clothing/Neck/Cloaks/gothic_cloak.rsi

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

Resources/Textures/ADT/Clothing/Shoes/Boots/sandals.rsi

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

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_black_womensleeveless.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_salat_women.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_salatblack.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_white_womensleeveless.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_aquamarine_women.rsi

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

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi

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

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi

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

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi

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

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi

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

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi

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

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi

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

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi

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

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi

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

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi

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

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi

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

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi

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

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi

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

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

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

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

State Old New Status
equipped-INNERCLOTHING Added
icon Added

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

State Old New Status
equipped-INNERCLOTHING Added
icon Added

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

State Old New Status
equipped-INNERCLOTHING Added
icon Added

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

State Old New Status
equipped-INNERCLOTHING Added
icon Added

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

State Old New Status
equipped-INNERCLOTHING Added
icon Added

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

State Old New Status
equipped-INNERCLOTHING Added
icon Added

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Edit: diff updated after 28ba411

@Darkiich Darkiich self-assigned this Aug 16, 2024
@Darkiich Darkiich requested a review from 1Stepka1 August 16, 2024 18:52
@Darkiich Darkiich requested a review from 1Stepka1 August 16, 2024 20:52
@Darkiich Darkiich dismissed 1Stepka1’s stale review August 16, 2024 20:52

исправлено

1Stepka1
1Stepka1 requested changes Aug 17, 2024
View reviewed changes
Copy link
Collaborator

@1Stepka1 1Stepka1 left a comment

Choose a reason for hiding this comment

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

Забыл парочку файлов
Так же почини ошибку с ценою пополнения

Resources/Locale/ru-RU/ADT/prototypes/Clothing/Head/hats.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/ADT/prototypes/Clothing/Neck/cloak.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/ADT/prototypes/Clothing/Shoes/boots.ftl Outdated Show resolved Hide resolved
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

1Stepka1
1Stepka1 approved these changes Aug 18, 2024
View reviewed changes
Copy link
Collaborator

@1Stepka1 1Stepka1 left a comment

Choose a reason for hiding this comment

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

Теперь по идее все в порядке

@1Stepka1 1Stepka1 mentioned this pull request Aug 18, 2024
Merged
4 tasks
@Darkiich Darkiich added this pull request to the merge queue Aug 18, 2024
Merged via the queue into AdventureTimeSS14:master with commit f385bce Aug 18, 2024
14 of 15 checks passed
@Darkiich Darkiich deleted the clothing branch August 18, 2024 09:47
github-actions bot pushed a commit to PyotrIgn/space_station_ADT that referenced this pull request Aug 18, 2024
@Darkiich
[ПЕРЕНОС] Добавление кастомных вещей в одеждомат (AdventureTimeSS14#278)
49ca571 
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это
комментарии - они не будут видны в PR. -->

## Описание PR
<!-- Ниже опишите ваш Pull Request. Что он изменяет? На что еще это
может повлиять? Постарайтесь описать все внесённые вами изменения! -->
Этот ПР переносит кастомные вещи в одеждомат
**Медиа**
<!-- Если приемлемо, добавьте скриншоты для демонстрации вашего PR. Если
ваш PR представляет собой визуальное изменение, добавьте
скриншоты, иначе он может быть закрыт. -->

**Проверки**
<!-- Выполнение всех следующих действий, если это приемлемо для вида
изменений сильно ускорит разбор вашего PR -->
- [x] PR полностью завершён и мне не нужна помощь чтобы его закончить.
- [x] Я внимательно просмотрел все свои изменения и багов в них не
нашёл.
- [x] Я запускал локальный сервер со своими изменениями и всё
протестировал.
- [ ] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR
этого не требует.

**Изменения**
<!--
Здесь вы можете написать список изменений, который будет автоматически
добавлен в игру, когда ваш PR будет принят.

В журнал изменений следует помещать только то, что действительно важно
игрокам.

В списке изменений тип значка не является часть предложения, поэтому
явно указывайте - Добавлен, Удалён, Изменён.
плохо: - add: Новый инструмент для инженеров
хорошо: - add: Добавлен новый инструмент для инженеров

Вы можете указать своё имя после символа 🆑 именно оно будет
отображаться в журнале изменений (иначе будет использоваться ваше имя на
GitHub)
Например: 🆑 Ian

-->

- add: Добавлены вещи в одеждомат
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@1Stepka1 1Stepka1 1Stepka1 approved these changes

Assignees

@Darkiich Darkiich

Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C# Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Darkiich @1Stepka1