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.

Sign up for GitHub

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

UPP Heavy armour internal-storage fix #578

Merged
merged 2 commits into from
Nov 30, 2024
Merged

UPP Heavy armour internal-storage fix #578

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b6f32e
WHY
BonniePandora Nov 30, 2024
2606acf
Merge branch 'master' into UPP-heavy-armour-fix
BonniePandora Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions code/modules/clothing/suits/marine_armor/ert.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,6 @@
flags_inventory = BLOCKSHARPOBJ
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS

/obj/item/clothing/suit/storage/marine/faction/UPP/heavy/Initialize()
. = ..()
pockets.bypass_w_limit = list(
/obj/item/ammo_magazine/minigun,
/obj/item/ammo_magazine/pkp,
)

/obj/item/clothing/suit/storage/marine/faction/UPP/light
name = "\improper 6B72-03 pattern UPP armor"
desc = "Vintage UPP armor system Vadasz. Provides basic ballistic/shrapnel protection for armor crew or rear line forces with wraparound soft armor and ceramic composite chestplate. Lightweight, but lacking protection class and coverage. Still issued to the Territorial Guard and People's Armed Police tactical teams, and utilized by some spetznaz."
Expand Down