Skip to content

ыфвфыв - #1955

Draft
IvanKuvalda wants to merge 3 commits into
dead-space-server:masterfrom
IvanKuvalda:обвеса

Hidden character warning

The head ref may contain hidden characters: "\u043e\u0431\u0432\u0435\u0441\u0430"
Draft

ыфвфыв#1955
IvanKuvalda wants to merge 3 commits into
dead-space-server:masterfrom
IvanKuvalda:обвеса

Conversation

@IvanKuvalda

Copy link
Copy Markdown
Collaborator

фывфыв

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

Медиа

Требования

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

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

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

фывфыв
@IvanKuvalda
IvanKuvalda requested a review from rhailrake as a code owner July 13, 2026 16:54
@IvanKuvalda
IvanKuvalda marked this pull request as draft July 13, 2026 16:55
@github-actions github-actions Bot added size/L PR изменяет 1000-4999 строк. S: Needs Review Статус: PR ждёт ревью от разработчика. Changes: Audio Изменение затронуло файлы ".ogg". Changes: Sprites Изменение затронуло файлы ".rsi" и/или ".png". Changes: UI Изменение затронуло файлы ".xaml". Changes: Localization Изменение затронуло файлы ".ftl". Changes: C# Изменение затронуло файлы ".cs". and removed S: Needs Review Статус: PR ждёт ревью от разработчика. labels Jul 13, 2026
@github-actions

github-actions Bot commented Jul 13, 2026

Copy link
Copy Markdown

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

Resources/Textures/_CM14/Actions/scope_actions.rsi

State Old New Status
sniperscope Added

Resources/Textures/_CM14/Objects/Weapons/Guns/Attachments/barrel.rsi

State Old New Status
amateba_long Added
amateba_long_a Added
amateba_medium Added
amateba_medium_a Added
amateba_short Added
amateba_short_a Added
aug_dmr_barrel_a Added
aug_mkey_barrel_a Added
bayonet Added
bayonet_a Added
c_ebarrel_vented Added
c_ebarrel_vented_a Added
c_m10_overcomp Added
c_m10_overcomp_a Added
c_m10_overcomp_spike Added
c_m10_overcomp_spike_a Added
c_m4spr_barrel Added
c_m4spr_barrel_a Added
c_m4spr_custom_barrel Added
c_m4spr_custom_barrel_a Added
choke Added
choke_a Added
co2_bayonet-f_a Added
co2_bayonet_a Added
co2_knife-f Added
co2_knife Added
combatutilitya Added
combatutilitya_a Added
combatutilityb Added
combatutilityb_a Added
comp Added
comp_a Added
d_ebarrel_vented Added
d_ebarrel_vented_a Added
d_m10_overcomp Added
d_m10_overcomp_a Added
d_m10_overcomp_spike Added
d_m10_overcomp_spike_a Added
d_m4spr_barrel Added
d_m4spr_barrel_a Added
d_m4spr_custom_barrel Added
d_m4spr_custom_barrel_a Added
daggera Added
daggera_a Added
daggerb Added
daggerb_a Added
ebarrel Added
ebarrel_a Added
ebarrel_vented Added
ebarrel_vented_a Added
hbarrel Added
hbarrel_a Added
m10_overcomp Added
m10_overcomp_a Added
m10_overcomp_spike Added
m10_overcomp_spike_a Added
m40sd_suppressor Added
m40sd_suppressor_a Added
m4spr_barrel Added
m4spr_barrel_a Added
m4spr_custom_barrel Added
m4spr_custom_barrel_a Added
m56_barrel Added
m56c_barrel Added
m5spr2_barrel Added
m5spr2_barrel_a Added
m60barrel Added
magsg_barrel_a Added
mar50barrel Added
mar50barrel_a Added
mateba_long Added
mateba_long_a Added
mateba_medium Added
mateba_medium_a Added
mateba_short Added
mateba_short_a Added
npz92_suppressor Added
pmc_sniperbarrel Added
s_ebarrel_vented Added
s_ebarrel_vented_a Added
s_m10_overcomp Added
s_m10_overcomp_a Added
s_m10_overcomp_spike Added
s_m10_overcomp_spike_a Added
s_m4spr_barrel Added
s_m4spr_barrel_a Added
s_m4spr_custom_barrel Added
s_m4spr_custom_barrel_a Added
slavicbarrel Added
slavicstock Added
smartbarrel Added
sniperbarrel Added
spp_bayonet Added
spp_bayonet_a Added
suppressed_sniper_barrel Added
suppressor Added
suppressor2_a Added
suppressor_a Added
suppressor_sleek Added
suppressor_sleek_a Added
tantoa Added
tantoa_a Added
tantob Added
tantob_a Added
type73_suppressor Added
type88_barrel Added
u_ebarrel_vented Added
u_ebarrel_vented_a Added
u_m10_overcomp Added
u_m10_overcomp_a Added
u_m10_overcomp_spike Added
u_m10_overcomp_spike_a Added
u_m4spr_barrel Added
u_m4spr_barrel_a Added
u_m4spr_custom_barrel Added
u_m4spr_custom_barrel_a Added
uppmg_barrel Added
vulture_barrel Added

Resources/Textures/_CM14/Objects/Weapons/Guns/Attachments/rail.rsi

State Old New Status
autoloader Added
autoloader_a Added
boomslang-scope Added
boomslang-scope_a Added
c_boomslang-scope Added
c_boomslang-scope_a Added
c_vulture_scope Added
collisight Added
collisight_a Added
d_boomslang-scope Added
d_boomslang-scope_a Added
d_vulture_scope Added
flashlight-on Added
flashlight Added
flashlight_a-on Added
flashlight_a Added
huntingscope Added
huntingscope_a Added
iffbarrel Added
iffbarrel_a Added
m96s-scope Added
magnetic Added
magnetic_a Added
miniscope-nsg23 Added
miniscope-nsg23_a Added
miniscope Added
miniscope_a Added
miniscope_fp9000 Added
miniscope_fp9000_a Added
pmcscope Added
reddot Added
reddot_a Added
reddot_small Added
reddot_small_a Added
reflex Added
reflex_a Added
rxfm5_eva_scope Added
rxfm5_eva_scope_a Added
s_boomslang-scope Added
s_boomslang-scope_a Added
s_vulture_scope Added
scope Added
scope2 Added
slavicscope Added
sniperscope Added
sniperscope_a Added
type88_scope Added
u_boomslang-scope Added
u_boomslang-scope_a Added
u_vulture_scope Added
vulture_scope Added
xm43e1_scope Added

Resources/Textures/_CM14/Objects/Weapons/Guns/Attachments/stock.rsi

State Old New Status
44stock-on Added
44stock Added
44stock_old Added
abr40stock Added
abr40stock_a Added
abr40stock_tac Added
abr40stock_tac_a Added
ar10_stock Added
boomslang-stock Added
c_boomslang-stock Added
c_m10_stock Added
c_m10_stock_a Added
c_r4t-stock Added
c_stock Added
c_vulture_stock Added
c_xm51_stock Added
d_boomslang-stock Added
d_m10_stock Added
d_m10_stock_a Added
d_r4t-stock Added
d_stock Added
d_vulture_stock Added
d_xm51_stock Added
db-stock Added
hg3717_stock Added
hjra_breech Added
huntingstock Added
l42stock Added
l42stock_a Added
lpo80-stock Added
m10_stock Added
m10_stock_a Added
m16-folding-on Added
m16-folding Added
m16-stock Added
m16a5-stock Added
m44r_stock Added
m54-folding-on Added

Edit: diff updated after 382642e

@github-actions github-actions Bot added the S: Merge Conflict Статус: Необходимо устранить конфликты слияния перед тем, как PR можно будет принять. label Aug 21, 2026
@github-actions

Copy link
Copy Markdown

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

@github-actions github-actions Bot removed the S: Merge Conflict Статус: Необходимо устранить конфликты слияния перед тем, как PR можно будет принять. label Aug 21, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changes: Audio Изменение затронуло файлы ".ogg". Changes: C# Изменение затронуло файлы ".cs". Changes: Localization Изменение затронуло файлы ".ftl". Changes: Sprites Изменение затронуло файлы ".rsi" и/или ".png". Changes: UI Изменение затронуло файлы ".xaml". size/L PR изменяет 1000-4999 строк.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants