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

Новогоднее настроение 2025 #975

Merged
merged 4 commits into from
Dec 30, 2024

Conversation

DragonDidlo
Copy link
Contributor

@DragonDidlo DragonDidlo commented Dec 29, 2024

Кратное описание

Добавлено новогоднее настроение!
Из нового: Снеговики, постеры, гирлянды.
Из респрайтов: Мышки, маленькие лампочки, шлема ядерных оперов.

Здесь используется новый компонент HolidayClothingSwap от VigersRay.

Отдельное спасибо людям в титрах:
Hatiko - За спрайты гирлянд и за тормошение спрайтеров.
non_stop_smetana - За спрайты мышек!
ladn1001 - За спрайты шлемов ЯО и Постеров!

По какой причине

Ради Новогоднего настроения!

Медиа(Видео/Скриншоты)

https://youtu.be/yqAMc_Sk1GQ

Проверки

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

Changelog
🆑 Parashut & Hatiko & non_stop_smetana & ladn1001

  • add: Добавлено новогоднее настроение!
  • add: Добавлены гирлянды, новогодние постеры и маленькая ёлочка.
  • add: Добавлен оживший снежный мужик (снеговик)!
  • tweak: Ядерные оперативники теперь маскируются под банду Дедов Морозов!
  • tweak: У мышей теперь тоже Новый Год!
  • tweak: Теперь вместо маленьких лампочек используют ёлочные игрушки.

Copy link
Contributor

github-actions bot commented Dec 29, 2024

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

Resources/Textures/_Sunrise/Clothing/Head/Hardsuits/syndicate_santa.rsi

State Old New Status
combat-equipped-HELMET Added
icon-flash Added
icon Added
off-equipped-HELMET-vox Added
off-equipped-HELMET Added
on-equipped-HELMET-vox Added
on-equipped-HELMET Added

Resources/Textures/_Sunrise/Clothing/Head/Hardsuits/syndiecommander_santa.rsi

State Old New Status
icon-flash Added
icon Added
off-equipped-HELMET-vox Added
off-equipped-HELMET Added
on-equipped-HELMET-vox Added
on-equipped-HELMET Added

Resources/Textures/_Sunrise/Clothing/Head/Hardsuits/syndieelite_santa.rsi

State Old New Status
icon-flash Added
icon Added
off-equipped-HELMET-vox Added
off-equipped-HELMET Added
on-equipped-HELMET-vox Added
on-equipped-HELMET Added

Resources/Textures/_Sunrise/Clothing/Head/Hardsuits/syndiemedic_santa.rsi

State Old New Status
icon-flash Added
icon Added
off-equipped-HELMET-vox Added
off-equipped-HELMET Added
on-equipped-HELMET-vox Added
on-equipped-HELMET Added

Resources/Textures/_Sunrise/Mobs/Animals/mouse_santa.rsi

State Old New Status
0-equipped-HELMET Added
0-inhand-left Added
0-inhand-right Added
1-equipped-HELMET Added
1-inhand-left Added
1-inhand-right Added
2-equipped-HELMET Added
2-inhand-left Added
2-inhand-right Added
dead-0 Added
dead-1 Added
dead-2 Added
icon-0 Added
icon-1 Added
icon-2 Added
mouse-0 Added
mouse-1 Added
mouse-2 Added
mouse-moving-0 Added
mouse-moving-1 Added
mouse-moving-2 Added
splat-0 Added
splat-1 Added
splat-2 Added

Resources/Textures/_Sunrise/Mobs/Elemental/snowman.rsi

State Old New Status
icon Added
state Added

Resources/Textures/_Sunrise/Objects/Power/light_bulb_gift.rsi

State Old New Status
broken Added
burned Added
normal Added

Resources/Textures/_Sunrise/Structures/Furniture/potted_plants.rsi

State Old New Status
plant-10 Added

Resources/Textures/_Sunrise/Structures/Wallmounts/Lighting/light_small_gift.rsi

State Old New Status
base Added
broken Added
burned Added
empty Added
glow Added

Resources/Textures/_Sunrise/Structures/Wallmounts/garland.rsi

State Old New Status
lamps Added
wire Added

Resources/Textures/_Sunrise/Structures/Wallmounts/posters_newyear.rsi

State Old New Status
christmas_tree_poster Added
closedgiftposter Added
greenlight Added
gruesomesanta Added
opengiftposter Added
redlight Added

Edit: diff updated after 36257a3

Copy link
Contributor

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

@VigersRay VigersRay merged commit 5a6c7a8 into space-sunrise:master Dec 30, 2024
11 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants