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

Tile&Puff #943

Merged
merged 7 commits into from
Apr 27, 2024
Merged

Tile&Puff #943

merged 7 commits into from
Apr 27, 2024

Conversation

EstKemran
Copy link

@EstKemran EstKemran commented Apr 27, 2024 •
edited
Loading

Описание PR

Медиа
изображение
изображение
kitchen_red

Проверки

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

Изменения
🆑 DaGo

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

@github-actions github-actions bot added Changes: Localization Изменение затронуло файлы ".ftl" Changes: Sprites Изменение затронуло файлы ".rsu / .png" Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" labels Apr 27, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 27, 2024 •
edited
Loading

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

Resources/Textures/SS220/Objects/Tiles/kitchenred.rsi

State Old New Status
kitchenred Added

Resources/Textures/SS220/Structures/Furniture/pouffe.rsi

State Old New Status
pouffe-cyan Added
pouffe-red Added

Edit: diff updated after cd8aace

Kit0vras
Kit0vras suggested changes Apr 27, 2024
View reviewed changes
Resources/Textures/SS220/Tiles/attributions.yml Outdated Show resolved Hide resolved
Resources/Prototypes/SS220/Entities/Structures/Furniture/chairs.yml
- type: entity
name: red pouffe
id: ChairPouffeRed
description: Surprisingly soft, just what you need after a hard day at work.
Copy link

Choose a reason for hiding this comment

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

ooh yo arrr from england ma boy??&

Copy link
Author

Choose a reason for hiding this comment

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

DaGo лаколизовал

Copy link

Choose a reason for hiding this comment

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

а, увидел

Copy link

Choose a reason for hiding this comment

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

а, увидел

базированный чел, локализирует прототипы для наших французских игроков

@DexlerXD
Copy link

@EstKemran для перезапуска тестов можно пингануть меня, например

@DexlerXD DexlerXD merged commit 21a2dc9 into SerbiaStrong-220:master Apr 27, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kit0vras Kit0vras Kit0vras requested changes

@DexlerXD DexlerXD DexlerXD approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@EstKemran @DexlerXD @Kit0vras