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

720 #85

Draft
wants to merge 15 commits into
base: master
Choose a base branch
from
Draft

720 #85

wants to merge 15 commits into from

Conversation

themanyfaceddemon
Copy link
Contributor

Перенос AdventureTimeSS14/space_station#720
Ебучий юзернейм

Про конфликты не ебу
no cl

@themanyfaceddemon
[add/tweak] Изменение и добавление новых кристаллов (AdventureTimeSS1…
f6e6862 
…4#291)

Респрайт новых кристаллов и добавление кулоннов. Основная работа сделана Malanisa

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

![image](/attachments/2d60a3bc-e775-4c98-b38a-dcecb73d820d)
![image](/attachments/26b15d70-ba8f-4d56-adc9-e5001695051b)
![image](/attachments/7b29c983-539d-4cc4-99d0-9c1309a4bc8f)
![image](/attachments/dabf755f-cbb7-4d56-ae28-c9283e6ee022)
![image](/attachments/098b6958-f8fa-4525-9403-4d279c7c8b95)

:cl: Main work by Malanisa and fix's by NekoDar
- add: Добавлены средние кристаллы
- add: Добавлены маленькие кристаллы
- add: Добавлены осколки кристаллов
- add: Добавлены кулоны из кристаллов
- add: Добавлены сталагмиты
- tweak: Изменен спрайт обычных кристаллов

Reviewed-on: https://codeberg.org/Sirena/SS14-Sirena/pulls/291
@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации labels Jul 1, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 1, 2024 •
edited
Loading

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

Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi

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

Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi

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

Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi

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

Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi

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

Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi

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

Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi

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

Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi

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

Resources/Textures/Sirena/Structures/Decoration/crystal.rsi

State Old New Status
crystal_blue Added
crystal_blue_medium Added
crystal_blue_small Added
crystal_cyan Added
crystal_cyan_medium Added
crystal_cyan_small Added
crystal_green Added
crystal_green_medium Added
crystal_green_small Added
crystal_grey Added
crystal_grey_medium Added
crystal_grey_small Added
crystal_orange Added
crystal_orange_medium Added
crystal_orange_small Added
crystal_pink Added
crystal_pink_medium Added
crystal_pink_small Added
crystal_red Added
crystal_red_medium Added
crystal_red_small Added
crystalshard_blue Added
crystalshard_cyan Added
crystalshard_green Added
crystalshard_grey Added
crystalshard_orange Added
crystalshard_pink Added
crystalshard_red Added

Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi

State Old New Status
stalagmite1 Added
stalagmite2 Added
stalagmite3 Added
stalagmite4 Added
stalagmite5 Added

Edit: diff updated after cf9bafb

Neko Dar and others added 14 commits July 1, 2024 16:51
@themanyfaceddemon
[add/tweak] Изменение и добавление новых кристаллов (AdventureTimeSS1…
1f07148 
…4#291)

Респрайт новых кристаллов и добавление кулоннов. Основная работа сделана Malanisa

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

![image](/attachments/2d60a3bc-e775-4c98-b38a-dcecb73d820d)
![image](/attachments/26b15d70-ba8f-4d56-adc9-e5001695051b)
![image](/attachments/7b29c983-539d-4cc4-99d0-9c1309a4bc8f)
![image](/attachments/dabf755f-cbb7-4d56-ae28-c9283e6ee022)
![image](/attachments/098b6958-f8fa-4525-9403-4d279c7c8b95)

:cl: Main work by Malanisa and fix's by NekoDar
- add: Добавлены средние кристаллы
- add: Добавлены маленькие кристаллы
- add: Добавлены осколки кристаллов
- add: Добавлены кулоны из кристаллов
- add: Добавлены сталагмиты
- tweak: Изменен спрайт обычных кристаллов

Reviewed-on: https://codeberg.org/Sirena/SS14-Sirena/pulls/291
@Us3rn4me228 @themanyfaceddemon
Update meta.json
d27cd55
@Us3rn4me228 @themanyfaceddemon
Update meta.json
5f195d6
@Us3rn4me228 @themanyfaceddemon
Update meta.json
7495960
@Us3rn4me228 @themanyfaceddemon
Update meta.json
2977214
@Us3rn4me228 @themanyfaceddemon
Update meta.json
78ac4e2
@Us3rn4me228 @themanyfaceddemon
Update meta.json
96bad11
@Us3rn4me228 @themanyfaceddemon
Update meta.json
1f215b8
@Us3rn4me228 @themanyfaceddemon
Update meta.json
c272b6f
@Us3rn4me228 @themanyfaceddemon
Update meta.json
663139c
@Us3rn4me228 @themanyfaceddemon
Update meta.json
26d39f8
@Us3rn4me228 @themanyfaceddemon
Update meta.json
58c8520
@Us3rn4me228 @themanyfaceddemon
old crystal shards 1984
18283b5 
Чтобы не мешались
@Us3rn4me228 @themanyfaceddemon
Update ChangelogADT.yml
cf9bafb
@Schrodinger71 Schrodinger71 linked an issue Jul 1, 2024 that may be closed by this pull request
Порт кристаллов с Сирены (720 PR) Юсернейм ЭТО ПИЗДЕЦ #97
Open
@github-actions GitHub Actions
Copy link
Contributor

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

@1Stepka1 1Stepka1 marked this pull request as draft August 3, 2024 19:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов Merge Conflict No C#
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Порт кристаллов с Сирены (720 PR) Юсернейм ЭТО ПИЗДЕЦ
2 participants
@themanyfaceddemon @Us3rn4me228