diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index 7304681bf6b..1cd91b7c9a4 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -346,6 +346,8 @@
 /obj/structure/closet/wardrobe/robotics_black/New()
 	..()
 	sleep(2)
+	new /obj/item/clothing/glasses/hud/diagnostic(src)
+	new /obj/item/clothing/glasses/hud/diagnostic(src)
 	new /obj/item/clothing/under/rank/roboticist(src)
 	new /obj/item/clothing/under/rank/roboticist(src)
 	new /obj/item/clothing/suit/storage/labcoat(src)
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 1c5aa131e68..680cc62645c 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -47,10 +47,19 @@
 
 /obj/item/clothing/glasses/hud/diagnostic
 	name = "Diagnostic HUD"
-	desc = "A heads-up display that scans silicons"
-	icon_state = "healthhud"
+	desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits."
+	icon_state = "diagnostichud"
 	HUDType = DATA_HUD_DIAGNOSTIC
 
+/obj/item/clothing/glasses/hud/diagnostic/night
+	name = "Night Vision Diagnostic HUD"
+	desc = "A robotics diagnostic HUD fitted with a light amplifier."
+	icon_state = "diagnostichudnight"
+	item_state = "glasses"
+	darkness_view = 8
+	see_darkness = 0
+	prescription_upgradable = 0
+
 /obj/item/clothing/glasses/hud/security
 	name = "\improper Security HUD"
 	desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records."
diff --git a/code/modules/mob/living/carbon/death.dm b/code/modules/mob/living/carbon/death.dm
new file mode 100644
index 00000000000..fca8c59fec3
--- /dev/null
+++ b/code/modules/mob/living/carbon/death.dm
@@ -0,0 +1,5 @@
+/mob/living/carbon/death(gibbed)
+	losebreath = 0
+	med_hud_set_health()
+	med_hud_set_status()
+	..(gibbed)
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index ac165d9dd6e..96013d6e1bf 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -26,8 +26,8 @@
 				med_hud_set_status()
 	if(stat == CONSCIOUS && (src in dead_mob_list)) //Defib fix
 		update_revive()
-		med_hud_set_health()
-		med_hud_set_status()
+	med_hud_set_health()
+	med_hud_set_status()
 
 /mob/living/carbon/human/adjustBrainLoss(var/amount)
 	if(status_flags & GODMODE)
diff --git a/code/modules/research/designs/equipment_designs.dm b/code/modules/research/designs/equipment_designs.dm
index ff771957574..f3a75f69d61 100644
--- a/code/modules/research/designs/equipment_designs.dm
+++ b/code/modules/research/designs/equipment_designs.dm
@@ -141,3 +141,23 @@
 	materials = list(MAT_METAL = 250, MAT_GLASS = 300, MAT_PLASMA = 250, MAT_URANIUM = 1000)
 	build_path = /obj/item/clothing/glasses/science/night
 	category = list("Equipment")
+
+/datum/design/diagnostic_hud
+	name = "Diagnostic HUD"
+	desc = "A HUD used to analyze and determine faults within robotic machinery."
+	id = "dianostic_hud"
+	req_tech = list("magnets" = 3, "engineering" = 3, "materials" = 2)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/clothing/glasses/hud/diagnostic
+	category = list("Equipment")
+
+/datum/design/diagnostic_hud_night
+	name = "Night Vision Diagnostic HUD"
+	desc = "Upgraded version of the diagnostic HUD designed to function during a power failure."
+	id = "dianostic_hud_night"
+	req_tech = list("magnets" = 5, "engineering" = 4, "materials" = 4)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$plasma" = 300)
+	build_path = /obj/item/clothing/glasses/hud/diagnostic/night
+	category = list("Equipment")
diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi
index fb089d6455f..7990a759870 100644
Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index c41b8e60053..a693661b5b0 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ
diff --git a/paradise.dme b/paradise.dme
index 20a6adf8531..4e59a1ab3c5 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1316,6 +1316,7 @@
 #include "code\modules\mob\living\carbon\carbon.dm"
 #include "code\modules\mob\living\carbon\carbon_defenses.dm"
 #include "code\modules\mob\living\carbon\carbon_defines.dm"
+#include "code\modules\mob\living\carbon\death.dm"
 #include "code\modules\mob\living\carbon\give.dm"
 #include "code\modules\mob\living\carbon\life.dm"
 #include "code\modules\mob\living\carbon\shock.dm"