hud_updateflag purge!

EXTERMINATUS BITCH

code/__DEFINES/hud.dm

@@ -17,8 +17,8 @@
 #define STATUS_HUD_OOC		"12" // STATUS_HUD without virus db check for someone being ill.
 
 //for antag huds. these are used at the /mob level
-#define SPECIALROLE_HUD 		"12"
+#define SPECIALROLE_HUD 		"13"
-#define NATIONS_HUD		"13" //Show nations icons during nations gamemode
+#define NATIONS_HUD		"14" //Show nations icons during nations gamemode
 
 //data HUD (medhud, sechud) defines
 //Don't forget to update human/New() if you change these!

code/datums/mind.dm

@@ -615,8 +615,6 @@
 	else if(href_list["implant"])
 		var/mob/living/carbon/human/H = current
 
-		//H.hud_updateflag |= (1 << IMPLOYAL_HUD)   // updates that players HUD images so secHUD's pick up they are implanted or not.
-
 		switch(href_list["implant"])
 			if("remove")
 				for(var/obj/item/weapon/implant/loyalty/I in H.contents)
@@ -663,7 +661,6 @@
 					log_admin("[key_name_admin(usr)] has de-traitor'ed [current].")
 
 	else if (href_list["revolution"])
-		//current.hud_updateflag |= (1 << SPECIALROLE_HUD)
 
 		switch(href_list["revolution"])
 			if("clear")
@@ -767,7 +764,6 @@
 				message_admins("[key_name_admin(usr)] has equipped [key_name_admin(current)] as a revolutionary")
 
 	else if (href_list["cult"])
-		//current.hud_updateflag |= (1 << SPECIALROLE_HUD)
 		switch(href_list["cult"])
 			if("clear")
 				if(src in ticker.mode.cult)
@@ -810,7 +806,6 @@
 				message_admins("[key_name_admin(usr)] has equipped [key_name_admin(current)] as a cultist")
 
 	else if (href_list["wizard"])
-		//current.hud_updateflag |= (1 << SPECIALROLE_HUD)
 
 		switch(href_list["wizard"])
 			if("clear")
@@ -853,7 +848,6 @@
 
 
 	else if (href_list["changeling"])
-		//current.hud_updateflag |= (1 << SPECIALROLE_HUD)
 		switch(href_list["changeling"])
 			if("clear")
 				if(src in ticker.mode.changelings)
@@ -922,8 +916,6 @@
 	else if (href_list["nuclear"])
 		var/mob/living/carbon/human/H = current
 
-		//current.hud_updateflag |= (1 << SPECIALROLE_HUD)
-
 		switch(href_list["nuclear"])
 			if("clear")
 				if(src in ticker.mode.syndicates)
@@ -987,7 +979,6 @@
 					usr << "\red No valid nuke found!"
 
 	else if (href_list["traitor"])
-		//current.hud_updateflag |= (1 << SPECIALROLE_HUD)
 		switch(href_list["traitor"])
 			if("clear")
 				if(src in ticker.mode.traitors)
@@ -1064,7 +1055,6 @@
 				log_admin("[key_name(usr)] has thralled [current].")
 
 	else if (href_list["silicon"])
-		//current.hud_updateflag |= (1 << SPECIALROLE_HUD)
 		switch(href_list["silicon"])
 			if("unmalf")
 				if(src in ticker.mode.malf_ai)

code/game/data_huds.dm

@@ -27,6 +27,8 @@
 	return 1
 
 /datum/atom_hud/data/human/medical/basic/add_to_single_hud(mob/M, mob/living/carbon/H)
+	if(istype(M,/mob/dead/observer))
+		return 1
 	if(check_sensors(H))
 		..()
 

code/game/gamemodes/antag_hud.dm

@@ -1,5 +1,5 @@
 /datum/atom_hud/antag
-	hud_icons = list(SPECIALROLE_HUD)
+	hud_icons = list(SPECIALROLE_HUD,NATIONS_HUD)
 
 /datum/atom_hud/antag/proc/join_hud(mob/M)
 	if(!istype(M))
@@ -30,6 +30,16 @@
 	if(M.mind || new_icon_state) //in mindless mobs, only null is acceptable, otherwise we're antagging a mindless mob, meaning we should runtime
 		M.mind.antag_hud_icon_state = new_icon_state
 
+//Nations Icons
+/datum/game_mode/proc/set_nations_hud(mob/M, new_icon_state)
+	if(!istype(M))
+		CRASH("set_antag_hud(): [M] ([M.type]) is not a mob!")
+	var/image/holder = M.hud_list[NATIONS_HUD]
+	if(holder)
+		holder.icon_state = new_icon_state
+	if(M.mind || new_icon_state) //in mindless mobs, only null is acceptable, otherwise we're antagging a mindless mob, meaning we should runtime
+		M.mind.antag_hud_icon_state = new_icon_state
+
 
 //MIND PROCS
 //these are called by mind.transfer_to()

code/game/gamemodes/changeling/powers/revive.dm

@@ -64,8 +64,6 @@
 	user << "<span class='notice'>We have regenerated.</span>"
 
 	user.regenerate_icons()
-	//user.hud_updateflag |= 1 << HEALTH_HUD
-	//user.hud_updateflag |= 1 << STATUS_HUD
 
 	user.status_flags &= ~(FAKEDEATH)
 	user.update_canmove()

code/game/gamemodes/cult/cult.dm

@@ -201,8 +201,6 @@
 		cult_mind.current << "\red <FONT size = 3><B>An unfamiliar white light flashes through your mind, cleansing the taint of the dark-one and the memories of your time as his servant with it.</B></FONT>"
 		cult_mind.memory = ""
 		cult_mind.special_role = null
-		cult_mind.current.hud_updateflag |= 1 << SPECIALROLE_HUD
-
 		// remove the cult viewpoint object
 		var/obj/viewpoint = getCultViewpoint(cult_mind.current)
 		qdel(viewpoint)
@@ -213,14 +211,7 @@
 				M << "<FONT size = 3>[cult_mind.current] looks like they just reverted to their old faith!</FONT>"
 
 
