Skip to content

Респрайт магазинов#1051

Draft
sastr457 wants to merge 24 commits intodead-space-server:masterfrom
sastr457:mag
Draft

Респрайт магазинов#1051
sastr457 wants to merge 24 commits intodead-space-server:masterfrom
sastr457:mag

Conversation

@sastr457
Copy link

@sastr457 sastr457 commented Feb 8, 2026

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

Медиа

Требования

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

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

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

🆑

  • Добавлено: Респрайт всех использующихся магазинов и коробок с патронами!

@sastr457 sastr457 requested a review from KloopRE as a code owner February 8, 2026 10:20
@github-actions github-actions bot added S: Needs Review Статус: PR ждёт ревью от разработчика. size/M PR изменяет 100-999 строк. Changes: No C# Изменение не затронуло файлы ".cs". Changes: Sprites Изменение затронуло файлы ".rsi" и/или ".png". and removed size/M PR изменяет 100-999 строк. S: Needs Review Статус: PR ждёт ревью от разработчика. labels Feb 8, 2026
@github-actions
Copy link

github-actions bot commented Feb 8, 2026

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

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi

State Old New Status
base Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
mag-4 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi

State Old New Status
base Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
practice Modified
mag-4 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi

State Old New Status
base Modified
incendiary Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
practice Modified
uranium Modified
mag-4 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi

State Old New Status
base Modified
capbase Modified
incendiary Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
mag-cap-1 Modified
mag-cap-2 Modified
mag-cap-3 Modified
piercing Modified
practice Modified
uranium Modified
mag-4 Added
mag-cap-4 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi

State Old New Status
base Modified
incendiary Modified
incendiarydisplay Modified
mag-1 Modified
mag-2 Modified
practice Modified
uranium Modified
mag-3 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi

State Old New Status
base Modified
incendiary Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
mag-big-1 Modified
mag-big-2 Modified
mag-big-3 Modified
practice Modified
uranium Modified
mag-4 Added
mag-5 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi

State Old New Status
base Modified
beanbag Modified
flare Modified
incendiary Modified
lethal Modified
mag-1 Modified
mag-2 Modified
mag-beanbag-1 Modified
mag-beanbag-2 Modified
mag-flare-1 Modified
mag-flare-2 Modified
mag-incend-1 Modified
mag-incend-2 Modified
mag-practice-1 Modified
mag-practice-2 Modified
mag-slug-1 Modified
mag-slug-2 Modified
mag-tranq-1 Modified
mag-tranq-2 Modified
mag-uranium-1 Modified
mag-uranium-2 Modified
practice Modified
slug Modified
tranquilizer Modified
uranium Modified
mag-3 Removed
mag-4 Removed
mag-beanbag-3 Removed
mag-beanbag-4 Removed
mag-flare-3 Removed
mag-flare-4 Removed
mag-incend-3 Removed
mag-incend-4 Removed
mag-practice-3 Removed
mag-practice-4 Removed
mag-slug-3 Removed
mag-slug-4 Removed
mag-tranq-3 Removed
mag-tranq-4 Removed
mag-uranium-3 Removed
mag-uranium-4 Removed

Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi

State Old New Status
base-spent Modified
base Modified
beanbag-spent Modified
beanbag Modified
blank-spent Modified
blank Modified
depleted-uranium-spent Modified
depleted-uranium Modified
flare-spent Modified
flare Modified
improvised-spent Modified
improvised Modified
incendiary-spent Modified
incendiary Modified
practice-spent Modified
practice Modified
slug-spent Modified
slug Modified
tranquilizer-spent Modified
tranquilizer Modified

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi

State Old New Status
base Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
mag-4 Modified
mag-5 Modified
red-icon Modified
stripe Modified
practice Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi

State Old New Status
base Modified
mag-1 Modified
stripe Modified
mag-2 Added
mag-3 Added
mag-4 Added
practice Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi

State Old New Status
base Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
mag-4 Modified
mag-5 Removed
mag-6 Removed
mag-7 Removed

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi

