forked from space-wizards/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 154
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
TacSec 2 #2266
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
Changes: Sprites
Изменение затронуло файлы ".rsu / .png"
Changes: Localization
Изменение затронуло файлы ".ftl"
Changes: Prototypes
Изменение затронуло файлы ".yml" кроме неймспейса "maps"
labels
Nov 20, 2024
RSI Diff Bot; head commit 8ae72d4 merging into 48ca915 Resources/Textures/SS220/Clothing/Neck/Misc/tactical.rsi
Resources/Textures/SS220/Clothing/Eyes/Glasses/secballistic.rsi
Resources/Textures/SS220/Clothing/Eyes/Glasses/secglasses.rsi
Resources/Textures/SS220/Clothing/Hands/Gloves/sectactical.rsi
Resources/Textures/SS220/Clothing/OuterClothing/Armor/security_slim.rsi
|
EstKemran
approved these changes
Nov 23, 2024
stalengd
approved these changes
Nov 23, 2024
Конфликтики |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Описание PR
Обновление лодаута тактической охраны и обновление спрайтов!
Медиа
Проверки
Изменения
🆑 Vimenant - add: Добавлены баллистические очки и тактические перчатки для офицеров СБ! - tweak: Обновлены спрайты очков СБ и серого бронежилета! Обновлена иконка защитного набора СБ и спрайт для воксов!