Movie Accurate M10s And Minor Tweaks

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 ###############################

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,

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)