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

[MIRROR] ballistic goggles #2016

Merged
merged 4 commits into from
May 22, 2024
Merged

[MIRROR] ballistic goggles #2016

merged 4 commits into from
May 22, 2024

Conversation

SierraHelper
Copy link
Collaborator

Оригинальный PR: Baystation12#34539

🆑 Karl Johansson
rscadd: Adds ballistic goggles, goggles that provide a small amount of protection against shrapnel and explosions. Also featuring prescription and fake variants.
rscadd: Adds downgraded thermals and night vision accessories that can attach to helmets. Available for tator tots and tight-budgeted mercenaries alike for only 12TC!
rscadd: Adds HUDs and custom lenses that can attach to ballistic goggles.
/:cl:

Baystation12#34507 with corrections

@SierraHelper SierraHelper requested a review from a team as a code owner March 13, 2024 21:10
@github-actions github-actions bot added the ⛰️ Спрайты PR затрагивает спрайты label Mar 13, 2024
@SierraHelper SierraHelper added the 📜 CL валиден Ченджлог не содержит ошибок label Mar 13, 2024
UEDCommander and others added 3 commits May 22, 2024 21:53
# Conflicts:
#	code/modules/client/client_color.dm
#	code/modules/clothing/clothing_accessories.dm
#	icons/mob/onmob/onmob_head.dmi
@UEDCommander UEDCommander merged commit 6eaa93d into dev-sierra May 22, 2024
11 checks passed
@UEDCommander UEDCommander deleted the upstream-pr-34539 branch May 22, 2024 19:29
SierraHelper added a commit that referenced this pull request May 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🪞 MIR ЯОЯ ⛰️ Спрайты PR затрагивает спрайты 📜 CL валиден Ченджлог не содержит ошибок
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants