diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm
index 6eee1ac7a7..fcd5a372d4 100644
--- a/code/modules/mob/living/carbon/alien/life.dm
+++ b/code/modules/mob/living/carbon/alien/life.dm
@@ -19,9 +19,6 @@
 	handle_regular_status_updates()
 	update_icons()
 
-	if(client)
-		handle_regular_hud_updates()
-
 /mob/living/carbon/alien/handle_mutations_and_radiation()
 
 	// Currently both Dionaea and larvae like to eat radiation, so I'm defining the
@@ -100,7 +97,7 @@
 
 	return 1
 
-/mob/living/carbon/alien/proc/handle_regular_hud_updates()
+/mob/living/carbon/alien/handle_regular_hud_updates()
 
 	if (stat == 2 || (XRAY in src.mutations))
 		sight |= SEE_TURFS
diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm
index f4758cb335..ca0d1aa1de 100644
--- a/code/modules/mob/living/carbon/brain/life.dm
+++ b/code/modules/mob/living/carbon/brain/life.dm
@@ -15,9 +15,6 @@
 	//Status updates, death etc.
 	handle_regular_status_updates()
 
-	if(client)
-		handle_regular_hud_updates()
-
 /mob/living/carbon/brain/handle_mutations_and_radiation()
 	if (radiation)
 		if (radiation > 100)
@@ -181,7 +178,7 @@
 		handle_statuses()
 	return 1
 
-/mob/living/carbon/brain/proc/handle_regular_hud_updates()
+/mob/living/carbon/brain/handle_regular_hud_updates()
 	if (stat == 2 || (XRAY in src.mutations))
 		sight |= SEE_TURFS
 		sight |= SEE_MOBS
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 9b1183e75e..e9d55414bd 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -96,8 +96,6 @@
 	//Update our name based on whether our face is obscured/disfigured
 	name = get_visible_name()
 
-	handle_regular_hud_updates()
-
 	pulse = handle_pulse()
 
 /mob/living/carbon/human/breathe()
@@ -1076,7 +1074,7 @@
 
 	return 1
 
-/mob/living/carbon/human/proc/handle_regular_hud_updates()
+/mob/living/carbon/human/handle_regular_hud_updates()
 	if(!overlays_cache)
 		overlays_cache = list()
 		overlays_cache.len = 23
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index 5cd668cc40..7214f2e18f 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -45,6 +45,9 @@
 
 	update_canmove()
 
+	if(client)
+		handle_regular_hud_updates()
+
 /mob/living/proc/handle_breathing()
 	return
 
@@ -70,3 +73,25 @@
 	if(pulling)
 		if(incapacitated())
 			stop_pulling()
+
+//this handles hud updates. Calls update_vision() and handle_hud_icons()
+/mob/living/proc/handle_regular_hud_updates()
+	if(!client)	return 0
+
+	handle_vision()
+	handle_hud_icons()
+
+	return 1
+
+/mob/living/proc/handle_vision()
+	return
+
+/mob/living/proc/update_sight()
+	return
+
+/mob/living/proc/handle_hud_icons()
+	handle_hud_icons_health()
+	return
+
+/mob/living/proc/handle_hud_icons_health()
+	return
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index bd3e280f68..6051c9c122 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -144,7 +144,7 @@
 
 	return 1
 
-/mob/living/silicon/robot/proc/handle_regular_hud_updates()
+/mob/living/silicon/robot/handle_regular_hud_updates()
 
 	if (src.stat == 2 || XRAY in mutations || src.sight_mode & BORGXRAY)
 		src.sight |= SEE_TURFS