[Add] Nanotrasen navy by Agronomist-NN · Pull Request #271 · dead-space-server/space-erida-14

Agronomist-NN · 2026-03-09T21:42:39Z

Описание PR

Добавлена фракция корпоративного флота NanoTrasen для ивентов.

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

Завалялась куча прототипов с незапамятных времён.

Технические детали

Я уже не представляю что там по файлам... я делал это с перерывами.

Медиа

Упаси боже.

Требования

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

Список изменений
🆑 Agronomist-NN

Добавлено:

Новая фракция корпоративного флота NanoTrasen для ивентов.

Nanotrasen navy

github-actions · 2026-03-09T21:43:26Z

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

Resources/Textures/_Erida/Clothing/Back/Backpacks/nanotrasen_navy.rsi

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

Resources/Textures/_Erida/Clothing/Back/Backpacks/nanotrasen_navy_captain.rsi

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

Resources/Textures/_Erida/Clothing/Back/Backpacks/nanotrasen_navy_ce.rsi

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

Resources/Textures/_Erida/Clothing/Back/Backpacks/nanotrasen_navy_engineer.rsi

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

Resources/Textures/_Erida/Clothing/Back/Backpacks/nanotrasen_navy_medical.rsi

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

Resources/Textures/_Erida/Clothing/Back/Duffels/nanotrasen_navy.rsi

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

Resources/Textures/_Erida/Clothing/Back/Duffels/nanotrasen_navy_captain.rsi

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

Resources/Textures/_Erida/Clothing/Back/Duffels/nanotrasen_navy_ce.rsi

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

Resources/Textures/_Erida/Clothing/Back/Duffels/nanotrasen_navy_engineer.rsi

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

Resources/Textures/_Erida/Clothing/Back/Duffels/nanotrasen_navy_medical.rsi

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

Resources/Textures/_Erida/Clothing/Back/Satchels/nanotrasen_navy.rsi

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

Resources/Textures/_Erida/Clothing/Back/Satchels/nanotrasen_navy_captain.rsi

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

Resources/Textures/_Erida/Clothing/Back/Satchels/nanotrasen_navy_ce.rsi

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

Resources/Textures/_Erida/Clothing/Back/Satchels/nanotrasen_navy_engineer.rsi

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

Resources/Textures/_Erida/Clothing/Back/Satchels/nanotrasen_navy_medical.rsi

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

Resources/Textures/_Erida/Clothing/Belt/nanotarsen_navy_sheath.rsi

State	Old	New	Status
equipped-BELT			Added
sheath-sabre-equipped-BELT			Added
sheath-sabre			Added
sheath			Added

Resources/Textures/_Erida/Clothing/Belt/nanotarsen_navy_webbing.rsi

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

Resources/Textures/_Erida/Clothing/Ears/Headsets/nanotrasen_navy_base.rsi

State	Old	New	Status
equipped-EARS			Added
icon			Added

Resources/Textures/_Erida/Clothing/Ears/Headsets/nanotrasen_navy_command.rsi

State	Old	New	Status
alt-equipped-EARS			Added
equipped-EARS			Added
icon			Added
icon_alt			Added

Resources/Textures/_Erida/Clothing/Hands/nanotarsen_navy_captain_gloves.rsi

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

Resources/Textures/_Erida/Clothing/Head/Hardsuits/nanotrasen_navy.rsi

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

Resources/Textures/_Erida/Clothing/Head/Hardsuits/nanotrasen_navy_captain.rsi

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

Resources/Textures/_Erida/Clothing/Head/Hardsuits/nanotrasen_navy_engineering.rsi

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

Resources/Textures/_Erida/Clothing/Head/Hardsuits/nanotrasen_navy_medical.rsi

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

Resources/Textures/_Erida/Clothing/Head/Hats/nanotrasen_navy_captain_cap.rsi

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

Resources/Textures/_Erida/Clothing/Head/Hats/nanotrasen_navy_captain_hat.rsi

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

Resources/Textures/_Erida/Clothing/Head/Hats/nanotrasen_navy_ce_cap.rsi

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

Resources/Textures/_Erida/Clothing/Head/Hats/nanotrasen_navy_cmo_cap.rsi

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

Resources/Textures/_Erida/Clothing/Head/Hats/nanotrasen_navy_medical_beret.rsi

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

Resources/Textures/_Erida/Clothing/Head/Hats/nanotrasen_navy_officer_cap.rsi

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

Resources/Textures/_Erida/Clothing/Head/Hats/nanotrasen_navy_sailor_cap.rsi

State	Old	New	Status
equipped-HELMET			Added
icon			Added

Resources/Textures/_Erida/Clothing/Neck/Cloaks/nanotrasen_navy_capcloak.rsi

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

Resources/Textures/_Erida/Clothing/Neck/Cloaks/nanotrasen_navy_capcloakformal.rsi

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

Resources/Textures/_Erida/Clothing/Neck/Cloaks/nanotrasen_navy_officer_cloak.rsi

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

Resources/Textures/_Erida/Clothing/OuterClothing/Coats/nanotrasen_navy_captain_coat.rsi

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

Resources/Textures/_Erida/Clothing/OuterClothing/Coats/nanotrasen_navy_labcoat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon-open			Added
icon			Added
inhand-left			Added
inhand-right			Added
open-equipped-OUTERCLOTHING			Added
open-inhand-left			Added
open-inhand-right			Added

Resources/Textures/_Erida/Clothing/OuterClothing/Coats/nanotrasen_navy_officer_coat.rsi

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

Resources/Textures/_Erida/Clothing/OuterClothing/Hardsuits/nanotrasen_navy.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-reptilian			Added
equipped-OUTERCLOTHING			Added
icon			Added

Resources/Textures/_Erida/Clothing/OuterClothing/Hardsuits/nanotrasen_navy_captain.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-reptilian			Added
equipped-OUTERCLOTHING			Added
icon			Added

Resources/Textures/_Erida/Clothing/OuterClothing/Hardsuits/nanotrasen_navy_engineering.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-reptilian			Added
equipped-OUTERCLOTHING			Added
icon			Added

Resources/Textures/_Erida/Clothing/OuterClothing/Hardsuits/nanotrasen_navy_medical.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-reptilian			Added
equipped-OUTERCLOTHING			Added
icon			Added

Resources/Textures/_Erida/Clothing/Shoes/magboots-nanotrasen-navy.rsi

State	Old	New	Status
equipped-FEET-vox			Added
equipped-FEET			Added
icon-on			Added
icon			Added
inhand-left			Added
inhand-right			Added
on-equipped-FEET-vox			Added
on-equipped-FEET			Added
on-inhand-left			Added
on-inhand-right			Added

Edit: diff updated after c4f56af

Agronomist-NN · 2026-03-09T22:07:32Z

Похуй, завтра доделаю

Agronomist-NN · 2026-03-10T09:49:06Z

Ладно я понял придётся самому это говно тестировать

Agronomist-NN · 2026-03-10T12:53:47Z

Let's try this

OpenWendor · 2026-03-11T10:36:07Z

…-branch

UmbiMax · 2026-03-16T09:44:25Z

Время чистить PR от щиткода

…-branch

github-actions · 2026-03-17T19:52:51Z

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

Agronomist-NN added 6 commits February 10, 2026 16:41

textures

03981b7

sripts

eb8ff48

Merge branch 'dead-space-server:master' into Nanotrasen-navy

44d8519

nanotrasen fleet

a9f3fa1

Merge branch 'Nanotrasen-navy-upstream-branch' into Nanotrasen-navy

b663399

Merge pull request #1 from Agronomist-NN/Nanotrasen-navy

b1c8ee8

Nanotrasen navy

github-actions bot added S: Untriaged size/M S: Needs Review Changes: No C# Changes: Sprites Changes: Audio and removed S: Untriaged S: Needs Review size/M labels Mar 9, 2026

Update attributions.yml

a8b9057

github-actions bot added the size/M label Mar 9, 2026

Add files via upload

92d699b

Agronomist-NN marked this pull request as draft March 9, 2026 22:07

Agronomist-NN added 3 commits March 10, 2026 12:26

no scripts

b97333a

no rsi

3e18f26

Update Belts.yml

742f0f7

Agronomist-NN marked this pull request as ready for review March 10, 2026 09:37

Update sword.yml

ff061c1

Agronomist-NN marked this pull request as draft March 10, 2026 09:48

Agronomist-NN added 2 commits March 10, 2026 14:01

YAMLLinter fixes

f9a0e2a

Update battery_guns.yml

18013cb

Agronomist-NN marked this pull request as ready for review March 10, 2026 12:53

Merge branch 'dead-space-server:master' into Nanotrasen-navy-upstream…

49ca44f

…-branch

Agronomist-NN added 3 commits March 17, 2026 10:00

Merge branch 'dead-space-server:master' into Nanotrasen-navy-upstream…

fa52c75

…-branch

no trash files

d8d1359

no fleet in lobby

c4f56af

github-actions bot added the S: Merge Conflict label Mar 17, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Add] Nanotrasen navy#271

[Add] Nanotrasen navy#271
Agronomist-NN wants to merge 18 commits intodead-space-server:masterfrom
Agronomist-NN:Nanotrasen-navy-upstream-branch

Agronomist-NN commented Mar 9, 2026

Uh oh!

github-actions bot commented Mar 9, 2026 •

edited

Loading

Uh oh!

Agronomist-NN commented Mar 9, 2026

Uh oh!

Agronomist-NN commented Mar 10, 2026

Uh oh!

Agronomist-NN commented Mar 10, 2026

Uh oh!

OpenWendor commented Mar 11, 2026

Uh oh!

UmbiMax commented Mar 16, 2026

Uh oh!

github-actions bot commented Mar 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

Agronomist-NN commented Mar 9, 2026

Описание PR

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

Технические детали

Медиа

Требования

Uh oh!

github-actions bot commented Mar 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Agronomist-NN commented Mar 9, 2026

Uh oh!

Agronomist-NN commented Mar 10, 2026

Uh oh!

Agronomist-NN commented Mar 10, 2026

Uh oh!

OpenWendor commented Mar 11, 2026

Uh oh!

UmbiMax commented Mar 16, 2026

Uh oh!

github-actions bot commented Mar 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

github-actions bot commented Mar 9, 2026 •

edited

Loading