Skip to content

Commit

Permalink
Merge pull request #5765 from Ryan180602/marshalarmour
Browse files Browse the repository at this point in the history
Assorted Marshal armour changes
  • Loading branch information
Trilbyspaceclone authored Oct 15, 2024
2 parents 267e176 + 4e4eaa1 commit 2f403e1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1486,18 +1486,18 @@

/obj/item/clothing/head/helmet/bulletproof/ironhammer_nvg/update_icon()
if(hud in src)
icon_state = "bulletproof_ironhammer"
icon_state = "bulletproof_ironhammer_nv"
set_light(0, 0)
else
icon_state = "bulletproof_ironhammer_on"
icon_state = "bulletproof_ironhammer_nv_on"
set_light(1, 1, COLOR_LIGHTING_GREEN_MACHINERY)
update_wear_icon()
..()

//Thermal
/obj/item/clothing/head/helmet/bulletproof/ironhammer_thermal
name = "marshal thermo-nightvision helmet"
desc = "A bulletproof security helmet that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent. \
desc = "A bulletproof security helmet with mandibles that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent. \
Comes with inbuilt thermal imaging HUD."
icon_state = "bulletproof_ironhammer_thermal"
body_parts_covered = HEAD|EARS
Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/suits/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1094,15 +1094,15 @@
name = "webbed operator armor"
desc = "An armored vest that protects against some damage. This one has been done in Nadezhda Marshal colors and has various pouches and straps attached."
icon_state = "webvest_ironhammer"
slowdown = 0.1
armor_list = list(
melee =8,
bullet = 8,
energy = 8,
bomb = 10,
bio = 0,
rad = 0
) //we get the same armor as a regular marshal vest, but a bit of slowdown and limited coverage.
)
body_parts_covered = UPPER_TORSO //we get the same armor as a regular marshal vest with limited coverage.

//Provides the protection of a merc voidsuit, but only covers the chest/groin, and also takes up a suit slot. In exchange it has no slowdown and provides storage.
/obj/item/clothing/suit/storage/vest/merc
Expand Down
Binary file modified icons/inventory/head/icon.dmi
Binary file not shown.
Binary file modified icons/inventory/head/mob.dmi
Binary file not shown.

0 comments on commit 2f403e1

Please sign in to comment.