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

[ЗАКАЗ] Вещи компании MG&D #956

Merged
merged 7 commits into from
Jan 6, 2025

Conversation

Filokini
Copy link
Contributor

@Filokini Filokini commented Jan 6, 2025

Описание PR

Добавил ивентерские вещи по заказу
https://discord.com/channels/901772674865455115/1324078696671481938

Copy link
Contributor

github-actions bot commented Jan 6, 2025

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

@github-actions github-actions bot added S: Merge Conflict size/L S: Untriaged Changes: Sprites Изменение спрайтов Changes: Localization Изменение локализации Changes: No C# and removed S: Untriaged labels Jan 6, 2025
Copy link
Contributor

github-actions bot commented Jan 6, 2025

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

Resources/Textures/ADT/Clothing/Eyes/Glasses/mgd_pnvhud.rsi

State Old New Status
equipped-EYES Added
icon Added

Resources/Textures/ADT/Clothing/Eyes/HUD/mgd_hud.rsi

State Old New Status
equipped-EYES Added
icon Added

Resources/Textures/ADT/Clothing/Head/Helmets/mgd_helmet.rsi

State Old New Status
equipped-HELMET Added
icon Added

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

State Old New Status
equipped-INNERCLOTHING Added
icon Added

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

State Old New Status
equipped-INNERCLOTHING Added
icon Added

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

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/ADT/Structures/Decoration/banners48x48.rsi

State Old New Status
mgdflag Added

Edit: diff updated after c6d0c9f

@Schrodinger71 Schrodinger71 requested a review from Bolper January 6, 2025 19:07
Bolper
Bolper previously requested changes Jan 6, 2025
Copy link
Contributor

@Bolper Bolper left a comment

Choose a reason for hiding this comment

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

маладца

@Bolper Bolper dismissed their stale review January 6, 2025 19:40

ну вроде ок

@Filokini Filokini merged commit eb68f3a into AdventureTimeSS14:master Jan 6, 2025
13 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: No C# Changes: Sprites Изменение спрайтов size/L Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants