Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

противогаз, берцы, правка тельняшки #424

Merged
merged 11 commits into from
Feb 22, 2024

Conversation

PyotrIgn
Copy link
Collaborator

@PyotrIgn PyotrIgn commented Feb 20, 2024

Контент СССП для предстоящего ивента

  • Противогаз, берцы, респрайт тельняшки
  • Бронежилет, шлем и рюкзак
  • Настенные украшения (флаги)
  • ТОНК (пока сломанный)
  • Плакаты
  • Удостоверение
  • Оружие
  • Гранатометы
  • Шкафчик со снаряжением
  • Спавнер базового бойца
  • Спавнер заряженных бойцов
  • Профессии, доступы и иконки
  • Канал связи СССП и гарнитура под него

Copy link
Contributor

github-actions bot commented Feb 20, 2024

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

Resources/Textures/ADT/Clothing/Underwear/Top/telnyachka.rsi

State Old New Status
icon Modified
equipped-INNERCLOTHING Removed
equipped-UNDERWEARB Added

Resources/Textures/ADT/Clothing/Back/backpack_RKS2.rsi

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

Resources/Textures/ADT/Clothing/Head/Helmets/ussp_sfera.rsi

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

Resources/Textures/ADT/Clothing/Mask/usspgasmask.rsi

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

Resources/Textures/ADT/Clothing/OuterClothing/Armor/ussp_kzs1.rsi

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

Resources/Textures/ADT/Interface/Misc/job_icons.rsi

State Old New Status
JobIconUSSPArmyOfficer Added
JobIconUSSPArmyPrivate Added

Resources/Textures/ADT/Objects/Decoration/poster_ussp.rsi

State Old New Status
bkf Added
kdv Added
kdv2 Added
ks Added
ks2 Added
rhbz Added
ussp Added
ussp2 Added

Resources/Textures/ADT/Objects/Decoration/tank_etp145.rsi

State Old New Status
etp145 Added

Resources/Textures/ADT/Objects/Misc/USSP_idcard.rsi

State Old New Status
private Added

Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/LMG/rpkdrum_magazine.rsi

State Old New Status
base Added
icon Added
mag-1 Added

Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/LMG/ussp_lmg_box.rsi

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

Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/ak74_magazine.rsi

State Old New Status
base Added
icon Added
mag-1 Added

Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/akmbacelite_magazine.rsi

State Old New Status
base Added
icon Added
mag-1 Added

Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/bizon_magazine.rsi

State Old New Status
base Added
icon Added
mag-1 Added

Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/sr2m_magazine.rsi

State Old New Status
base Added
icon Added
mag-1 Added

Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/sr3m_magazine.rsi

State Old New Status
base Added
icon Added
mag-1 Added

Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Sniper/svch_magazine.rsi

State Old New Status
base Added
icon Added
mag-1 Added

Resources/Textures/ADT/Objects/Weapons/Guns/LMG/PKP60.rsi

State Old New Status
base Added
bolt-open Added
equipped-BACKPACK Added
equipped-SUITSTORAGE Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/ADT/Objects/Weapons/Guns/LMG/RPK.rsi

State Old New Status
base Added
bolt-open Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added

Resources/Textures/ADT/Objects/Weapons/Guns/LMG/RPM40.rsi

State Old New Status
base Added
bolt-open Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added
mag-1 Added
mag-2 Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/ADT/Objects/Weapons/Guns/Launchers/sapog.rsi

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

Resources/Textures/ADT/Objects/Weapons/Guns/Launchers/schmel.rsi

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

Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/ussp_rocketlauncher.rsi

State Old New Status
heat Added
heat2 Added
schmel Added
schmel2 Added

Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/ak55.rsi

State Old New Status
base Added
bolt-open Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added

Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/bizon.rsi

State Old New Status
base Added
bolt-open Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added

Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/sr2m.rsi

State Old New Status
base Added
bolt-open Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added

Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/sr3m.rsi

State Old New Status
base Added
bolt-open Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added

Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/svch_igla.rsi

State Old New Status
base Added
bolt-open Added
equipped-BACKPACK Added
equipped-SUITSTORAGE Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/ADT/Objects/Weapons/Melee/ussp_barzai_knife.rsi

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

Edit: diff updated after d342944

Copy link
Collaborator

@Schrodinger71 Schrodinger71 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

аванс-апвув

@github-actions github-actions bot removed the No C# label Feb 20, 2024
@PyotrIgn PyotrIgn merged commit d142116 into AdventureTimeSS14:master Feb 22, 2024
8 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants