Merge branch 'upstream-master' into placeholder

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

@@ -177,6 +177,8 @@
 
 /obj/item/device/radio/headset/alt/double
 	name = "soundproof headset"
+	desc = "A sound isolating version of the common radio headset."
+	desc_info = "This radio doubles as a pair of earmuffs by providing sound protection."
 	icon_state = "earset"
 	item_state = "earset"
 	item_flags = SOUNDPROTECTION
@@ -184,6 +186,8 @@
 
 /obj/item/device/radio/headset/wrist
 	name = "wristbound radio"
+	desc = "A radio designed to fit on the wrist. Often known for broadcasting loudly enough that those closeby might overhear it."
+	desc_info = "This radio can be heard by people standing next to the one wearing it."
 	icon_state = "wristset"
 	item_state = "wristset"
 	slot_flags = SLOT_WRISTS

code/game/objects/items/devices/scanners.dm

@@ -639,7 +639,7 @@ BREATH ANALYZER
 	name = "zeng-hu body analyzer"
 	desc = "An expensive and varied-use health analyzer that prints full-body scans after a short scanning delay."
 	icon_state = "zh-analyzer"
-	item_state = "healthanalyzer"
+	item_state = "zh-analyzer"
 	slot_flags = SLOT_BELT
 	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 3)