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

Commit /suicide #76

Merged
merged 4 commits into from
Sep 6, 2024
Merged

Conversation

MegaDaimond
Copy link
Contributor

No description provided.

@Lost-Paradise-Bot Lost-Paradise-Bot added Изменения: Спрайт Изменяет какие-либо файлы .json/.png в текстурах Изменения: YML Изменяет какие-либо файлы .yml labels Sep 6, 2024
@Lost-Paradise-Bot
Copy link
Contributor

В этом ПР'е есть конфликты, пожалуйста, устраните их, прежде чем мы сможем оценить ваш ПР.

@Lost-Paradise-Bot Lost-Paradise-Bot added the Статус: Конфликт Ожидает починки. label Sep 6, 2024
@Lost-Paradise-Bot
Copy link
Contributor

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

Resources/Textures/_LostParadise/Clothing/Eyes/HUD/upgHUD.rsi

State Old New Status
equipped-EYES Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/_LostParadise/Clothing/Hands/Gloves/upgofficerhands.rsi

State Old New Status
equipped-HAND Modified
icon Modified

Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/Monorich.rsi

State Old New Status
equipped-NECK Modified

Resources/Textures/_LostParadise/Clothing/Shoes/Boots/NPZmagboots.rsi

State Old New Status
equipped-FEET Modified
icon-on Modified
icon Modified
on-equipped-FEET Modified

@Xeno4
Copy link

Xeno4 commented Sep 6, 2024

насрал 5-ю апдейтами в одном коммите, молодец

@Evgencheg
Copy link
Member

насрал 5-ю апдейтами в одном коммите, молодец

в плане 5-ю?

@Lost-Paradise-Bot
Copy link
Contributor

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

Resources/Textures/_LostParadise/Clothing/Eyes/HUD/upgHUD.rsi

State Old New Status
equipped-EYES Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/_LostParadise/Clothing/Hands/Gloves/upgofficerhands.rsi

State Old New Status
equipped-HAND Modified
icon Modified

Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/Monorich.rsi

State Old New Status
equipped-NECK Modified

Resources/Textures/_LostParadise/Clothing/Shoes/Boots/NPZmagboots.rsi

State Old New Status
equipped-FEET Modified
icon-on Modified
icon Modified
on-equipped-FEET Modified

@Xeno4
Copy link

Xeno4 commented Sep 6, 2024

насрал 5-ю апдейтами в одном коммите, молодец

в плане 5-ю?

  • несколько текстур
  • визор НПЗ
  • солейлы в шкафу

@Lost-Paradise-Bot
Copy link
Contributor

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

Resources/Textures/_LostParadise/Clothing/Eyes/HUD/upgHUD.rsi

State Old New Status
equipped-EYES Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/_LostParadise/Clothing/Hands/Gloves/upgofficerhands.rsi

State Old New Status
equipped-HAND Modified
icon Modified

Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/Monorich.rsi

State Old New Status
equipped-NECK Modified

Resources/Textures/_LostParadise/Clothing/Shoes/Boots/NPZmagboots.rsi

State Old New Status
equipped-FEET Modified
icon-on Modified
icon Modified
on-equipped-FEET Modified

@Lost-Paradise-Bot Lost-Paradise-Bot removed the Статус: Конфликт Ожидает починки. label Sep 6, 2024
@Lost-Paradise-Bot
Copy link
Contributor

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

Resources/Textures/_LostParadise/Clothing/Eyes/HUD/upgHUD.rsi

State Old New Status
equipped-EYES Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/_LostParadise/Clothing/Hands/Gloves/upgofficerhands.rsi

State Old New Status
equipped-HAND Modified
icon Modified

Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/Monorich.rsi

State Old New Status
equipped-NECK Modified

Resources/Textures/_LostParadise/Clothing/Shoes/Boots/NPZmagboots.rsi

State Old New Status
equipped-FEET Modified
icon-on Modified
icon Modified
on-equipped-FEET Modified

@Evgencheg Evgencheg merged commit 4c9c462 into Lost-Paradise-Project:master Sep 6, 2024
8 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Изменения: YML Изменяет какие-либо файлы .yml Изменения: Спрайт Изменяет какие-либо файлы .json/.png в текстурах
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants