Skip to content

Бафф СБ 0_0!#1102

Open
sastr457 wants to merge 25 commits intodead-space-server:upstream-hellfrom
sastr457:kbt
Open

Бафф СБ 0_0!#1102
sastr457 wants to merge 25 commits intodead-space-server:upstream-hellfrom
sastr457:kbt

Conversation

@sastr457
Copy link

@sastr457 sastr457 commented Mar 6, 2026

https://discord.com/channels/1030160796401016883/1477754012873916486

Ссылка на задачу

Медиа

Требования

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

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

Список изменений

sastr457 and others added 25 commits December 16, 2025 15:59
@sastr457
1
45f918b
@sastr457
Merge branch 'master' of https://github.com/sastr457/space-station-14…
18577c8 
…-fobos
@sastr457
Merge branch 'master' of https://github.com/sastr457/space-station-14…
fba1210 
…-fobos into med
@sastr457
Merge branch 'dead-space-server:master' into master
b90b23d
@sastr457
Merge branch 'dead-space-server:master' into master
f5b1d34
@sastr457
Merge branch 'dead-space-server:master' into master
7a512f8
@sastr457
Merge branch 'dead-space-server:master' into master
9838f4b
@sastr457
Merge branch 'dead-space-server:master' into master
f4e5f0b
@sastr457
Merge branch 'dead-space-server:master' into master
11a0cee
@sastr457
Merge branch 'dead-space-server:master' into master
d27f7b9
@sastr457
Merge branch 'dead-space-server:master' into master
56b99ad
@sastr457
Merge branch 'dead-space-server:master' into master
4d5e05b
@sastr457
Merge branch 'dead-space-server:master' into master
b4d2136
@sastr457
Merge branch 'dead-space-server:master' into master
0d8b6d0
@sastr457
Merge branch 'dead-space-server:master' into master
6827578
@sastr457
Merge branch 'dead-space-server:master' into master
f999c5b
@sastr457
Merge branch 'dead-space-server:master' into master
e71349d
@sastr457
Merge branch 'dead-space-server:master' into master
c7eb10b
@sastr457
Merge branch 'dead-space-server:master' into master
9439bcf
@sastr457
Merge branch 'dead-space-server:master' into master
b65a413
@sastr457
Merge branch 'dead-space-server:master' into master
caef447
@sastr457
Sponsor-Velmet (dead-space-server#1098)
a113247
@SiwaTheProgrammer
Sponsor-Prometheus 3 (dead-space-server#1100)
c4725a7
@sastr457
Merge branch 'dead-space-server:master' into master
c47924b
@sastr457
1
3c6a613
@github-actions github-actions bot added S: Needs Review Статус: PR ждёт ревью от разработчика. size/XS PR изменяет 0–9 строк. Changes: No C# Изменение не затронуло файлы ".cs". and removed size/XS PR изменяет 0–9 строк. S: Needs Review Статус: PR ждёт ревью от разработчика. labels Mar 6, 2026
@sastr457 sastr457 changed the base branch from master to upstream-hell March 13, 2026 12:35
@sastr457 sastr457 requested a review from rhailrake as a code owner March 13, 2026 12:35
@github-actions github-actions bot added the S: Needs Review Статус: PR ждёт ревью от разработчика. label Mar 13, 2026
@sastr457 sastr457 closed this Mar 17, 2026
@sastr457 sastr457 reopened this Mar 17, 2026
@github-actions github-actions bot added size/L PR изменяет 1000-4999 строк. Changes: Audio Изменение затронуло файлы ".ogg". Changes: Sprites Изменение затронуло файлы ".rsi" и/или ".png". Changes: Localization Изменение затронуло файлы ".ftl". and removed size/L PR изменяет 1000-4999 строк. labels Mar 17, 2026
@github-actions
Copy link

github-actions bot commented Mar 17, 2026

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

Resources/Textures/_DeadSpace/Sponsor/Prometheus3/backpack.rsi

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

Resources/Textures/_DeadSpace/Sponsor/Prometheus3/belt.rsi

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

Resources/Textures/_DeadSpace/Sponsor/Prometheus3/boots.rsi

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

Resources/Textures/_DeadSpace/Sponsor/Prometheus3/boxes.rsi

State Old New Status
box Added
inhand-left Added
inhand-right Added
syndi Added

Resources/Textures/_DeadSpace/Sponsor/Prometheus3/glasses.rsi

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

Resources/Textures/_DeadSpace/Sponsor/Prometheus3/gloves.rsi

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

Resources/Textures/_DeadSpace/Sponsor/Prometheus3/guitar.rsi

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

Resources/Textures/_DeadSpace/Sponsor/Prometheus3/hardsuit.rsi

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

Resources/Textures/_DeadSpace/Sponsor/Prometheus3/headset.rsi

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

Resources/Textures/_DeadSpace/Sponsor/Prometheus3/helmet.rsi

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

Resources/Textures/_DeadSpace/Sponsor/Prometheus3/holocigar.rsi

State Old New Status
icon Added
lit-equipped-MASK Added
lit-icon Added
lit-inhand-left Added
lit-inhand-right Added
unlit-equipped-MASK Added
unlit-inhand-left Added
unlit-inhand-right Added

Resources/Textures/_DeadSpace/Sponsor/Prometheus3/hypospray.rsi

State Old New Status
equipped-BELT Added
hypo Added
hypo_empty Added
hypo_fill1 Added
hypo_fill2 Added
inhand-left Added
inhand-right Added

Resources/Textures/_DeadSpace/Sponsor/Prometheus3/jaws_of_life.rsi

State Old New Status
inhand-left Added
inhand-right Added
jaws_cutter Added
jaws_pry Added

Resources/Textures/_DeadSpace/Sponsor/Prometheus3/jetpack.rsi

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

Resources/Textures/_DeadSpace/Sponsor/Prometheus3/jumpsuit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon-up Added
icon Added
inhand-left Added
inhand-right Added
up-equipped-INNERCLOTHING Added
up-inhand-left Added
up-inhand-right Added

Resources/Textures/_DeadSpace/Sponsor/Prometheus3/mask.rsi

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

Resources/Textures/_DeadSpace/Sponsor/Prometheus3/medipen.rsi

State Old New Status
base-colorA-inhand-left Added
base-colorA-inhand-right Added
base-colorB-inhand-left Added
base-colorB-inhand-right Added
base-needle-inhand-left Added
base-needle-inhand-right Added
medipen Added
medipen_empty Added
medipen_fill1 Added
medipen_fill2 Added

Resources/Textures/_DeadSpace/Sponsor/Prometheus3/pda.rsi

State Old New Status
equipped-BELT Added
equipped-IDCARD Added
id_overlay Added
inhand-left Added
inhand-right Added
insert_overlay Added
light_overlay Added
pda Added

Resources/Textures/_DeadSpace/Sponsor/velmet/Customization/hair.rsi

State Old New Status
hair Added

Resources/Textures/_DeadSpace/Sponsor/velmet/Customization/top.rsi

State Old New Status
head Added

Resources/Textures/_DeadSpace/Sponsor/velmet/backpack.rsi

State Old New Status
equipped-BACKPACK Added
icon Added

Resources/Textures/_DeadSpace/Sponsor/velmet/belt.rsi

State Old New Status
equipped-BELT Added
icon Added

Resources/Textures/_DeadSpace/Sponsor/velmet/cloak.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/_DeadSpace/Sponsor/velmet/gasmask.rsi

State Old New Status
equipped-MASK Added
icon Added

Resources/Textures/_DeadSpace/Sponsor/velmet/gloves.rsi

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

Resources/Textures/_DeadSpace/Sponsor/velmet/hardsuit.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_DeadSpace/Sponsor/velmet/headset.rsi

State Old New Status
equipped-EARS Added
icon Added

Resources/Textures/_DeadSpace/Sponsor/velmet/helmet.rsi

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

Resources/Textures/_DeadSpace/Sponsor/velmet/hud.rsi

State Old New Status
equipped-EYES Added
icon Added

Resources/Textures/_DeadSpace/Sponsor/velmet/hypo.rsi

State Old New Status
equipped-BELT Added
hypo Added
hypo_fill1 Added
hypo_fill2 Added
hypo_fill3 Added
hypo_fill4 Added
hypo_fill5 Added
hypo_fill6 Added
inhand-left Added
inhand-right Added

Resources/Textures/_DeadSpace/Sponsor/velmet/jetpack.rsi

State Old New Status
equipped-BACKPACK Added
equipped-BELT Added
equipped-SUITSTORAGE Added
icon-on Added
icon Added
on-equipped-BACKPACK Added
on-equipped-BELT Added
on-equipped-SUITSTORAGE Added

Resources/Textures/_DeadSpace/Sponsor/velmet/jumpsuit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_DeadSpace/Sponsor/velmet/katana.rsi

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

Resources/Textures/_DeadSpace/Sponsor/velmet/knife.rsi

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

Resources/Textures/_DeadSpace/Sponsor/velmet/magboots.rsi

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

Resources/Textures/_DeadSpace/Sponsor/velmet/pda.rsi

State Old New Status
equipped-BELT Added
equipped-IDCARD Added
id_overlay Added
inhand-left Added
inhand-right Added
insert_overlay Added
light_overlay Added
pda Added

Resources/Textures/_DeadSpace/Sponsor/velmet/socks.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/_DeadSpace/Sponsor/velmet/tank.rsi

State Old New Status
equipped-BELT Added
equipped-SUITSTORAGE Added
icon Added

Resources/Textures/_DeadSpace/Sponsor/velmet/tools_jawsoflife.rsi

State Old New Status
equipped-BELT Added
syn_inhand-left Added
syn_inhand-right Added
syn_jaws_cutter Added
syn_jaws_pry Added

Resources/Textures/_DeadSpace/Sponsor/velmet/tools_massscanner.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added
scanner Added

Resources/Textures/_DeadSpace/Sponsor/velmet/tools_multitool.rsi

State Old New Status
equipped-BELT Added
green-inhand-left Added
green-inhand-right Added
green-unlit Added
icon Added
inhand-left Added
inhand-right Added
red-inhand-left Added
red-inhand-right Added
red-unlit Added
yellow-inhand-left Added
yellow-inhand-right Added
yellow-unlit Added

Resources/Textures/_DeadSpace/Sponsor/velmet/tools_powerdrill.rsi

State Old New Status
drill_bolt Added
drill_screw Added
equipped-BELT Added
inhand-left Added
inhand-right Added

Resources/Textures/_DeadSpace/Sponsor/velmet/tools_rcd.rsi

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

Resources/Textures/_DeadSpace/Sponsor/velmet/tools_welder.rsi

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rhailrake rhailrake Awaiting requested review from rhailrake rhailrake is a code owner

Assignees

No one assigned

Labels

Changes: Audio Изменение затронуло файлы ".ogg". Changes: Localization Изменение затронуло файлы ".ftl". Changes: No C# Изменение не затронуло файлы ".cs". Changes: Sprites Изменение затронуло файлы ".rsi" и/или ".png". S: Needs Review Статус: PR ждёт ревью от разработчика.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sastr457 @SiwaTheProgrammer