diff --git a/code/datums/components/attached_headset.dm b/code/datums/components/attached_headset.dm index 1ad680c68e..e140af6c8f 100644 --- a/code/datums/components/attached_headset.dm +++ b/code/datums/components/attached_headset.dm @@ -25,6 +25,8 @@ item_parent = parent if(!icon_exists(item_parent.icon, item_parent.icon_state + "_hs", FALSE)) + if(user) + to_chat(user, SPAN_NOTICE("[headset] doesn't seem to support an integrated headset.")) return COMPONENT_INCOMPATIBLE_NO_ERROR if(!activation_slot) @@ -35,6 +37,8 @@ if(user) user.drop_inv_item_on_ground(headset) + to_chat(user, SPAN_NOTICE("You attach [headset] to [parent].")) + playsound(user, 'sound/effects/gunrustle1.ogg', 20, TRUE) headset.moveToNullspace() @@ -48,7 +52,8 @@ headset = null - item_parent.icon_state = parent_initial_icon_state + if(parent_initial_icon_state) + item_parent.icon_state = parent_initial_icon_state item_parent = null @@ -124,6 +129,7 @@ if(parent != user.r_hand && parent != user.l_hand) return + playsound(user, 'sound/items/Screwdriver.ogg', 20, TRUE) to_chat(user, SPAN_NOTICE("You use [attacking_item] to take [headset] off of [parent].")) user.put_in_hands(headset) qdel(src) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 22d6905159..0832e9b178 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -593,6 +593,11 @@ desc = "A standard marine radio headset. When worn, grants access to Squad Leader tracker. Click tracker with empty hand to open Squad Info window." frequency = ALPHA_FREQ +/obj/item/device/radio/headset/almayer/marine/lead + name = "marine leader radio headset" + desc = "This is used by a marine squad leader. Channels are as follows: :v - marine command, :j - JTAC. When worn, grants access to Squad Leader tracker. Click tracker with empty hand to open Squad Info window." + initial_keys = list(/obj/item/device/encryptionkey/squadlead) + //############################## ALPHA ############################### /obj/item/device/radio/headset/almayer/marine/alpha name = "marine alpha radio headset" diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 586832e746..4f51c84922 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -88,7 +88,7 @@ new /obj/item/ammo_magazine/rifle/m41aMK1(src) new /obj/item/ammo_magazine/rifle/m41aMK1(src) new /obj/item/ammo_magazine/rifle/m41aMK1(src) - new /obj/item/clothing/head/helmet/marine/leader(src) + new /obj/item/clothing/head/helmet/marine/leader/attached_headset(src) new /obj/item/device/binoculars/range/designator(src) new /obj/item/device/whistle(src) @@ -115,7 +115,7 @@ /obj/structure/closet/secure_closet/squad_sergeant/Initialize() . = ..() - new /obj/item/clothing/head/helmet/marine/rto(src) + //new /obj/item/clothing/head/helmet/marine/rto/attached_headset(src) //add attached_headset version - Morrow new /obj/item/device/binoculars/range/designator(src) new /obj/item/device/whistle(src) @@ -162,12 +162,3 @@ new /obj/item/ammo_magazine/smartgun(src) new /obj/item/storage/belt/marine/smartgunner/standard(src) new /obj/item/storage/belt/gun/smartgunner/standard(src) - -/obj/structure/closet/cryo/Initialize() - . = ..() - new /obj/item/clothing/under/marine(src) - new /obj/item/clothing/under/marine(src) - new /obj/item/clothing/shoes/marine/knife(src) - new /obj/item/clothing/shoes/marine/knife(src) - new /obj/item/device/radio/headset/almayer/marine(src) - new /obj/item/device/radio/headset/almayer/marine(src) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index d184416b39..8c5bda2190 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -733,8 +733,8 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /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) + var/obj/item/device/radio/headset/almayer/marine/temp_headset = new() + AddComponent(/datum/component/attached_headset, null, temp_headset, WEAR_HEAD) /obj/item/clothing/head/helmet/marine/tech name = "\improper M10 technician helmet" @@ -806,6 +806,12 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( armor_bio = CLOTHING_ARMOR_MEDIUMHIGH specialty = "M11 pattern marine" +/obj/item/clothing/head/helmet/marine/leader/attached_headset/Initialize(mapload, list/new_protection) + . = ..() + + var/obj/item/device/radio/headset/almayer/marine/lead/temp_headset = new() + AddComponent(/datum/component/attached_headset, null, temp_headset, WEAR_HEAD) + /obj/item/clothing/head/helmet/marine/rto name = "\improper M12 pattern dust helmet" desc = "An experimental brain-bucket. A dust ruffle hangs from back instead of the standard lobster shell design. Moderately better at deflecting blunt objects at the cost of humiliation, can also hold a second visor optic. But who will be laughing at the memorial? Not you, you'll be busy getting medals for your fantastic leadership." @@ -816,6 +822,14 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( specialty = "M12 pattern" max_inserted_visors = 2 +/* +/obj/item/clothing/head/helmet/marine/rto/attached_headset/Initialize(mapload, list/new_protection) + . = ..() + + var/obj/item/device/radio/headset/almayer/marine/temp_headset = new() + AddComponent(/datum/component/attached_headset, null, temp_headset, WEAR_HEAD) +*/ + /obj/item/clothing/head/helmet/marine/rto/intel name = "\improper XM12 pattern intelligence helmet" desc = "An experimental brain-bucket. A dust ruffle hangs from back. Moderately better at deflecting blunt objects at the cost of humiliation, can also hold a second visor optic. But who will be laughing at the memorial? Not you, you'll be busy getting medals for your intel work."