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.

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

Мороженки #155

Merged
merged 9 commits into from
Jul 31, 2024
Merged

Мороженки #155

merged 9 commits into from
Jul 31, 2024

Conversation

Schrodinger71
Copy link
Collaborator

@Schrodinger71 Schrodinger71 commented Jul 30, 2024

Описание PR

Перенос AdventureTimeSS14/space_station#341

Проверки

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

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

github-actions bot commented Jul 30, 2024

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

Resources/Textures/ADT/Objects/Consumable/Food/Frozen/ice.rsi

State Old New Status
IceCreamStick Added
bananafruitIce Added
berryfruitIce Added
chocolatefreezy Added
chocolatefreezy_caramel Added
chocolateicecream Added
chocolatepopsicle Added
chocolatepopsiclewithnuts Added
grapefruitIce Added
honkdae Added
icecreamcone Added
icecreamwafflecone Added
icecreamwaffleconenuts Added
jumbopopsicle Added
mangofruitIce Added
melonpopsicle Added
orangepopsicle Added
pineapplechocolate Added
popsicleapple Added
popsiclebanana Added
popsiclemole Added
seasaltppopsicle Added
spacefreezy Added
spacefreezy_caramel Added
spaceicecream Added
strawberryfruitIce Added
strawberryicecream Added
sundae Added
threeflavorsfreezy Added
threeflavorsfreezy_caramel Added
threeflavorspopsicle Added
vanillafreezy Added
vanillafreezy_caramel Added
vanillaicecream Added
wafflecone Added
watermelonpopsicle Added

Resources/Textures/ADT/Objects/Consumable/Food/Frozen/packed.rsi

State Old New Status
chocolatefreezy_packing Added
chocolateicecream_packing Added
chocolatepopsicle_packing Added
chocolatepopsiclewithnuts_packing Added
icecreamwafflecone_packing Added
icecreamwaffleconenuts_packing Added
jumbopopsicle_packing Added
melonpopsicle_packing Added
orangepopsicle_packing Added
pineapplechocolate_packing Added
popsicleapple_packing Added
popsiclebanana_packing Added
popsiclemole_packing Added
randomfruitIce Added
seasaltppopsicle_packing Added
spacefreezy_packing Added
spaceicecream_packing Added
strawberryicecream_packing Added
threeflavorsfreezy_packing Added
threeflavorspopsicle_packing Added
vanillafreezy_packing Added
vanillaicecream_packing Added
watermelonpopsicle_packing Added

Resources/Textures/ADT/Objects/Consumable/Food/Frozen/trash.rsi

State Old New Status
ChocolatePopsicle_trash Added
chocolatefreezy_trash Added
chocolateicecream_trash Added
chocolatepopsiclewithnuts_trash Added
icecreamwafflecone_trash Added
icecreamwaffleconenuts_trash Added
jumbopopsicle_trash Added
melonpopsicle_trash Added
orangepopsicle_trash Added
pineapplechocolate_trash Added
popsicleapple_trash Added
popsiclebanana_trash Added
popsiclemole_trash Added
randomfruitIce_trash Added
seasaltppopsicle_trash Added
spacefreezy_trash Added
spaceicecream_trash Added
strawberryicecream_trash Added
threeflavorsfreezy_trash Added
threeflavorspopsicle_trash Added
vanillafreezy_trash Added
vanillaicecream_trash Added
watermelonpopsicle_trash Added

Edit: diff updated after 0ec647e

@Schrodinger71
Copy link
Collaborator Author

Готово

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.

Впринципе все нормально, здорово что в yml теперь есть указатели

@Schrodinger71 Schrodinger71 added this pull request to the merge queue Jul 31, 2024
Merged via the queue into master with commit 32f8595 Jul 31, 2024
17 checks passed
@Schrodinger71 Schrodinger71 deleted the ice_cream branch July 31, 2024 07:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C#
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants