Skip to content

Commit

Permalink
default integrated
Browse files Browse the repository at this point in the history
  • Loading branch information
morrowwolf committed Apr 6, 2024
1 parent f302a31 commit 7c7da06
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@
list("Marine Combat Boots", round(scale * 15), /obj/item/clothing/shoes/marine/knife, VENDOR_ITEM_REGULAR),
list("USCM Uniform", round(scale * 15), /obj/item/clothing/under/marine, VENDOR_ITEM_REGULAR),
list("Marine Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine, VENDOR_ITEM_REGULAR),
list("M10 Pattern Marine Helmet", round(scale * 15), /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR),
list("Marine Radio Headset", round(scale * 15), /obj/item/device/radio/headset/almayer/marine, VENDOR_ITEM_REGULAR),
list("M10 Pattern Marine Helmet with Integrated Headset", round(scale * 15), /obj/item/clothing/head/helmet/marine/attached_headset, VENDOR_ITEM_REGULAR),

list("WEBBINGS", -1, null, null),
list("Brown Webbing Vest", round(scale * 1.25), /obj/item/clothing/accessory/storage/black_vest/brown_vest, VENDOR_ITEM_REGULAR),
Expand Down
6 changes: 6 additions & 0 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,12 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
button.overlays.Cut()
button.overlays += image('icons/obj/items/clothing/helmet_visors.dmi', button, action_icon_state)

/obj/item/clothing/head/helmet/marine/attached_headset/Initialize(mapload, list/new_protection)
. = ..()

var/obj/item/device/radio/headset/almayer/marine/temp_helmet = new()
AddComponent(/datum/component/attached_headset, null, temp_helmet, WEAR_HEAD)

/obj/item/clothing/head/helmet/marine/tech
name = "\improper M10 technician helmet"
desc = "A modified M10 marine helmet for ComTechs. Features a toggleable welding screen for eye protection."
Expand Down

0 comments on commit 7c7da06

Please sign in to comment.