State Old New Status
base Modified
mag-1 Modified
red Modified
stripe Modified
incendiary Added
practice Added
uranium Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi

State Old New Status
base Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
mag-4 Modified
mag-5 Modified
stripe Modified
incendiary Added
mag-6 Added
mag-7 Added
mag-8 Added
practice Added
uranium Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi

State Old New Status
base Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
mag-4 Modified
mag-5 Modified
red-icon Modified
stripe Modified
incendiary Added
mag-6 Added
practice Added
uranium Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi

State Old New Status
base Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
mag-4 Modified
mag-5 Modified
red-icon Modified
red Modified
stripe Modified
incendiary Added
mag-6 Added
mag-7 Added
practice Added
uranium Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi

State Old New Status
base Modified
mag-unshaded-1 Modified
mag-unshaded-2 Modified
mag-unshaded-3 Modified
mag-unshaded-4 Modified
mag-unshaded-5 Modified

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi

State Old New Status
base Modified
mag-1 Modified
stripe Modified
incendiary Added
practice Added
uranium Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi

State Old New Status
base Modified
beanbag Modified
mag-1 Modified
pellets Modified
slug Modified
incendiary Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi

State Old New Status
base Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
mag-4 Modified
mag-5 Modified

Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/ext_rifle_mag.rsi

State Old New Status
base Modified
mag-1 Modified

Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi

State Old New Status
base Modified
beanbag Modified
mag-1 Modified
pellets Modified
slug Modified
incendiary Added

Resources/Textures/_DeadSpace/Items/Toys/TommyGun/magazine.rsi

State Old New Status
base Modified
mag-1 Modified

Resources/Textures/_DeadSpace/Items/Toys/TommyGun/round_magazine.rsi

State Old New Status
base Modified
mag-1 Modified

Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_magazine.rsi

State Old New Status
base Modified
mag-1 Modified

Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_round_magazine.rsi

State Old New Status
base Modified
mag-1 Modified

Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Ares/magburn.rsi

State Old New Status
base Modified
mag-1 Modified

Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi

State Old New Status
base Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
practice Modified
mag-4 Added

Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi

State Old New Status
base Modified
mag-1 Modified
mag-2 Modified
mag-3 Modified
practice Modified
mag-4 Added
mag-5 Added

Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi

State Old New Status
base Modified
mag-practice-1 Modified
mag-practice-2 Modified
practice Modified
mag-practice-3 Removed
mag-practice-4 Removed

Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi

State Old New Status
base Modified
beanbag Modified
mag-1 Modified
pellets Modified
slug Modified

Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi

State Old New Status
base Modified
beanbag Modified
mag-1 Modified

Edit: diff updated after ebc733b

@github-actions github-actions bot added the size/M PR изменяет 100-999 строк. label Feb 8, 2026
@TheZuTi
Copy link

TheZuTi commented Feb 8, 2026

Разрешение от Урани или Желяшки?

@sastr457
Copy link
Author

sastr457 commented Feb 8, 2026

Разрешение от Урани или Желяшки?

https://discord.com/channels/1030160796401016883/1046304893360685147/1467059039816122460
Тио вот

@InspectorJele
Copy link

Разрешение от Урани или Желяшки?

https://discord.com/channels/1030160796401016883/1046304893360685147/1467059039816122460 Тио вот

чё за наёбка? окончательного решения что всё доделано мы не давали

@sastr457
Copy link
Author

sastr457 commented Feb 8, 2026

https://discord.com/channels/1030160796401016883/1046304893360685147/1470022542835187723
Ща фикс кину и все норм будет

@InspectorJele
Copy link

InspectorJele commented Feb 8, 2026

https://discord.com/channels/1030160796401016883/1046304893360685147/1470022542835187723 Ща фикс кину и все норм будет

переведи в драфт, во первых ты правки должен сделать все которые мы с урани сказали, во вторых нужно сделать голосование

@sastr457 sastr457 marked this pull request as draft February 8, 2026 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changes: No C# Изменение не затронуло файлы ".cs". Changes: Sprites Изменение затронуло файлы ".rsi" и/или ".png". size/M PR изменяет 100-999 строк.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants