diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index b6a3775e142..a4e84c359eb 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -426,6 +426,17 @@
msg += "Their eye glows green."
to_chat(user, msg)
+/mob/living/silicon/robot/drone/self_diagnosis()
+ if(!is_component_functioning("diagnosis unit"))
+ return null
+
+ var/datum/robot_component/diagnosis_unit/C = components["diagnosis unit"]
+
+ var/dat = "
[src.name] Self-Diagnosis Report\n"
+ dat += "Self-Diagnosis System Report
| Brute Damage: | [bruteloss] |
| Electronics Damage: | [fireloss] |
| Powered: | [(!C.idle_usage || C.is_powered()) ? "Yes" : "No"] |
| Toggled: | [ C.toggled ? "Yes" : "No"] |
"
+
+ return dat
+
/mob/living/silicon/robot/drone/construction/welcome_drone()
to_chat(src, SPAN_NOTICE("You are a construction drone, an autonomous engineering and fabrication system.."))
to_chat(src, SPAN_NOTICE("You are assigned to a NanoTrasen construction project. The name is irrelevant. Your task is to complete construction and subsystem integration as soon as possible."))
diff --git a/html/changelogs/maint_drone_diagnostics.yml b/html/changelogs/maint_drone_diagnostics.yml
new file mode 100644
index 00000000000..4f73736cc6a
--- /dev/null
+++ b/html/changelogs/maint_drone_diagnostics.yml
@@ -0,0 +1,6 @@
+author: mikomyazaki
+
+delete-after: True
+
+changes:
+ - bugfix: "Maintenance Drone diagnostic screen now shows overall status rather than individual component status, as they cannot actually take component damage, only overall damage."
\ No newline at end of file