Hotfixmod #601

Ratyyy · 2024-10-03T20:09:11Z

пробуем хотфиксить МОДы

ревёртаю ревёрт чтобы тестить на сервере фиксы. На локалке повторить ошибки невозможно.

если ошибка в модулях - оставляю систему в комментах
если ошибка в самих модах - ревёртаю и пытаюсь чинить на локалке

…tation_ADT # Conflicts: # Resources/Prototypes/ADT/Datasets/tags.yml # Resources/Prototypes/ADT/tags.yml

…tation_ADT

…e_station_ADT into hotfixmod

This reverts commit 80ec017. # Conflicts: # Content.Shared/ADT/Modsuit/Systems/ModSuitModSystem.cs

github-actions · 2024-10-03T20:17:18Z

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

Resources/Textures/ADT/Clothing/Back/Modsuit/atmospheric.rsi

State	Old	New	Status
equipped-BACKPACK			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/ADT/Clothing/Back/Modsuit/cience.rsi

State	Old	New	Status
equipped-BACKPACK			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/ADT/Clothing/Back/Modsuit/clown.rsi

State	Old	New	Status
equipped-BACKPACK			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/ADT/Clothing/Back/Modsuit/engineering.rsi

State	Old	New	Status
equipped-BACKPACK			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/ADT/Clothing/Back/Modsuit/medical.rsi

State	Old	New	Status
equipped-BACKPACK			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/ADT/Clothing/Back/Modsuit/mining.rsi

State	Old	New	Status
equipped-BACKPACK			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/ADT/Clothing/Back/Modsuit/security.rsi

State	Old	New	Status
equipped-BACKPACK			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/ADT/Clothing/Back/Modsuit/standart.rsi

State	Old	New	Status
equipped-BACKPACK			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/ADT/Clothing/Hands/Gloves/Modsuit/atmospheric.rsi

State	Old	New	Status
equipped-HAND			Added
icon			Added

Resources/Textures/ADT/Clothing/Hands/Gloves/Modsuit/cience.rsi

State	Old	New	Status
equipped-HAND			Added
icon			Added

Resources/Textures/ADT/Clothing/Hands/Gloves/Modsuit/clown.rsi

State	Old	New	Status
equipped-HAND			Added
icon			Added

Resources/Textures/ADT/Clothing/Hands/Gloves/Modsuit/engineering.rsi

State	Old	New	Status
equipped-HAND			Added
icon			Added

Resources/Textures/ADT/Clothing/Hands/Gloves/Modsuit/medical.rsi

State	Old	New	Status
equipped-HAND			Added
icon			Added

Resources/Textures/ADT/Clothing/Hands/Gloves/Modsuit/mining.rsi

State	Old	New	Status
equipped-HAND			Added
icon			Added

Resources/Textures/ADT/Clothing/Hands/Gloves/Modsuit/rescue.rsi

State	Old	New	Status
equipped-HAND			Added
icon			Added

Resources/Textures/ADT/Clothing/Hands/Gloves/Modsuit/security.rsi

State	Old	New	Status
equipped-HAND			Added
icon			Added

Resources/Textures/ADT/Clothing/Hands/Gloves/Modsuit/standart.rsi

State	Old	New	Status
equipped-HAND			Added
icon			Added

Resources/Textures/ADT/Clothing/Head/Modsuit/atmospheric.rsi

State	Old	New	Status
equipped-head-light			Added
equipped-head-unshaded			Added
equipped-head			Added
icon-flash			Added
icon-unshaded			Added
icon			Added
light-overlay			Added

Resources/Textures/ADT/Clothing/Head/Modsuit/cience.rsi

State	Old	New	Status
equipped-head-light			Added
equipped-head-unshaded			Added
equipped-head			Added
icon-flash			Added
icon-unshaded			Added
icon			Added
light-overlay			Added

Resources/Textures/ADT/Clothing/Head/Modsuit/clown.rsi

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

Resources/Textures/ADT/Clothing/Head/Modsuit/engineering.rsi

State	Old	New	Status
equipped-head-light			Added
equipped-head-unshaded			Added
equipped-head			Added
icon-flash			Added
icon-unshaded			Added
icon			Added
light-overlay			Added

Resources/Textures/ADT/Clothing/Head/Modsuit/medical.rsi

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

