Unlumy strikes back #774

KashRas2 · 2024-11-10T16:09:30Z

Описание PR

Частичное выполнение собственных амбиций, а также подготовка всех идей, которые дал мне Иллюми.

Почему / Баланс

Иллюми сказал, что я его раб.

Техническая информация

Добавил систему для изменения стейта объекта во время пребывания в прикрученном и не прикрученном состоянии.

Добавил в систему двигателей звуки, а также чутка подкорректировал компонент слайс еды.

Медиа

Новое освещение на станциях, вдохновленное ТГ билдами.

А дальше мне лень

Требования

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

Критические изменения

Чейнджлог
🆑 KashRas2

add: Множественный респрайт всего сущего в этой игре (от тэга до айди карт).
add: Было добавлено много новой амбиент музыки.
add: В технических тоннелях стали появляться загадочные коробки.
add: Были добавлены новые звуки (например, звук включения и выключения ПАКМАНОВ).
tweak: Шлюзы глав теперь имеют разные спрайты, а не спрайт командования.
tweak: Освещение изменено таким образом, чтобы оно больше напоминало ТГ.
tweak: Слизне-котики наконец-то перестали лазить под столами, а также они умеют носить шляпы.
tweak: Топор атмосов снова может вскрывать плитку.
fix: Цена вендоматов не пропадает по воле божьей.

github-actions · 2024-11-10T16:10:15Z

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

Resources/Textures/ADT/Objects/Misc/id_cards.rsi

State	Old	New	Status
blue-inhand-left			Modified
blue-inhand-right			Modified
centcom			Modified
default			Modified
ert_chaplain			Modified
ert_commander			Modified
ert_engineer			Modified
ert_janitor			Modified
ert_medic			Modified
ert_security			Modified
id-guardofficer			Modified
id-pathologist			Modified
id-spacesec-cadet			Modified
id-spacesec-commander			Modified
id-spacesec-officer			Modified
id-spacesec-pilot			Modified
id-spacesec-service			Modified
id-trader-tsf			Modified
idblueshield			Modified
idcentcom			Modified
tsf_trader			Modified

Resources/Textures/ADT/Objects/Tools/emag_handmade.rsi

State	Old	New	Status
icon			Modified

Resources/Textures/ADT/Structures/Doors/Airlocks/Glass/ce.rsi

State	Old	New	Status
assembly			Added
bolted_open_unlit			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_open_unlit			Added
emergency_unlit			Added
open			Added
open_unlit			Added
opening			Added
opening_unlit			Added
panel_closed			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/ADT/Structures/Doors/Airlocks/Glass/cmo.rsi

State	Old	New	Status
assembly			Added
bolted_open_unlit			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_open_unlit			Added
emergency_unlit			Added
open			Added
open_unlit			Added
opening			Added
opening_unlit			Added
panel_closed			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/ADT/Structures/Doors/Airlocks/Glass/hos.rsi

State	Old	New	Status
assembly			Added
bolted_open_unlit			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_open_unlit			Added
emergency_unlit			Added
open			Added
open_unlit			Added
opening			Added
opening_unlit			Added
panel_closed			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/ADT/Structures/Doors/Airlocks/Glass/qm.rsi

State	Old	New	Status
assembly			Added
bolted_open_unlit			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_open_unlit			Added
emergency_unlit			Added
open			Added
open_unlit			Added
opening			Added
opening_unlit			Added
panel_closed			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/ADT/Structures/Doors/Airlocks/Glass/rd.rsi

State	Old	New	Status
assembly			Added
bolted_open_unlit			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_open_unlit			Added
emergency_unlit			Added
open			Added
open_unlit			Added
opening			Added
opening_unlit			Added
panel_closed			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/ADT/Structures/Doors/Airlocks/Standard/bathroom.rsi

State	Old	New	Status
assembly			Added
bolted_open_unlit			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_open_unlit			Added
emergency_unlit			Added
open			Added
open_unlit			Added
opening			Added
opening_unlit			Added
panel_closed			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/ADT/Structures/Doors/Airlocks/Standard/cap.rsi

State	Old	New	Status
assembly			Added
bolted_open_unlit			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_open_unlit			Added
emergency_unlit			Added
open			Added
open_unlit			Added
opening			Added
opening_unlit			Added
panel_closed			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/ADT/Structures/Doors/Airlocks/Standard/ce.rsi

State	Old	New	Status
assembly			Added
bolted_open_unlit			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_open_unlit			Added
emergency_unlit			Added
open			Added
open_unlit			Added
opening			Added
opening_unlit			Added
panel_closed			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/ADT/Structures/Doors/Airlocks/Standard/cmo.rsi

State	Old	New	Status
assembly			Added
bolted_open_unlit			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_open_unlit			Added
emergency_unlit			Added
open			Added
open_unlit			Added
opening			Added
opening_unlit			Added
panel_closed			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Edit: diff updated after 00aa113

github-actions · 2024-11-13T10:13:15Z

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

…орк слизнекота)

…nto newfeature

Resources/Prototypes/ADT/Entities/Structures/Doors/Airlock/airlocks.yml

Ratyyy

наверное?

KashRas2 · 2024-11-17T14:28:14Z

наверное?

ГОООООООООООООООООООООООЛ

…nto newfeature

KashRas and others added 9 commits November 2, 2024 18:21

ПРЯМ В МАСТЕРЕ СДЕЛАЛ ДА

48528ce

Merge branch 'AdventureTimeSS14:master' into master

bdea782

ЗАПЯТЫЕ ЕДИНСТВЕННЫЙ ВРАГ ВОРВАВШИЙСЯ В МОЮ СУДЬБУ ПРОЩААААААААААААААЙ

bb582ac

Merge branch 'master' of https://github.com/KashRas2/MorbinTime

a094bde

ЛАДНО ВОТ ВАМ ФИКС ГИПЕРНОБЛИЯ

12ede2d

СНОВА

985d7d1

ОЙ ПРОБЕЛ ЛИШНИЙ Я ПЕРФЕКЦИОНИСТ ПРОСТО

aaa8fda

Merge branch 'master' of https://github.com/KashRas2/MorbinTime

1eac70a

first lesson

6148fdb

github-actions bot added the Changes: Sprites Изменение спрайтов label Nov 10, 2024

Merge branch 'AdventureTimeSS14:master' into newfeature

ea72a70

KashRas added 2 commits November 10, 2024 19:14

Немного фиксов текущим изменениям.

fd9baef

Новая система визуализации, респрайты и новые звуки

bda9e35

github-actions bot added the Merge Conflict label Nov 13, 2024

ШЛЮЗЫ

284a35c

github-actions bot added the Changes: Localization Изменение локализации label Nov 13, 2024

KashRas and others added 2 commits November 16, 2024 13:35

Новые айди карты + легендарное возвращение топора (а ещё скромный рев…

6f1d5a6

…орк слизнекота)

Merge branch 'master' into newfeature

7d75068

github-actions bot removed the Merge Conflict label Nov 16, 2024

KashRas added 2 commits November 17, 2024 16:44

🦅🦅🦅🦅🦅🦅🦅🦅🦅🦅🦅🦅🦅🦅

1c7e55c

Merge branch 'newfeature' of https://github.com/KashRas2/MorbinTime i…

c3a9cba

…nto newfeature

KashRas2 marked this pull request as ready for review November 17, 2024 13:46

Filokini reviewed Nov 17, 2024

View reviewed changes

Resources/Prototypes/ADT/Entities/Structures/Doors/Airlock/airlocks.yml Show resolved Hide resolved

Merge branch 'master' into newfeature

666162b

Ratyyy approved these changes Nov 17, 2024

View reviewed changes

KashRas added 2 commits November 17, 2024 17:31

переводы забыл

77e44fe

Merge branch 'newfeature' of https://github.com/KashRas2/MorbinTime i…

5883615

…nto newfeature

Я кстати был отличником по русскому

00aa113

KashRas2 merged commit d058ef1 into AdventureTimeSS14:master Nov 17, 2024
13 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Unlumy strikes back #774

Unlumy strikes back #774

KashRas2 commented Nov 10, 2024 •

edited by Schrodinger71

Loading

github-actions bot commented Nov 10, 2024 •

edited

Loading

github-actions bot commented Nov 13, 2024

Ratyyy left a comment

KashRas2 commented Nov 17, 2024

Unlumy strikes back #774

Unlumy strikes back #774

Conversation

KashRas2 commented Nov 10, 2024 • edited by Schrodinger71 Loading

Описание PR

Почему / Баланс

Техническая информация

Медиа

Требования

Критические изменения

github-actions bot commented Nov 10, 2024 • edited Loading

github-actions bot commented Nov 13, 2024

Ratyyy left a comment

Choose a reason for hiding this comment

KashRas2 commented Nov 17, 2024

KashRas2 commented Nov 10, 2024 •

edited by Schrodinger71

Loading

github-actions bot commented Nov 10, 2024 •

edited

Loading