-///datum/game_mode/proc/update_all_cult_icons()
+		//reset_cult_icons_for_spirit(currentSpirit)
-//	spawn(0)
-//		// reset the cult
-//		for(var/datum/mind/cultist in cult)
-//			reset_cult_icons_for_cultist(cultist)
-//		// reset the spirits
-//		for(var/mob/spirit/currentSpirit in spirits)
-//			reset_cult_icons_for_spirit(currentSpirit)
 
 
 /datum/game_mode/proc/reset_cult_icons_for_cultist(var/datum/mind/target)
@@ -323,7 +314,7 @@
 
 	var/datum/atom_hud/antag/culthud = huds[ANTAG_HUD_CULT]
 	culthud.join_hud(cult_mind.current)
-	set_antag_hud(cult_mind.current, "hudcultist")
+	set_antag_hud(cult_mind, "hudcultist")
 
 
 /datum/game_mode/proc/update_cult_icons_removed(datum/mind/cult_mind)
@@ -334,7 +325,7 @@
 	//		remove_cult_icon_from_spirit(currentSpirit,cult_mind)
 	var/datum/atom_hud/antag/culthud = huds[ANTAG_HUD_CULT]
 	culthud.leave_hud(cult_mind.current)
-	set_antag_hud(cult_mind.current, null)
+	set_antag_hud(cult_mind, null)
 
 
 /datum/game_mode/cult/proc/get_unconvertables()

code/game/gamemodes/nations/nations.dm

@@ -38,9 +38,7 @@ datum/game_mode/nations
 		if(H.mind)
 			if(H.mind.assigned_role in engineering_positions)
 				H.mind.nation = all_nations["Atmosia"]
-				//H.hud_updateflag |= 1 << NATIONS_HUD
+				update_nations_icons_added(H,"hudatmosia")
-				//var/I = image('icons/mob/hud.dmi', loc = H.mind.current, icon_state = "hudatmosia")
-				//H.client.images += I
 				H.mind.nation.membership += H.mind.current
 				if(H.mind.assigned_role == H.mind.nation.default_leader)
 					H.mind.nation.current_leader = H.mind.current
@@ -51,9 +49,7 @@ datum/game_mode/nations
 
 			if(H.mind.assigned_role in medical_positions)
 				H.mind.nation = all_nations["Medistan"]
-				//H.hud_updateflag |= 1 << NATIONS_HUD
+				update_nations_icons_added(H,"hudmedistan")
-				//var/I = image('icons/mob/hud.dmi', loc = H.mind.current, icon_state = "hudmedistan")
-				//H.client.images += I
 				H.mind.nation.membership += H.mind.current
 				if(H.mind.assigned_role == H.mind.nation.default_leader)
 					H.mind.nation.current_leader = H.mind.current
@@ -64,9 +60,7 @@ datum/game_mode/nations
 
 			if(H.mind.assigned_role in science_positions)
 				H.mind.nation = all_nations["Scientopia"]
-				//H.hud_updateflag |= 1 << NATIONS_HUD
+				update_nations_icons_added(H,"hudscientopia")
-				//var/I = image('icons/mob/hud.dmi', loc = H.mind.current, icon_state = "hudscientopia")
-				//H.client.images += I
 				H.mind.nation.membership += H.mind.current
 				if(H.mind.assigned_role == H.mind.nation.default_leader)
 					H.mind.nation.current_leader = H.mind.current
@@ -77,9 +71,7 @@ datum/game_mode/nations
 
 			if(H.mind.assigned_role in security_positions)
 				H.mind.nation = all_nations["Brigston"]
-				//H.hud_updateflag |= 1 << NATIONS_HUD
+				update_nations_icons_added(H,"hudbrigston")
-				//var/I = image('icons/mob/hud.dmi', loc = H.mind.current, icon_state = "hudbrigston")
-				//H.client.images += I
 				H.mind.nation.membership += H.mind.current
 				if(H.mind.assigned_role == H.mind.nation.default_leader)
 					H.mind.nation.current_leader = H.mind.current
@@ -90,9 +82,7 @@ datum/game_mode/nations
 
 			if(H.mind.assigned_role in cargonians)
 				H.mind.nation = all_nations["Cargonia"]
-				//H.hud_updateflag |= 1 << NATIONS_HUD
+				update_nations_icons_added(H,"hudcargonia")
-				//var/I = image('icons/mob/hud.dmi', loc = H.mind.current, icon_state = "hudcargonia")
-				//H.client.images += I
 				H.mind.nation.membership += H.mind.current
 				if(H.mind.assigned_role == H.mind.nation.default_leader)
 					H.mind.nation.current_leader = H.mind.current
@@ -103,9 +93,7 @@ datum/game_mode/nations
 
 			if(H.mind.assigned_role in servicion)
 				H.mind.nation = all_nations["Servicion"]
-				//H.hud_updateflag |= 1 << NATIONS_HUD
+				update_nations_icons_added(H,"hudservice")
-				//var/I = image('icons/mob/hud.dmi', loc = H.mind.current, icon_state = "hudservice")
-				//H.client.images += I
 				H.mind.nation.membership += H.mind.current
 				if(H.mind.assigned_role == H.mind.nation.default_leader)
 					H.mind.nation.current_leader = H.mind.current
@@ -116,9 +104,7 @@ datum/game_mode/nations
 
 			if(H.mind.assigned_role in support_positions)
 				H.mind.nation = all_nations["People's Republic of Commandzakstan"]
-				//H.hud_updateflag |= 1 << NATIONS_HUD
+				update_nations_icons_added(H,"hudcommand")
-				//var/I = image('icons/mob/hud.dmi', loc = H.mind.current, icon_state = "hudcommand")
-				//H.client.images += I
 				H.mind.nation.membership += H.mind.current
 				if(H.mind.assigned_role == H.mind.nation.default_leader)
 					H.mind.nation.current_leader = H.mind.current
@@ -129,9 +115,7 @@ datum/game_mode/nations
 
 			if(H.mind.assigned_role in command_positions)
 				H.mind.nation = all_nations["People's Republic of Commandzakstan"]
-			//	H.hud_updateflag |= 1 << NATIONS_HUD
+				update_nations_icons_added(H,"hudcommand")
-				//var/I = image('icons/mob/hud.dmi', loc = H.mind.current, icon_state = "hudcommand")
-			//	H.client.images += I
 				H.mind.nation.membership += H.mind.current
 				if(H.mind.assigned_role == H.mind.nation.default_leader)
 					H.mind.nation.current_leader = H.mind.current
@@ -146,7 +130,6 @@ datum/game_mode/nations
 			else
 				message_admins("[H.name] with [H.mind.assigned_role] could not find any nation to assign!")
 				continue
-			update_nations_icons_added(H)
 
 
 /datum/game_mode/nations/proc/set_ai()
@@ -204,72 +187,56 @@ datum/game_mode/nations
 	if(H.mind)
 		if(H.mind.assigned_role in engineering_positions)
 			H.mind.nation = all_nations["Atmosia"]
-			//H.hud_updateflag |= 1 << NATIONS_HUD
+			mode.update_nations_icons_added(H,"atmosia")
-			//var/I = image('icons/mob/hud.dmi', loc = H.mind.current, icon_state = "hudatmosia")
-			//H.client.images += I
 			H.mind.nation.membership += H.mind.current
 			H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!"
 			return 1
 
 		if(H.mind.assigned_role in medical_positions)
 			H.mind.nation = all_nations["Medistan"]
-			//H.hud_updateflag |= 1 << NATIONS_HUD
+			mode.update_nations_icons_added(H,"hudmedistan")
-			//var/I = image('icons/mob/hud.dmi', loc = H.mind.current, icon_state = "hudmedistan")
-			//H.client.images += I
 			H.mind.nation.membership += H.mind.current
 			H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!"
 			return 1
 
 		if(H.mind.assigned_role in science_positions)
 			H.mind.nation = all_nations["Scientopia"]
-			//H.hud_updateflag |= 1 << NATIONS_HUD
+			mode.update_nations_icons_added(H,"hudscientopia")
-			//var/I = image('icons/mob/hud.dmi', loc = H.mind.current, icon_state = "hudscientopia")
-			//H.client.images += I
 			H.mind.nation.membership += H.mind.current
 			H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!"
 			return 1
 
 		if(H.mind.assigned_role in security_positions)
 			H.mind.nation = all_nations["Brigston"]
-		//	H.hud_updateflag |= 1 << NATIONS_HUD
+			mode.update_nations_icons_added(H,"hudbrigston")
-		//	var/I = image('icons/mob/hud.dmi', loc = H.mind.current, icon_state = "hudbrigston")
-		//	H.client.images += I
 			H.mind.nation.membership += H.mind.current
 			H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!"
 			return 1
 
 		if(H.mind.assigned_role in cargonians)
 			H.mind.nation = all_nations["Cargonia"]
-			//H.hud_updateflag |= 1 << NATIONS_HUD
+			mode.update_nations_icons_added(H,"hudcargonia")
-			//var/I = image('icons/mob/hud.dmi', loc = H.mind.current, icon_state = "hudcargonia")
-		//	H.client.images += I
 			H.mind.nation.membership += H.mind.current
 			H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!"
 			return 1
 
 		if(H.mind.assigned_role in servicion)
 			H.mind.nation = all_nations["Servicion"]
-			//H.hud_updateflag |= 1 << NATIONS_HUD
+			mode.update_nations_icons_added(H,"hudservice")
-		//	var/I = image('icons/mob/hud.dmi', loc = H.mind.current, icon_state = "hudservice")
-		//	H.client.images += I
 			H.mind.nation.membership += H.mind.current
 			H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!"
 			return 1
 
 		if(H.mind.assigned_role in support_positions)
 			H.mind.nation = all_nations["People's Republic of Commandzakstan"]
-			//H.hud_updateflag |= 1 << NATIONS_HUD
+			mode.update_nations_icons_added(H,"hudcommand")
-			//var/I = image('icons/mob/hud.dmi', loc = H.mind.current, icon_state = "hudcommand")
-		//	H.client.images += I
 			H.mind.nation.membership += H.mind.current
 			H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!"
 			return 1
 
 		if(H.mind.assigned_role in command_positions)
 			H.mind.nation = all_nations["People's Republic of Commandzakstan"]
-		//	H.hud_updateflag |= 1 << NATIONS_HUD
+			mode.update_nations_icons_added(H,"hudcommand")
-		//	var/I = image('icons/mob/hud.dmi', loc = H.mind.current, icon_state = "hudcommand")
-		//	H.client.images += I
 			H.mind.nation.membership += H.mind.current
 			H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!"
 			return 1
@@ -284,7 +251,6 @@ datum/game_mode/nations
 		else
 			message_admins("[H.name] with [H.mind.assigned_role] could not find any nation to assign!")
 			return 1
-		mode.update_nations_icons_added(H)
 	message_admins("[H.name] latejoined with no mind.")
 	return 1
 
@@ -297,12 +263,12 @@ datum/game_mode/nations
 
 //prepare for copypaste
 //While not an Antag i AM using the set_antag hud on this to make this easier.
-/datum/game_mode/proc/update_nations_icons_added(datum/mind/nations_mind)
+/datum/game_mode/proc/update_nations_icons_added(datum/mind/nations_mind,var/naticon)
 	var/datum/atom_hud/antag/nations_hud = huds[GAME_HUD_NATIONS]
 	nations_hud.join_hud(nations_mind)
-	set_antag_hud(nations_mind.current,"hud[lowertext(nations_mind.nation.default_name)]")
+	set_nations_hud(nations_mind,naticon)
 
 /datum/game_mode/proc/update_nations_icons_removed(datum/mind/nations_mind)
 	var/datum/atom_hud/antag/nations_hud = huds[GAME_HUD_NATIONS]
 	nations_hud.leave_hud(nations_mind)
-	set_antag_hud(nations_mind.current, null)
+	set_nations_hud(nations_mind, null)

code/game/gamemodes/revolution/revolution.dm

@@ -242,7 +242,6 @@
 	if(rev_mind in revolutionaries)
 		revolutionaries -= rev_mind
 		rev_mind.special_role = null
-		//rev_mind.current.hud_updateflag |= 1 << SPECIALROLE_HUD
 
 		if(beingborged)
 			rev_mind.current << "\red <FONT size = 3><B>The frame's firmware detects and deletes your neural reprogramming!  You remember nothing from the moment you were flashed until now.</B></FONT>"

code/game/gamemodes/shadowling/shadowling.dm

@@ -136,7 +136,6 @@ Made by Xhuis
 		if(shadow_mind.assigned_role == "Clown")
 			S << "<span class='notice'>Your alien nature has allowed you to overcome your clownishness.</span>"
 			S.mutations.Remove(CLUMSY)
-		//shadow_mind.current.hud_updateflag |= (1 << SPECIALROLE_HUD)
 
 /datum/game_mode/proc/add_thrall(datum/mind/new_thrall_mind)
 	if(!istype(new_thrall_mind))
@@ -157,7 +156,6 @@ Made by Xhuis
 		new_thrall_mind.current << "<span class='shadowling'>Though not nearly as powerful as your masters, you possess some weak powers. These can be found in the Thrall Abilities tab.</span>"
 		new_thrall_mind.current << "<span class='shadowling'>You may communicate with your allies by speaking in the Shadowling Hivemind (:8).</span>"
 
-		new_thrall_mind.current.hud_updateflag |= (1 << SPECIALROLE_HUD)
 		return 1
 
 /datum/game_mode/proc/remove_thrall(datum/mind/thrall_mind, var/kill = 0)

code/game/gamemodes/vampire/vampire.dm

@@ -381,12 +381,12 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
 /datum/game_mode/proc/update_vampire_icons_added(datum/mind/vampire_mind)
 //	var/datum/atom_hud/antag/vamp_hud = huds[ANTAG_HUD_VAMPIRE]
 //	vamp_hud.join_hud(vampire_mind)
-	set_antag_hud(vampire_mind.current, ((vampire_mind in vampires) ? "hudvampire" : "hudvampirethrall"))
+	set_antag_hud(vampire_mind, ((vampire_mind in vampires) ? "hudvampire" : "hudvampirethrall"))
 
 /datum/game_mode/proc/update_vampire_icons_removed(datum/mind/vampire_mind)
 //	var/datum/atom_hud/antag/vampire_hud = huds[ANTAG_HUD_VAMPIRE]
 //	vampire_hud.leave_hud(vampire_mind)
-	set_antag_hud(vampire_mind.current, null)
+	set_antag_hud(vampire_mind, null)
 
 /datum/game_mode/proc/remove_vampire_mind(datum/mind/vampire_mind, datum/mind/head)
 	//var/list/removal

code/game/jobs/job/security.dm

@@ -31,7 +31,7 @@
 		H.equip_or_collect(new /obj/item/device/pda/heads/hos(H), slot_wear_pda)
 		H.equip_or_collect(new /obj/item/clothing/gloves/color/black/hos(H), slot_gloves)
 		H.equip_or_collect(new /obj/item/clothing/head/HoS(H), slot_head)
-		H.equip_or_collect(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses)
+		H.equip_or_collect(new /obj/item/clothing/glasses/hud/secsunglasses(H), slot_glasses)
 		H.equip_or_collect(new /obj/item/weapon/gun/energy/gun(H), slot_s_store)
 		if(H.backbag == 1)
 			H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
@@ -77,7 +77,7 @@
 		H.equip_to_slot_or_del(new /obj/item/clothing/head/warden(H), slot_head)
 		H.equip_or_collect(new /obj/item/device/pda/warden(H), slot_wear_pda)
 		H.equip_or_collect(new /obj/item/clothing/gloves/color/black(H), slot_gloves)
-		H.equip_or_collect(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses)
+		H.equip_or_collect(new /obj/item/clothing/glasses/hud/secsunglasses(H), slot_glasses)
 //		H.equip_or_collect(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk
 		H.equip_or_collect(new /obj/item/device/flash(H), slot_l_store)
 		H.equip_or_collect(new /obj/item/weapon/gun/energy/advtaser(H), slot_s_store)

code/game/jobs/job/supervisor.dm

@@ -222,7 +222,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 		H.equip_or_collect(new /obj/item/clothing/suit/judgerobe(H), slot_wear_suit)
 		H.equip_or_collect(new /obj/item/clothing/shoes/centcom(H), slot_shoes)
 		H.equip_or_collect(new /obj/item/clothing/head/powdered_wig(H), slot_head)
-		H.equip_or_collect(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses)
+		H.equip_or_collect(new /obj/item/clothing/glasses/hud/secsunglasses(H), slot_glasses)
 		H.equip_or_collect(new /obj/item/device/pda/heads/magistrate(H), slot_wear_pda)
 		H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack)
 		H.equip_or_collect(new /obj/item/device/flash(H), slot_r_store)
@@ -260,7 +260,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 		H.equip_or_collect(new /obj/item/clothing/under/rank/internalaffairs(H), slot_w_uniform)
 		H.equip_or_collect(new /obj/item/clothing/suit/storage/internalaffairs(H), slot_wear_suit)
 		H.equip_or_collect(new /obj/item/clothing/shoes/brown(H), slot_shoes)
-		H.equip_or_collect(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses)
+		H.equip_or_collect(new /obj/item/clothing/glasses/hud/secsunglasses(H), slot_glasses)
 		H.equip_or_collect(new /obj/item/device/pda/lawyer(H), slot_wear_pda)
 		H.equip_or_collect(new /obj/item/weapon/storage/briefcase(H), slot_l_hand)
 		H.equip_or_collect(new /obj/item/device/laser_pointer(H), slot_l_store)

code/game/jobs/job_controller.dm

@@ -484,7 +484,6 @@ var/global/datum/controller/occupations/job_master
 
 		H.sec_hud_set_ID()
 		H.sec_hud_set_implants()
-		//H.hud_updateflag |= (1 << SPECIALROLE_HUD)
 		return H
 
 

code/game/machinery/computer/security.dm

@@ -511,8 +511,6 @@ What a mess.*/
 
 					if ("Change Criminal Status")
 						if (active2)
-							//for(var/mob/living/carbon/human/H in player_list)
-								//H.hud_updateflag |= 1 << WANTED_HUD
 							switch(href_list["criminal2"])
 								if("none")
 									active2.fields["criminal"] = "None"

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -112,7 +112,7 @@
 		new /obj/item/clothing/suit/armor/hos/alt(src)
 		new /obj/item/clothing/head/HoS(src)
 		new /obj/item/clothing/head/HoS/beret(src)
-		new /obj/item/clothing/glasses/sunglasses/sechud(src)
+		new /obj/item/clothing/glasses/hud/secsunglasses(src)
 		new /obj/item/weapon/storage/lockbox/loyalty(src)
 		new /obj/item/weapon/storage/box/flashbangs(src)
 		new /obj/item/clothing/mask/gas/sechailer/swat(src)
@@ -151,7 +151,7 @@
 		new /obj/item/clothing/under/rank/warden(src)
 		new /obj/item/clothing/under/rank/warden/formal(src)
 		new /obj/item/clothing/under/rank/warden/corp(src)
-		new /obj/item/clothing/glasses/sunglasses/sechud(src)
+		new /obj/item/clothing/glasses/hud/secsunglasses(src)
 		new /obj/item/clothing/mask/gas/sechailer(src)
 		new /obj/item/taperoll/police(src)
 		new /obj/item/weapon/storage/box/zipties(src)
@@ -190,7 +190,7 @@
 		new /obj/item/weapon/grenade/flashbang(src)
 		new /obj/item/weapon/storage/belt/security/sec(src)
 		new /obj/item/clothing/mask/gas/sechailer(src)
-		new /obj/item/clothing/glasses/sunglasses/sechud(src)
+		new /obj/item/clothing/glasses/hud/secsunglasses(src)
 		new /obj/item/clothing/head/helmet(src)
 		new /obj/item/weapon/melee/baton/loaded(src)
 		new /obj/item/taperoll/police(src)

code/game/response_team.dm

@@ -381,7 +381,7 @@ var/send_emergency_team
 			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves)
 			M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/ert/security(M), slot_wear_suit)
 			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/advtaser(M), slot_s_store)
-			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(M), slot_glasses)
+			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/secsunglasses(M), slot_glasses)
 
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/ert/security(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/sechailer(M), slot_in_backpack)
@@ -458,7 +458,7 @@ var/send_emergency_team
 			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves)
 			M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/ert/security(M), slot_wear_suit)
 			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/advtaser(M), slot_s_store)
-			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(M), slot_glasses)
+			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/secsunglasses(M), slot_glasses)
 
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/ert/security(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/sechailer(M), slot_in_backpack)
@@ -494,7 +494,7 @@ var/send_emergency_team
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes)
 			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves)
 			M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/ert/commander(M), slot_wear_suit)
-			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(M), slot_glasses)
+			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/secsunglasses(M), slot_glasses)
 
 			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun/nuclear(M), slot_belt)
 

code/modules/clothing/glasses/glasses.dm

@@ -327,23 +327,6 @@
 		"Vox" = 'icons/mob/species/vox/eyes.dmi'
 		)
 
-/obj/item/clothing/glasses/sunglasses/sechud
-	name = "HUDSunglasses"
-	desc = "Sunglasses with a HUD."
-	icon_state = "sunhud"
-	darkness_view = 1
-	flash_protect = 1
-	tint = 1
-	HUDType = DATA_HUD_SECURITY_BASIC
-	prescription_upgradable = 1
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/eyes.dmi'
-		)
-
-/obj/item/clothing/glasses/sunglasses/sechud/prescription
-	prescription = 1
-
 /obj/item/clothing/glasses/thermal
 	name = "Optical Thermal Scanner"
 	desc = "Thermals in the shape of glasses."

code/modules/clothing/glasses/hud.dm

@@ -83,3 +83,20 @@
 	darkness_view = 8
 	see_darkness = 0
 	prescription_upgradable = 0
+
+/obj/item/clothing/glasses/hud/secsunglasses
+	name = "HUDSunglasses"
+	desc = "Sunglasses with a HUD."
+	icon_state = "sunhud"
+	darkness_view = 1
+	flash_protect = 1
+	tint = 1
+	HUDType = DATA_HUD_SECURITY_ADVANCED
+	prescription_upgradable = 1
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/eyes.dmi'
+		)
+
+/obj/item/clothing/glasses/hud/secsunglasses/prescription
+	prescription = 1

code/modules/computer3/computers/security.dm

@@ -565,8 +565,7 @@ What a mess.*/
 
 					if ("Change Criminal Status")
 						if (active2)
-							for(var/mob/living/carbon/human/H in player_list)
+
-								H.hud_updateflag |= 1 << WANTED_HUD
 							switch(href_list["criminal2"])
 								if("none")
 									active2.fields["criminal"] = "None"
@@ -578,6 +577,8 @@ What a mess.*/
 									active2.fields["criminal"] = "Parolled"
 								if("released")
 									active2.fields["criminal"] = "Released"
+						for(var/mob/living/carbon/human/H in mob_list)
+							H.sec_hud_set_security_status()
 
 					if ("Delete Record (Security) Execute")
 						if (active2)

code/modules/mob/dead/observer/observer.dm

@@ -265,13 +265,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set desc = "Toggles the medical HUD."
 	if(!client)
 		return
-
+	var/datum/atom_hud/H = huds[DATA_HUD_MEDICAL_BASIC]
-	if(data_hud_seen) //remove old huds
+	H.remove_hud_from(src)//out with the old..
-		var/datum/atom_hud/H = huds[data_hud_seen]
-		H.remove_hud_from(src)
 	if(medhud==0)//TOGGLE!
 		medhud = 1
-		show_me_the_hud(DATA_HUD_MEDICAL_BASIC)
+		H.add_hud_to(src)
 	else
 		medhud = 0
 

code/modules/mob/living/carbon/human/death.dm

@@ -91,11 +91,6 @@
 	dizziness = 0
 	jitteriness = 0
 
-	//hud_updateflag |= 1 << HEALTH_HUD
-	//hud_updateflag |= 1 << STATUS_HUD
-
-	//handle_hud_list()
-
 	//Handle species-specific deaths.
 	if(species) species.handle_death(src)
 

code/modules/mob/living/carbon/human/examine.dm

@@ -486,7 +486,7 @@
 		var/mob/living/carbon/human/H = M
 		switch(hudtype)
 			if("security")
-				return istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud)
+				return istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/hud/secsunglasses)
 			if("medical")
 				return istype(H.glasses, /obj/item/clothing/glasses/hud/health) || istype(H.glasses, /obj/item/clothing/glasses/hud/health_advanced)
 			else

code/modules/mob/living/carbon/human/human.dm

@@ -29,17 +29,6 @@
 	reagents = R
 	R.my_atom = src
 
-	//hud_list[HEALTH_HUD]      = image('icons/mob/hud.dmi', src, "hudhealth100")
-	//hud_list[STATUS_HUD]      = image('icons/mob/hud.dmi', src, "hudhealthy")
-	//hud_list[ID_HUD]          = image('icons/mob/hud.dmi', src, "hudunknown")
-	////hud_list[WANTED_HUD]      = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[IMPLOYAL_HUD]    = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[IMPCHEM_HUD]     = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[IMPTRACK_HUD]    = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[STATUS_HUD_OOC]  = image('icons/mob/hud.dmi', src, "hudhealthy")
-	//hud_list[NATIONS_HUD]     = image('icons/mob/hud.dmi', src, "hudblank")
-
 	..()
 
 	prev_gender = gender // Debug for plural genders
@@ -869,7 +858,6 @@
 										modified = 1
 
 										spawn()
-											//hud_updateflag |= 1 << WANTED_HUD
 											if(istype(usr,/mob/living/carbon/human))
 												//var/mob/living/carbon/human/U = usr
 												sec_hud_set_security_status()

code/modules/mob/living/carbon/human/human_damage.dm

@@ -92,7 +92,6 @@
 		take_overall_damage(amount, 0)
 	else
 		heal_overall_damage(-amount, 0)
-	//hud_updateflag |= 1 << HEALTH_HUD
 
 /mob/living/carbon/human/adjustFireLoss(var/amount)
 	if(species && species.burn_mod)
@@ -101,7 +100,6 @@
 		take_overall_damage(0, amount)
 	else
 		heal_overall_damage(0, -amount)
-	//hud_updateflag |= 1 << HEALTH_HUD
 
 /mob/living/carbon/human/proc/adjustBruteLossByPart(var/amount, var/organ_name, var/obj/damage_source = null)
 	if(species && species.brute_mod)
@@ -116,7 +114,6 @@
 			//if you don't want to heal robot organs, they you will have to check that yourself before using this proc.
 			O.heal_damage(-amount, 0, internal=0, robo_repair=(O.status & ORGAN_ROBOT))
 
-	//hud_updateflag |= 1 << HEALTH_HUD
 
 /mob/living/carbon/human/proc/adjustFireLossByPart(var/amount, var/organ_name, var/obj/damage_source = null)
 	if(species && species.burn_mod)
@@ -131,7 +128,6 @@
 			//if you don't want to heal robot organs, they you will have to check that yourself before using this proc.
 			O.heal_damage(0, -amount, internal=0, robo_repair=(O.status & ORGAN_ROBOT))
 
-	//hud_updateflag |= 1 << HEALTH_HUD
 
 /mob/living/carbon/human/Stun(amount)
 	..()
@@ -185,7 +181,6 @@
 				O.unmutate()
 				src << "<span class='notice'>Your [O.name] is shaped normally again.</span>"
 
-	//hud_updateflag |= 1 << HEALTH_HUD //what even is this shit
 
 // Defined here solely to take species flags into account without having to recast at mob/living level.
 /mob/living/carbon/human/getOxyLoss()
@@ -250,7 +245,6 @@
 	var/obj/item/organ/external/picked = pick(parts)
 	if(picked.heal_damage(brute,burn))
 		UpdateDamageIcon()
-		//hud_updateflag |= 1 << HEALTH_HUD
 	updatehealth()
 
 //Damages ONE external organ, organ gets randomly selected from damagable ones.
@@ -263,7 +257,6 @@
 	var/obj/item/organ/external/picked = pick(parts)
 	if(picked.take_damage(brute,burn,sharp,edge))
 		UpdateDamageIcon()
-		//hud_updateflag |= 1 << HEALTH_HUD
 	updatehealth()
 	speech_problem_flag = 1
 
@@ -287,7 +280,6 @@
 		parts -= picked
 
 	updatehealth()
-	//hud_updateflag |= 1 << HEALTH_HUD
 	speech_problem_flag = 1
 	if(update)
 		UpdateDamageIcon()
@@ -312,7 +304,6 @@
 		parts -= picked
 
 	updatehealth()
-	//hud_updateflag |= 1 << HEALTH_HUD
 	if(update)
 		UpdateDamageIcon()
 
@@ -339,7 +330,6 @@ This function restores all organs.
 	if(istype(E, /obj/item/organ/external))
 		if(E.heal_damage(brute, burn))
 			UpdateDamageIcon()
-			//hud_updateflag |= 1 << HEALTH_HUD
 	else
 		return 0
 
@@ -413,5 +403,4 @@ This function restores all organs.
 
 	// Will set our damageoverlay icon to the next level, which will then be set back to the normal level the next mob.Life().
 	updatehealth()
-	hud_updateflag |= 1 << HEALTH_HUD
 	return 1

code/modules/mob/living/carbon/human/life.dm

@@ -991,15 +991,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 /mob/living/carbon/human/handle_hud_icons()
 	species.handle_hud_icons(src)
 
-///mob/living/carbon/human/handle_regular_hud_updates()
-//	if(hud_updateflag)
-//		handle_hud_list()
-
-//	if(..())
-//		if(hud_updateflag)
-//			handle_hud_list()
-
-
 /mob/living/carbon/human/handle_random_events()
 	// Puke if toxloss is too high
 	if(!stat)