Resources/Textures/ADT/Clothing/Head/Modsuit/mining.rsi

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

Resources/Textures/ADT/Clothing/Head/Modsuit/security.rsi

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

Resources/Textures/ADT/Clothing/Head/Modsuit/standart.rsi

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

Resources/Textures/ADT/Clothing/OuterClothing/Modsuit/atmospheric.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added

Resources/Textures/ADT/Clothing/OuterClothing/Modsuit/cience.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added

Resources/Textures/ADT/Clothing/OuterClothing/Modsuit/clown.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added

Resources/Textures/ADT/Clothing/OuterClothing/Modsuit/engineering.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added

Resources/Textures/ADT/Clothing/OuterClothing/Modsuit/medical.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added

Resources/Textures/ADT/Clothing/OuterClothing/Modsuit/mining.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added

Resources/Textures/ADT/Clothing/OuterClothing/Modsuit/security.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added

Resources/Textures/ADT/Clothing/OuterClothing/Modsuit/standart.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added

Resources/Textures/ADT/Clothing/Shoes/Boots/Modsuit/atmospheric.rsi

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

Resources/Textures/ADT/Clothing/Shoes/Boots/Modsuit/cience.rsi

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

Resources/Textures/ADT/Clothing/Shoes/Boots/Modsuit/clown.rsi

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

Resources/Textures/ADT/Clothing/Shoes/Boots/Modsuit/engineering.rsi

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

Resources/Textures/ADT/Clothing/Shoes/Boots/Modsuit/medical.rsi

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

Resources/Textures/ADT/Clothing/Shoes/Boots/Modsuit/mining.rsi

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

Resources/Textures/ADT/Clothing/Shoes/Boots/Modsuit/security.rsi

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

Resources/Textures/ADT/Clothing/Shoes/Boots/Modsuit/standart.rsi

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

Resources/Textures/ADT/Objects/Specific/Modsuits/modcore_construction.rsi

State	Old	New	Status
atmospheric			Added
boots			Added
chestplate			Added
cience			Added
cosmohonk			Added
engineering			Added
gauntlets			Added
helmet			Added
medical			Added
mod-core-standard			Added
modcore0			Added
modcore1			Added
modcore2			Added
modcore3			Added
modcore4			Added
modcore5			Added
modcore6			Added
modcore7			Added
modcore8			Added
security			Added
standard			Added

Resources/Textures/ADT/Objects/Specific/Modsuits/modules.rsi

State	Old	New	Status
adrenaline			Added
antigrav			Added
apparatus			Added
armor_booster			Added
ash_accretion			Added
bikehorn			Added
bloon			Added
carry			Added
chameleon			Added
chronogun			Added
clamp			Added
clamp_loader			Added
cloak			Added
cloak_ninja			Added
constructor			Added
criminal_capture			Added
defib			Added
diaghud_visor			Added
dispenser			Added
dnalock			Added
drill			Added
emp_pulse			Added
empshield			Added
energy_net			Added
energy_shield			Added
flametrower			Added
flashlight			Added
gps			Added
hacker			Added
health			Added
holster			Added
infotrator			Added
injector			Added
insignia			Added
jetpack			Added
jetpack_adv			Added
kinesis			Added
longfall			Added
mag_harmess			Added
magnet			Added
medhud_visor			Added
megaphone			Added
meson_visor			Added
micriwave_beam			Added
mine_bomb			Added
mister			Added
night_visor			Added
no_baton			Added
noslip			Added

Edit: diff updated after 4874efb

KashRas2 · 2024-10-04T07:30:15Z

Надо было проверить

jungarikjan · 2024-10-04T11:40:30Z

Если можно локалю через два часа подправлю, чтобы не дёргать Крысю, оки?

Ratyyy · 2024-10-04T11:43:28Z

Если можно локалю через два часа подправлю, чтобы не дёргать Крысю, оки?

да делай как угодно, главное ничего не сломай особо

jungarikjan · 2024-10-04T15:08:53Z

Если можно локалю через два часа подправлю, чтобы не дёргать Крысю, оки?

да делай как угодно, главное ничего не сломай особо

та как я сломаю локале пхпхпхп

jungarikjan · 2024-10-04T15:37:28Z

всё, локале переделал, Крыске спасибо за офигенное нововведение

Mirokko · 2024-10-11T14:05:02Z

А где все тестировщики то? у нас их 3 штуки (минимум)

Ratyyy · 2024-10-14T14:07:47Z

А где все тестировщики то? у нас их 3 штуки (минимум)

всё оттестировали и даже больше. А ВОТ КАК РЕШИТЬ ЭТУ ХРЕНЬ ПРИ ПЕРЕЗАХОДЕ НЕ ЗНАЮТ ДАЖЕ САМЫЕ ВЕЛИКИЕ УМЫ

Mirokko · 2024-10-15T20:19:39Z

Ну раз всё протестили и нашли пока 1 баг - то убираю лейбл на тест

github-actions · 2024-10-19T21:54:19Z

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

Schrodinger71 · 2024-11-06T16:59:13Z

Что тут в итоге?

github-actions · 2024-12-14T20:31:22Z

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

Ratyyy added 8 commits September 21, 2024 21:30

hotfix

9bda467

Merge branch 'master' of https://github.com/AdventureTimeSS14/space_s…

a12230f

…tation_ADT # Conflicts: # Resources/Prototypes/ADT/Datasets/tags.yml # Resources/Prototypes/ADT/tags.yml

Merge branch 'master' of https://github.com/AdventureTimeSS14/space_s…

91d1857

…tation_ADT

первая попытка в хотфикс

28d4d5c

Update produce.yml

b7ba593

дамба-дамба дамбля

3c6769c

Merge branch 'hotfixmod' of https://github.com/AdventureTimeSS14/spac…

f545d40

…e_station_ADT into hotfixmod

Reapply "добавляем МОДсьюиты" (#600)

11434e8

This reverts commit 80ec017. # Conflicts: # Content.Shared/ADT/Modsuit/Systems/ModSuitModSystem.cs

github-actions bot added Changes: UI Изменение интерфейса Changes: Sprites Изменение спрайтов Changes: Localization Изменение локализации labels Oct 3, 2024

Update mosduits locale-1.ftl

c48efc4

jungarikjan added 2 commits October 4, 2024 18:19

Update mods locale-2

d40c63a

Update modules locale-3

409da12

Merge branch 'master' into hotfixmod

4874efb

Schrodinger71 added the Ожидает Тестирования(QA Engineer) Нужно протестить полуготовый пулл реквест label Oct 7, 2024

Mirokko removed the Ожидает Тестирования(QA Engineer) Нужно протестить полуготовый пулл реквест label Oct 15, 2024

github-actions bot added the Merge Conflict label Oct 19, 2024

Schrodinger71 marked this pull request as draft October 27, 2024 09:03

github-actions bot added the S: Merge Conflict label Dec 14, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Hotfixmod #601

Hotfixmod #601

Ratyyy commented Oct 3, 2024 •

edited

Loading

github-actions bot commented Oct 3, 2024 •

edited

Loading

KashRas2 commented Oct 4, 2024

jungarikjan commented Oct 4, 2024

Ratyyy commented Oct 4, 2024

jungarikjan commented Oct 4, 2024

jungarikjan commented Oct 4, 2024

Mirokko commented Oct 11, 2024 •

edited

Loading

Ratyyy commented Oct 14, 2024

Mirokko commented Oct 15, 2024

github-actions bot commented Oct 19, 2024

Schrodinger71 commented Nov 6, 2024

github-actions bot commented Dec 14, 2024

Hotfixmod #601

Are you sure you want to change the base?

Hotfixmod #601

Conversation

Ratyyy commented Oct 3, 2024 • edited Loading

github-actions bot commented Oct 3, 2024 • edited Loading

KashRas2 commented Oct 4, 2024

jungarikjan commented Oct 4, 2024

Ratyyy commented Oct 4, 2024

jungarikjan commented Oct 4, 2024

jungarikjan commented Oct 4, 2024

Mirokko commented Oct 11, 2024 • edited Loading

Ratyyy commented Oct 14, 2024

Mirokko commented Oct 15, 2024

github-actions bot commented Oct 19, 2024

Schrodinger71 commented Nov 6, 2024

github-actions bot commented Dec 14, 2024

Ratyyy commented Oct 3, 2024 •

edited

Loading

github-actions bot commented Oct 3, 2024 •

edited

Loading

Mirokko commented Oct 11, 2024 •

edited

Loading