Earmuff Things (#10759)

code/game/objects/items/devices/radio/headset.dm

@@ -71,6 +71,18 @@
 			return ..(freq, level)
 	return -1
 
+/obj/item/device/radio/headset/attack_hand(mob/user)
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		if(H.l_ear != src && H.r_ear != src)
+			return ..()
+
+		if(slot_flags & SLOT_TWOEARS)
+			var/obj/item/clothing/ears/OE = (H.l_ear == src ? H.r_ear : H.l_ear)
+			qdel(OE)
+	
+	..()
+
 /obj/item/device/radio/headset/attackby(obj/item/W, mob/user)
 	if(W.isscrewdriver())
 		if(keyslot1 || keyslot2)
@@ -388,6 +400,16 @@
 	translate_hivenet = 1
 	ks2type = /obj/item/device/encryptionkey/hivenet
 
+/obj/item/device/radio/headset/earmuff
+	name = "earmuffs"
+	desc = "Protects your hearing from loud noises, and quiet ones as well."
+	desc_antag = "This set of earmuffs has a secret compartment housing radio gear, allowing it to function as a standard headset."
+	icon = 'icons/obj/clothing/ears.dmi'
+	icon_state = "earmuffs"
+	item_state = "earmuffs"
+	item_flags = SOUNDPROTECTION
+	slot_flags = SLOT_EARS | SLOT_TWOEARS
+
 /obj/item/device/radio/headset/syndicate
 	name = "military headset"
 	icon_state = "syn_headset"

code/game/objects/items/weapons/grenades/flashbang.dm

@@ -41,7 +41,7 @@
 		eye_safety = M.eyecheck(TRUE)
 		if(ishuman(M))
 			var/mob/living/carbon/human/H = M
-			if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs))
+			if(H.protected_from_sound())
 				ear_safety += 2
 			if(HULK in H.mutations)
 				ear_safety += 1

code/game/objects/structures/crates_lockers/closets/fitness.dm

@@ -52,6 +52,8 @@
 	icon_closed = "red"
 
 /obj/structure/closet/lasertag/red/fill()
+	new /obj/item/clothing/ears/earmuffs(src)
+	new /obj/item/clothing/ears/earmuffs(src)
 	new /obj/item/gun/energy/lasertag/red(src)
 	new /obj/item/gun/energy/lasertag/red(src)
 	new /obj/item/clothing/suit/redtag(src)
@@ -65,7 +67,9 @@
 	icon_closed = "blue"
 
 /obj/structure/closet/lasertag/blue/fill()
+	new /obj/item/clothing/ears/earmuffs(src)
+	new /obj/item/clothing/ears/earmuffs(src)
 	new /obj/item/gun/energy/lasertag/blue(src)
 	new /obj/item/gun/energy/lasertag/blue(src)
 	new /obj/item/clothing/suit/bluetag(src)
-	new /obj/item/clothing/suit/bluetag(src)
+	new /obj/item/clothing/suit/bluetag(src)