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

TacSec 2 #2266

Merged
merged 6 commits into from
Dec 8, 2024
Merged

TacSec 2 #2266

merged 6 commits into from
Dec 8, 2024

Conversation

RobUster0
Copy link

Описание PR

Обновление лодаута тактической охраны и обновление спрайтов!

Медиа

image

Проверки

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

Изменения

🆑 Vimenant - add: Добавлены баллистические очки и тактические перчатки для офицеров СБ! - tweak: Обновлены спрайты очков СБ и серого бронежилета! Обновлена иконка защитного набора СБ и спрайт для воксов!

@github-actions github-actions bot added the Merge Conflict Some content has conflicts. label Nov 20, 2024
Copy link

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

@github-actions github-actions bot added Changes: Sprites Изменение затронуло файлы ".rsu / .png" Changes: Localization Изменение затронуло файлы ".ftl" Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" labels Nov 20, 2024
Copy link

github-actions bot commented Nov 20, 2024

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

Resources/Textures/SS220/Clothing/Neck/Misc/tactical.rsi

State Old New Status
icon Modified
equipped-NECK-vox Added

Resources/Textures/SS220/Clothing/Eyes/Glasses/secballistic.rsi

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

Resources/Textures/SS220/Clothing/Eyes/Glasses/secglasses.rsi

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

Resources/Textures/SS220/Clothing/Hands/Gloves/sectactical.rsi

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

Resources/Textures/SS220/Clothing/OuterClothing/Armor/security_slim.rsi

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

Edit: diff updated after 8ae72d4

@stalengd stalengd self-assigned this Nov 28, 2024
@Kirus59
Copy link
Collaborator

Kirus59 commented Dec 3, 2024

Конфликтики

@github-actions github-actions bot removed the Merge Conflict Some content has conflicts. label Dec 7, 2024
@stalengd stalengd merged commit 45b37e9 into SerbiaStrong-220:master Dec 8, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение затронуло файлы ".ftl" Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" Changes: Sprites Изменение затронуло файлы ".rsu / .png" Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants