diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 90ff96fbb6..0b860b18d8 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -10,6 +10,7 @@ subspace_transmission = 1 canhear_range = 0 // can't hear headsets from very far away + flags_equip_slot = SLOT_EAR inherent_traits = list(TRAIT_ITEM_EAR_EXCLUSIVE) var/translate_apollo = FALSE @@ -631,6 +632,14 @@ /obj/item/device/radio/headset/almayer/marine name = "marine radio headset" desc = "A standard marine radio headset. When worn, grants access to Squad Leader tracker. Click tracker with empty hand to open Squad Info window." + icon = 'icons/obj/items/clothing/cm_hats.dmi' + icon_override = 'icons/mob/humans/onmob/head_1.dmi' + icon_state = "uscm_headset" + item_state = "uscm_headset" + item_icons = list( + WEAR_L_EAR = 'icons/mob/humans/onmob/head_1.dmi', + WEAR_R_EAR = 'icons/mob/humans/onmob/head_1.dmi', + ) frequency = ALPHA_FREQ //############################## ALPHA ############################### diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index caa38d8888..20a30abe61 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -346,9 +346,6 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/paper = "paper", /obj/item/device/flashlight/flare = "flare", /obj/item/clothing/head/headset = "headset", - /obj/item/clothing/accessory/patch = "uscmpatch", - /obj/item/clothing/accessory/patch/falcon = "falconspatch", - /obj/item/clothing/accessory/patch/devils = "devilspatch", /obj/item/ammo_magazine/handful = "bullet", /obj/item/prop/helmetgarb/riot_shield = "helmet_riot_shield", /obj/item/attachable/flashlight = HELMET_GARB_RELAY_ICON_STATE, diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index b36e15eff5..8a267d5945 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -569,7 +569,7 @@ /obj/item/ammo_magazine/rifle, ) -/obj/item/storage/internal/accessory/black_vest/m3/shotgun +/obj/item/storage/internal/accessory/black_vest/m3shotgun can_hold = list( /obj/item/ammo_magazine/handful, ) @@ -589,14 +589,12 @@ /obj/item/storage/internal/accessory/black_vest storage_slots = 5 -/obj/item/storage/internal/accessory/black_vest/m3 - -/obj/item/storage/internal/accessory/black_vest/m3/generic +/obj/item/storage/internal/accessory/black_vest/m3generic cant_hold = list( /obj/item/ammo_magazine/handful/shotgun, ) -/obj/item/storage/internal/accessory/black_vest/m3/m40 +/obj/item/storage/internal/accessory/black_vest/m3grenade storage_slots = 6 can_hold = list( /obj/item/explosive/grenade/high_explosive, @@ -1142,7 +1140,7 @@ name = "\improper M3 Pattern Shell Webbing" desc = "A sturdy mess of synthcotton belts and buckles, ready to share your burden." icon_state = "m3webbingshotgun" - hold = /obj/item/storage/internal/accessory/black_vest/m3/shotgun + hold = /obj/item/storage/internal/accessory/black_vest/m3shotgun /obj/item/clothing/accessory/storage/webbing/m3 name = "\improper M3 Pattern Webbing" @@ -1161,13 +1159,13 @@ name = "\improper M3 Pattern Grenade Webbing" desc = "A sturdy mess of synthcotton belts and buckles, ready to share your burden." icon_state = "m3webbingm40" - hold = /obj/item/storage/internal/accessory/black_vest/m3/m40 + hold = /obj/item/storage/internal/accessory/black_vest/m3grenade /obj/item/clothing/accessory/storage/black_vest/m3 name = "\improper M3 Pattern Small Pouch Webbing" desc = "A sturdy mess of synthcotton belts and buckles, ready to share your burden." icon_state = "m3webbingsmall" - hold = /obj/item/storage/internal/accessory/black_vest/m3/generic + hold = /obj/item/storage/internal/accessory/black_vest/m3generic slot = ACCESSORY_SLOT_M3UTILITY /obj/item/clothing/accessory/storage/black_vest/m3/Initialize(mapload) diff --git a/icons/mob/humans/onmob/ears.dmi b/icons/mob/humans/onmob/ears.dmi index 3482dcf6fe..cc9cbffda6 100644 Binary files a/icons/mob/humans/onmob/ears.dmi and b/icons/mob/humans/onmob/ears.dmi differ diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi index cd7acbc920..ebbdf944fc 100644 Binary files a/icons/mob/humans/onmob/head_1.dmi and b/icons/mob/humans/onmob/head_1.dmi differ diff --git a/icons/mob/humans/onmob/helmet_garb.dmi b/icons/mob/humans/onmob/helmet_garb.dmi index cd225f4bdb..6f5fd94c9f 100644 Binary files a/icons/mob/humans/onmob/helmet_garb.dmi and b/icons/mob/humans/onmob/helmet_garb.dmi differ diff --git a/icons/obj/items/clothing/cm_hats.dmi b/icons/obj/items/clothing/cm_hats.dmi index 365cbb9c68..ab74b44c28 100644 Binary files a/icons/obj/items/clothing/cm_hats.dmi and b/icons/obj/items/clothing/cm_hats.dmi differ