@@ -1261,184 +1252,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 */
 
 
-///mob/living/carbon/human/proc/handle_hud_list()
-//
-//	if(hud_updateflag & 1 << HEALTH_HUD)
-//		var/image/holder = hud_list[HEALTH_HUD]
-//		if(stat == 2)
-//			holder.icon_state = "hudhealth-100" 	// X_X
-//		else
-//			holder.icon_state = "hud[RoundHealth(health)]"
-//
-//		hud_list[HEALTH_HUD] = holder
-//
-//
-//	if(hud_updateflag & 1 << STATUS_HUD)
-//		var/foundVirus = 0
-//		for (var/ID in virus2)
-//			if (ID in virusDB)
-//				foundVirus = 1
-//				break
-
-//		var/image/holder = hud_list[STATUS_HUD]
-//		var/image/holder2 = hud_list[STATUS_HUD_OOC]
-//		if(stat == 2)
-//			holder.icon_state = "huddead"
-//			holder2.icon_state = "huddead"
-//		else if(status_flags & XENO_HOST)
-//			holder.icon_state = "hudxeno"
-//			holder2.icon_state = "hudxeno"
-//		else if(foundVirus)
-//			holder.icon_state = "hudill"
-//		else if(has_brain_worms())
-//			var/mob/living/simple_animal/borer/B = has_brain_worms()
-//			if(B.controlling)
-//				holder.icon_state = "hudbrainworm"
-//			else
-//				holder.icon_state = "hudhealthy"
-//			holder2.icon_state = "hudbrainworm"
-//		else
-//			holder.icon_state = "hudhealthy"
-//			if(virus2.len)
-//				holder2.icon_state = "hudill"
-//			else
-//				holder2.icon_state = "hudhealthy"
-
-//		hud_list[STATUS_HUD] = holder
-//		hud_list[STATUS_HUD_OOC] = holder2
-//
-
-//	if(hud_updateflag & 1 << ID_HUD)
-//		var/image/holder = hud_list[ID_HUD]
-//		if(wear_id)
-//			var/obj/item/weapon/card/id/I = wear_id.GetID()
-//			if(I)
-//				holder.icon_state = "hud[ckey(I.GetJobName())]"
-//			else
-//				holder.icon_state = "hudunknown"
-//		else
-//			holder.icon_state = "hudunknown"
-//
-//
-//		hud_list[ID_HUD] = holder
-//
-//
-//	if(hud_updateflag & 1 << WANTED_HUD)
-//		var/image/holder = hud_list[WANTED_HUD]
-//		holder.icon_state = "hudblank"
-//		var/perpname = name
-//		if(wear_id)
-//			var/obj/item/weapon/card/id/I = wear_id.GetID()
-//			if(I)
-//				perpname = I.registered_name
-//		for(var/datum/data/record/E in data_core.general)
-//			if(E.fields["name"] == perpname)
-//				for (var/datum/data/record/R in data_core.security)
-//					if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*"))
-//						holder.icon_state = "hudwanted"
-//						break
-//					else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Incarcerated"))
-//						holder.icon_state = "hudprisoner"
-//						break
-//					else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Parolled"))
-//						holder.icon_state = "hudparolled"
-//						break
-//					else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Released"))
-//						holder.icon_state = "hudreleased"
-//						break
-/*		hud_list[WANTED_HUD] = holder
-
-
-	if(hud_updateflag & 1 << IMPLOYAL_HUD || hud_updateflag & 1 << IMPCHEM_HUD || hud_updateflag & 1 << IMPTRACK_HUD)
-		var/image/holder1 = hud_list[IMPTRACK_HUD]
-		var/image/holder2 = hud_list[IMPLOYAL_HUD]
-		var/image/holder3 = hud_list[IMPCHEM_HUD]
-
-		holder1.icon_state = "hudblank"
-		holder2.icon_state = "hudblank"
-		holder3.icon_state = "hudblank"
-
-		for(var/obj/item/weapon/implant/I in src)
-			if(I.implanted)
-				if(istype(I,/obj/item/weapon/implant/tracking))
-					holder1.icon_state = "hud_imp_tracking"
-				if(istype(I,/obj/item/weapon/implant/loyalty))
-					holder2.icon_state = "hud_imp_loyal"
-				if(istype(I,/obj/item/weapon/implant/chem))
-					holder3.icon_state = "hud_imp_chem"
-
-		hud_list[IMPTRACK_HUD] = holder1
-		hud_list[IMPLOYAL_HUD] = holder2
-		hud_list[IMPCHEM_HUD] = holder3
-
-	if(hud_updateflag & 1 << SPECIALROLE_HUD)
-		var/image/holder = hud_list[SPECIALROLE_HUD]
-		holder.icon_state = "hudblank"
-
-		if(mind)
-
-			switch(mind.special_role)
-				if("traitor","Syndicate")
-					holder.icon_state = "hudsyndicate"
-				if("Revolutionary")
-					holder.icon_state = "hudrevolutionary"
-				if("Head Revolutionary")
-					holder.icon_state = "hudheadrevolutionary"
-				if("Cultist")
-					holder.icon_state = "hudcultist"
-				if("Changeling")
-					holder.icon_state = "hudchangeling"
-				if("Wizard","Fake Wizard")
-					holder.icon_state = "hudwizard"
-				if("Death Commando")
-					holder.icon_state = "huddeathsquad"
-				if("Ninja")
-					holder.icon_state = "hudninja"
-				if("Vampire") // TODO: Check this
-					holder.icon_state = "hudvampire"
-				if("VampThrall")
-					holder.icon_state = "hudvampthrall"
-				if("head_loyalist")
-					holder.icon_state = "loyalist"
-				if("loyalist")
-					holder.icon_state = "loyalist"
-				if("head_mutineer")
-					holder.icon_state = "mutineer"
-				if("mutineer")
-					holder.icon_state = "mutineer"
-				if("Shadowling")
-					holder.icon_state = "hudshadowling"
-				if("shadowling thrall")
-					holder.icon_state = "hudshadowlingthrall"
-
-			hud_list[SPECIALROLE_HUD] = holder
-
-	if(hud_updateflag & 1 << NATIONS_HUD)
-		var/image/holder = hud_list[NATIONS_HUD]
-		holder.icon_state = "hudblank"
-
-		if(mind && mind.nation)
-			switch(mind.nation.default_name)
-				if("Atmosia")
-					holder.icon_state = "hudatmosia"
-				if("Brigston")
-					holder.icon_state = "hudbrigston"
-				if("Cargonia")
-					holder.icon_state = "hudcargonia"
-				if("People's Republic of Commandzakstan")
-					holder.icon_state = "hudcommand"
-				if("Servicion")
-					holder.icon_state = "hudservice"
-				if("Medistan")
-					holder.icon_state = "hudmedistan"
-				if("Scientopia")
-					holder.icon_state = "hudscientopia"
-
-			hud_list[NATIONS_HUD] = holder
-
-	hud_updateflag = 0
-*/
-
 /mob/living/carbon/human/handle_silent()
 	if(..())
 		speech_problem_flag = 1

code/modules/mob/living/carbon/human/update_icons.dm

@@ -571,9 +571,6 @@ var/global/list/damage_icon_parts = list()
 	else
 		overlays_standing[ID_LAYER]	= null
 
-	hud_updateflag |= 1 << ID_HUD
-	hud_updateflag |= 1 << WANTED_HUD
-
 	if(update_icons)   update_icons()
 
 /mob/living/carbon/human/update_inv_gloves(var/update_icons=1)

code/modules/mob/living/living.dm

@@ -314,8 +314,6 @@
 			for(var/datum/reagent/R in C.reagents.reagent_list)
 				C.reagents.clear_reagents()
 			C.reagents.addiction_list.Cut()
-	hud_updateflag |= 1 << HEALTH_HUD
-	hud_updateflag |= 1 << STATUS_HUD
 
 /mob/living/proc/update_revive() // handles revival through other means than cloning or adminbus (defib, IPC repair)
 	stat = CONSCIOUS
@@ -381,8 +379,6 @@
 	stat = CONSCIOUS
 	update_fire()
 	regenerate_icons()
-	hud_updateflag |= 1 << HEALTH_HUD
-	hud_updateflag |= 1 << STATUS_HUD
 	return
 
 /mob/living/proc/UpdateDamageIcon()

code/modules/mob/living/living_defines.dm

@@ -5,7 +5,6 @@
 	var/maxHealth = 100 //Maximum health that should be possible.
 	var/health = 100 	//A mob's health
 
-	var/hud_updateflag = 0
 
 	//Damage related vars, NOTE: THESE SHOULD ONLY BE MODIFIED BY PROCS
 	var/bruteloss = 0.0	//Brutal damage caused by brute force (punching, being clubbed by a toolbox ect... this also accounts for pressure damage)

code/modules/mob/living/silicon/ai/ai.dm

@@ -177,16 +177,6 @@ var/list/ai_verbs_default = list(
 		new /obj/machinery/ai_powersupply(src)
 
 
-	//hud_list[HEALTH_HUD]      = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[STATUS_HUD]      = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[ID_HUD]          = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[WANTED_HUD]      = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[IMPLOYAL_HUD]    = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[IMPCHEM_HUD]     = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[IMPTRACK_HUD]    = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[NATIONS_HUD]     = image('icons/mob/hud.dmi', src, "hudblank")
-
 	ai_list += src
 	..()
 	return

code/modules/mob/living/silicon/ai/life.dm

@@ -145,13 +145,6 @@
 						theAPC = null
 
 	process_queued_alarms()
-	//regular_hud_updates()
-
-	//switch(sensor_mode)
-	///	if (SEC_HUD)
-	//		process_sec_hud(src, 1, eyeobj)
-	//	if (MED_HUD)
-	//		process_med_hud(src, 1, eyeobj)
 
 	if(get_nations_mode())
 		process_nations_ai()

code/modules/mob/living/silicon/robot/robot.dm

@@ -143,15 +143,6 @@ var/list/robot_verbs_default = list(
 		cell_component.wrapped = cell
 		cell_component.installed = 1
 
-	//hud_list[HEALTH_HUD]      = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[STATUS_HUD]      = image('icons/mob/hud.dmi', src, "hudhealth100")
-	//hud_list[ID_HUD]          = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[WANTED_HUD]      = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[IMPLOYAL_HUD]    = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[IMPCHEM_HUD]     = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[IMPTRACK_HUD]    = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
-	//hud_list[NATIONS_HUD]     = image('icons/mob/hud.dmi', src, "hudblank")
 	diag_hud_set_borgcell()
 	scanner.Grant(src)
 

code/modules/virus2/disease2.dm

@@ -110,7 +110,6 @@
 	for(var/datum/disease2/effectholder/e in effects)
 		e.effect.deactivate(mob)
 	mob.virus2.Remove("[uniqueID]")
-	mob.hud_updateflag |= 1 << STATUS_HUD
 
 /datum/disease2/disease/proc/minormutate()
 	//uniqueID = rand(0,10000)

code/modules/virus2/helpers.dm

@@ -3,11 +3,11 @@ proc/get_infection_chance(var/mob/living/carbon/M, var/vector = "Airborne")
 	var/score = 0
 	if (!istype(M))
 		return 0
-	
+
 	var/mob/living/carbon/human/H = M
 	if(istype(H) && H.species.virus_immune)
-		return 0	
+		return 0
-	
+
 	if(istype(M, /mob/living/carbon/human))
 		if (vector == "Airborne")
 			if(M.internal)  //not breathing infected air helps greatly
@@ -89,7 +89,6 @@ proc/airborne_can_reach(turf/source, turf/target, var/radius=5)
 		var/datum/disease2/disease/D = disease.getcopy()
 		D.minormutate()
 		M.virus2["[D.uniqueID]"] = D
-		M.hud_updateflag |= 1 << STATUS_HUD
 
 //Infects mob M with random lesser disease, if he doesn't have one
 /proc/infect_mob_random_lesser(var/mob/living/carbon/M)
@@ -97,14 +96,12 @@ proc/airborne_can_reach(turf/source, turf/target, var/radius=5)
 	D.makerandom()
 	D.infectionchance = 1
 	M.virus2["[D.uniqueID]"] = D
-	M.hud_updateflag |= 1 << STATUS_HUD
 
 //Infects mob M with random greated disease, if he doesn't have one
 /proc/infect_mob_random_greater(var/mob/living/carbon/M)
 	var/datum/disease2/disease/D = new /datum/disease2/disease
 	D.makerandom(1)
 	M.virus2["[D.uniqueID]"] = D
-	M.hud_updateflag |= 1 << STATUS_HUD
 
 //Fancy prob() function.
 /proc/dprob(var/p)