Death to my nasty odysseus mechud snowflake!

2026-08-21 19:17:50 +01:00 · 2015-12-20 01:46:36 -08:00
parent 860275f51d ff32b32eb9
commit 43dcb6d043
246 changed files with 16503 additions and 17170 deletions
@@ -23,12 +23,12 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
 							//Note that this is not a reliable way to determine if admins started as observers, since they change mobs a lot.
 	universal_speak = 1
 	var/atom/movable/following = null
-	var/medHUD = 0
-	var/secHUD = 0
 	var/anonsay = 0
 	var/image/ghostimage = null //this mobs ghost image, for deleting and stuff
 	var/ghostvision = 1 //is the ghost able to see things humans can't?
 	var/seedarkness = 1
+	var/data_hud_seen = 0 //this should one of the defines in __DEFINES/hud.dm
+	var/medhud = 0

 /mob/dead/observer/New(var/mob/body=null, var/flags=1)
 	sight |= SEE_TURFS | SEE_MOBS | SEE_OBJS | SEE_SELF
@@ -111,45 +111,28 @@ Works together with spawning an observer, noted above.
 	if(!loc) return
 	if(!client) return 0

-	regular_hud_updates()
-	if(client.images.len)
-		for(var/image/hud in client.images)
-			if(copytext(hud.icon_state,1,4) == "hud")
-				client.images.Remove(hud)
-	if(antagHUD)
-		var/list/target_list = list()
-		for(var/mob/living/target in oview(src, 14))
-			if(target.mind && (target.mind.special_role || issilicon(target) || target.mind.nation))
-				target_list += target
-		if(target_list.len)
-			assess_targets(target_list, src)
-	if(medHUD)
-		process_medHUD(src)
-	if(secHUD)
-		process_secHUD(src)
+	//regular_hud_updates()
+	//if(client.images.len)
+	//	for(var/image/hud in client.images)
+	//		if(copytext(hud.icon_state,1,4) == "hud")
+	//			client.images.Remove(hud)
+	//if(antagHUD)
+	//	var/list/target_list = list()
+	//	for(var/mob/living/target in oview(src, 14))
+	//		if(target.mind && (target.mind.special_role || issilicon(target) || target.mind.nation))
+	//			target_list += target
+	//	if(target_list.len)
+	//		assess_targets(target_list, src)


-/mob/dead/proc/process_medHUD(var/mob/M)
-	var/client/C = M.client
-	for(var/mob/living/carbon/human/patient in oview(M, 14))
-		C.images += patient.hud_list[HEALTH_HUD]
-		C.images += patient.hud_list[STATUS_HUD_OOC]
-
-/mob/dead/proc/process_secHUD(var/mob/M)
-	var/client/C = M.client
-	for(var/mob/living/carbon/human/target in oview(M, 14))
-		C.images += target.hud_list[IMPTRACK_HUD]
-		C.images += target.hud_list[IMPLOYAL_HUD]
-		C.images += target.hud_list[IMPCHEM_HUD]
-
 /mob/dead/proc/assess_targets(list/target_list, mob/dead/observer/U)
 	var/client/C = U.client
 	for(var/mob/living/carbon/human/target in target_list)
 		C.images += target.hud_list[SPECIALROLE_HUD]
-		C.images += target.hud_list[NATIONS_HUD]
+		//C.images += target.hud_list[NATIONS_HUD]
 	for(var/mob/living/silicon/target in target_list)
 		C.images += target.hud_list[SPECIALROLE_HUD]
-		C.images += target.hud_list[NATIONS_HUD]
+		//C.images += target.hud_list[NATIONS_HUD]

 	return 1

@@ -236,10 +219,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 					//world << "DEBUG: malf mode ticker test"
 					if(ticker.mode:malf_mode_declared)
 						stat(null, "Time left: [max(ticker.mode:AI_win_timeleft/(ticker.mode:apcs/3), 0)]")
-		if(emergency_shuttle)
-			var/eta_status = emergency_shuttle.get_status_panel_eta()
-			if(eta_status)
-				stat(null, eta_status)
+		if(shuttle_master.emergency.mode >= SHUTTLE_RECALL)
+			var/timeleft = shuttle_master.emergency.timeLeft()
+			if(timeleft > 0)
+				stat(null, "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]")

 /mob/dead/observer/verb/reenter_corpse()
 	set category = "Ghost"
@@ -270,18 +253,21 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp

 	return 1

+
 /mob/dead/observer/verb/toggle_medHUD()
 	set category = "Ghost"
 	set name = "Toggle MedicHUD"
 	set desc = "Toggles the medical HUD."
 	if(!client)
 		return
-	if(medHUD)
-		medHUD = 0
-		src << "\blue <B>Medical HUD Disabled</B>"
+	var/datum/atom_hud/H = huds[DATA_HUD_MEDICAL_BASIC]
+	H.remove_hud_from(src)//out with the old..
+	if(medhud==0)//TOGGLE!
+		medhud = 1
+		H.add_hud_to(src)
 	else
-		medHUD = 1
-		src << "\blue <B>Medical HUD Enabled</B>"
+		medhud = 0
+

 /mob/dead/observer/verb/toggle_antagHUD()
 	set category = "Ghost"
@@ -304,12 +290,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 			respawnable_list -= M
 	if(!M.has_enabled_antagHUD && !check_rights(R_ADMIN|R_MOD,0))
 		M.has_enabled_antagHUD = 1
-	if(M.antagHUD)
-		M.antagHUD = 0
-		src << "\blue <B>AntagHUD Disabled</B>"
-	else
-		M.antagHUD = 1
-		src << "\blue <B>AntagHUD Enabled</B>"
+
+	var/datum/atom_hud/A = huds[DATA_HUD_SECURITY_ADVANCED]
+	var/adding_hud = (usr in A.hudusers) ? 0 : 1
+	for(var/datum/atom_hud/H in huds)
+		if(istype(H, /datum/atom_hud/antag) || istype(H, /datum/atom_hud/data/human/security/advanced))
+			(adding_hud) ? H.add_hud_to(usr) : H.remove_hud_from(usr)
+

 /mob/dead/observer/proc/dead_tele(A in ghostteleportlocs)
 	set category = "Ghost"
@@ -181,10 +181,10 @@
 	if (client.statpanel == "Status")
 		stat(null, "Plasma Stored: [getPlasma()]/[max_plasma]")

-	if(emergency_shuttle)
-		var/eta_status = emergency_shuttle.get_status_panel_eta()
-		if(eta_status)
-			stat(null, eta_status)
+	if(shuttle_master.emergency.mode >= SHUTTLE_RECALL)
+		var/timeleft = shuttle_master.emergency.timeLeft()
+		if(timeleft > 0)
+			stat(null, "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]")

 /mob/living/carbon/alien/Stun(amount)
 	if(status_flags & CANSTUN)
@@ -14,6 +14,9 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
 	if(istype(loc, /mob/living))
 		affected_mob = loc
 		affected_mob.status_flags |= XENO_HOST
+		if(istype(affected_mob,/mob/living/carbon))
+			var/mob/living/carbon/H = affected_mob
+			H.med_hud_set_status()
 		processing_objects.Add(src)
 		spawn(0)
 			AddInfectionImages(affected_mob)
@@ -23,6 +26,9 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
 /obj/item/alien_embryo/Destroy()
 	if(affected_mob)
 		affected_mob.status_flags &= ~(XENO_HOST)
+		if(istype(affected_mob,/mob/living/carbon))
+			var/mob/living/carbon/H = affected_mob
+			H.med_hud_set_status()
 		spawn(0)
 			RemoveInfectionImages(affected_mob)
 	return ..()
@@ -31,6 +37,9 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
 	if(!affected_mob)	return
 	if(loc != affected_mob)
 		affected_mob.status_flags &= ~(XENO_HOST)
+		if(istype(affected_mob,/mob/living/carbon))
+			var/mob/living/carbon/H = affected_mob
+			H.med_hud_set_status()
 		processing_objects.Remove(src)
 		spawn(0)
 			RemoveInfectionImages(affected_mob)
@@ -85,10 +85,11 @@ I'm using this for Stat to give it a more nifty interface to work with
 		statpanel("Status")
 		stat(null, "Station Time: [worldtime2text()]")

-		if(emergency_shuttle)
-			var/eta_status = emergency_shuttle.get_status_panel_eta()
-			if(eta_status)
-				stat(null, eta_status)
+		if(shuttle_master.emergency.mode >= SHUTTLE_RECALL)
+			var/timeleft = shuttle_master.emergency.timeLeft()
+			if(timeleft > 0)
+				stat(null, "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]")
+
 		if(client.statpanel == "Status")
 			//Knowing how well-off your mech is doing is really important as an MMI
 			if(istype(src.loc, /obj/mecha))
@@ -93,10 +93,4 @@
 		sight &= ~SEE_OBJS
 		see_in_dark = 2
 		see_invisible = SEE_INVISIBLE_LIVING
-	if (container && istype(container, /obj/item/device/mmi))
-		var/obj/item/device/mmi/mmi = container
-		if (mmi.mecha)
-			var/obj/mecha/piloted = mmi.mecha
-			piloted.pilot_mmi_hud(src)
-
-	handle_hud_icons_health()
+	handle_hud_icons_health()
@@ -7,6 +7,20 @@ mob/living
 	update_hud()
 	return

+/mob/living/carbon/prepare_huds()
+	..()
+	prepare_data_huds()
+
+/mob/living/carbon/proc/prepare_data_huds()
+	..()
+	med_hud_set_health()
+	med_hud_set_status()
+
+/mob/living/carbon/updatehealth()
+	..()
+	med_hud_set_health()
+	med_hud_set_status()
+
 /mob/living/carbon/Destroy()
 	for(var/atom/movable/guts in internal_organs)
 		qdel(guts)
@@ -1,5 +1,6 @@
 /mob/living/carbon/
 	gender = MALE
+	hud_possible = list(HEALTH_HUD,STATUS_HUD,SPECIALROLE_HUD)
 	var/list/stomach_contents = list()
 	var/brain_op_stage = 0.0
 	var/list/datum/disease2/disease/virus2 = list()
@@ -0,0 +1,5 @@
+/mob/living/carbon/death(gibbed)
+	losebreath = 0
+	med_hud_set_health()
+	med_hud_set_status()
+	..(gibbed)
@@ -15,7 +15,7 @@

 	for(var/obj/item/organ/I in internal_organs)
 		if(istype(loc,/turf))
-			I.removed(src)
+			I.removed()
 			spawn()
 				I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5)

@@ -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)

@@ -135,6 +130,8 @@
 		if(client) blind.layer = 0

 	timeofdeath = worldtime2text()
+	med_hud_set_health()
+	med_hud_set_status()
 	if(mind)	mind.store_memory("Time of death: [timeofdeath]", 0)
 	if(ticker && ticker.mode)
 //		log_to_dd("k")
@@ -486,20 +486,17 @@
 		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/security/sunglasses)
 			if("medical")
-				return istype(H.glasses, /obj/item/clothing/glasses/hud/health) || istype(H.glasses, /obj/item/clothing/glasses/hud/health_advanced)
+				return istype(H.glasses, /obj/item/clothing/glasses/hud/health) || istype(H.glasses, /obj/item/clothing/glasses/hud/health/health_advanced)
 			else
 				return 0
 	else if(istype(M, /mob/living/silicon))
-		var/mob/living/silicon/R = M
 		switch(hudtype)
 			if("security")
-				if(R.sensor_mode == 1)
-					return 1
+				return 1
 			if("medical")
-				if(R.sensor_mode == 2)
-					return 1
+				return 1
 			else
 				return 0
 	else
@@ -6,7 +6,7 @@
 	icon_state = "body_m_s"

 	//why are these here and not in human_defines.dm
-	var/list/hud_list[10]
+	//var/list/hud_list[10]
 	var/datum/species/species //Contains icon generation and language information, set during New().
 	var/embedded_flag	  //To check if we've need to roll for damage on movement while an item is imbedded in us.
 	var/obj/item/weapon/rig/wearing_rig // This is very not good, but it's much much better than calling get_rig() every update_canmove() call.
@@ -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
@@ -55,6 +44,16 @@
 		sync_organ_dna() //this shouldn't be necessaaaarrrryyyyyyyy
 	UpdateAppearance()

+/mob/living/carbon/human/prepare_data_huds()
+	//Update med hud images...
+	..()
+	//...sec hud images...
+	sec_hud_set_ID()
+	sec_hud_set_implants()
+	sec_hud_set_security_status()
+	//...and display them.
+	add_to_all_human_data_huds()
+
 /mob/living/carbon/human/Destroy()
 	for(var/atom/movable/organelle in organs)
 		qdel(organelle)
@@ -251,10 +250,10 @@
 	if(ticker && ticker.mode && ticker.mode.name == "AI malfunction")
 		if(ticker.mode:malf_mode_declared)
 			stat(null, "Time left: [max(ticker.mode:AI_win_timeleft/(ticker.mode:apcs/3), 0)]")
-	if(emergency_shuttle)
-		var/eta_status = emergency_shuttle.get_status_panel_eta()
-		if(eta_status)
-			stat(null, eta_status)
+	if(shuttle_master.emergency.mode >= SHUTTLE_RECALL)
+		var/timeleft = shuttle_master.emergency.timeLeft()
+		if(timeleft > 0)
+			stat(null, "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]")

 	if(client.statpanel == "Status")
 		if(locate(/obj/item/device/assembly/health) in src)
@@ -858,13 +857,12 @@
 										modified = 1

 										spawn()
-											hud_updateflag |= 1 << WANTED_HUD
 											if(istype(usr,/mob/living/carbon/human))
-												var/mob/living/carbon/human/U = usr
-												U.handle_regular_hud_updates()
+												//var/mob/living/carbon/human/U = usr
+												sec_hud_set_security_status()
 											if(istype(usr,/mob/living/silicon/robot))
-												var/mob/living/silicon/robot/U = usr
-												U.handle_regular_hud_updates()
+												//var/mob/living/silicon/robot/U = usr
+												sec_hud_set_security_status()

 			if(!modified)
 				usr << "\red Unable to locate a data core entry for this person."
@@ -990,11 +988,11 @@

 									spawn()
 										if(istype(usr,/mob/living/carbon/human))
-											var/mob/living/carbon/human/U = usr
-											U.handle_regular_hud_updates()
+											//var/mob/living/carbon/human/U = usr
+											sec_hud_set_security_status()
 										if(istype(usr,/mob/living/silicon/robot))
-											var/mob/living/silicon/robot/U = usr
-											U.handle_regular_hud_updates()
+											//var/mob/living/silicon/robot/U = usr
+											sec_hud_set_security_status()

 			if(!modified)
 				usr << "\red Unable to locate a data core entry for this person."
@@ -24,6 +24,8 @@
 				update_revive()
 	if(stat == CONSCIOUS && (src in dead_mob_list)) //Defib fix
 		update_revive()
+	med_hud_set_health()
+	med_hud_set_status()

 /mob/living/carbon/human/adjustBrainLoss(var/amount)
 	if(status_flags & GODMODE)
@@ -88,7 +90,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)
@@ -97,7 +98,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)
@@ -112,7 +112,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)
@@ -127,7 +126,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)
 	..()
@@ -181,7 +179,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()
@@ -246,7 +243,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.
@@ -259,7 +255,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

@@ -283,7 +278,6 @@
 		parts -= picked

 	updatehealth()
-	hud_updateflag |= 1 << HEALTH_HUD
 	speech_problem_flag = 1
 	if(update)
 		UpdateDamageIcon()
@@ -308,7 +302,6 @@
 		parts -= picked

 	updatehealth()
-	hud_updateflag |= 1 << HEALTH_HUD
 	if(update)
 		UpdateDamageIcon()

@@ -335,7 +328,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

@@ -409,5 +401,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
@@ -1,4 +1,6 @@
 /mob/living/carbon/human
+
+	hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPCHEM_HUD,IMPTRACK_HUD,SPECIALROLE_HUD,NATIONS_HUD)
 	//Hair colour and style
 	var/r_hair = 0
 	var/g_hair = 0
@@ -89,7 +89,7 @@
 		stance_damage = 0

 	// standing is poor
-	if(stance_damage >= 4)
+	if(stance_damage >= 8)
 		if(!(lying || resting))
 			if(species && !(species.flags & NO_PAIN))
 				emote("scream")
@@ -164,9 +164,11 @@
 			if(internals)
 				internals.icon_state = "internal0"
 			internal = null
+		sec_hud_set_ID()
 		update_inv_wear_mask()
 	else if(I == wear_id)
 		wear_id = null
+		sec_hud_set_ID()
 		update_inv_wear_id()
 	else if(I == wear_pda)
 		wear_pda = null
@@ -220,6 +222,7 @@
 			wear_mask = W
 			if((wear_mask.flags & BLOCKHAIR) || (wear_mask.flags & BLOCKHEADHAIR))
 				update_hair(redraw_mob)	//rebuild hair
+			sec_hud_set_ID()
 			update_inv_wear_mask(redraw_mob)
 		if(slot_handcuffed)
 			handcuffed = W
@@ -238,6 +241,7 @@
 			update_inv_belt(redraw_mob)
 		if(slot_wear_id)
 			wear_id = W
+			sec_hud_set_ID()
 			update_inv_wear_id(redraw_mob)
 		if(slot_wear_pda)
 			wear_pda = W
@@ -51,8 +51,9 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 			loc_as_cryobag.used++
 			in_stasis = 1

-	if(mob_master.current_cycle % 30 == 15)
-		hud_updateflag = 1022
+	//if(mob_master.current_cycle % 30 == 15)
+		//hud_updateflag = 1022
+		//HudRefactor:WTF do i put here....

 	voice = GetVoice()

@@ -990,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)
@@ -1260,183 +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
@@ -5,6 +5,4 @@
 		src << "<span class='notice'>You can ventcrawl! Use alt+click on vents to quickly travel about the station.</span>"
 	update_pipe_vision()
 	update_hud()
-	if(ticker && ticker.mode)
-		ticker.mode.update_all_synd_icons()	//This proc only sounds CPU-expensive on paper. It is O(n^2), but the outer for-loop only iterates through syndicates, which are only prsenet in nuke rounds and even when they exist, there's usually 6 of them.
 	return
@@ -423,13 +423,13 @@
 				if(!G.see_darkness)
 					H.see_invisible = SEE_INVISIBLE_MINIMUM

-				switch(G.HUDType)
-					if(SECHUD)
-						process_sec_hud(H,1)
-					if(MEDHUD)
-						process_med_hud(H,1)
-					if(ANTAGHUD)
-						process_antag_hud(H)
+				//switch(G.HUDType)
+				//	if(SECHUD)
+				//		process_sec_hud(H,1)
+				//	if(MEDHUD)
+				//		process_med_hud(H,1)
+				//	if(ANTAGHUD)
+				//		process_antag_hud(H)

 		if(H.head)
 			if(istype(H.head, /obj/item/clothing/head))
@@ -439,13 +439,13 @@
 				if(!hat.see_darkness)
 					H.see_invisible = SEE_INVISIBLE_MINIMUM

-				switch(hat.HUDType)
-					if(SECHUD)
-						process_sec_hud(H,1)
-					if(MEDHUD)
-						process_med_hud(H,1)
-					if(ANTAGHUD)
-						process_antag_hud(H)
+				//switch(hat.HUDType)
+				//	if(SECHUD)
+				//		process_sec_hud(H,1)
+				//	if(MEDHUD)
+				//		process_med_hud(H,1)
+				//	if(ANTAGHUD)
+				//		process_antag_hud(H)

 		if(istype(H.back, /obj/item/weapon/rig)) ///ahhhg so snowflakey
 			var/obj/item/weapon/rig/rig = H.back
@@ -461,13 +461,13 @@
 							if(!G.see_darkness)
 								H.see_invisible = SEE_INVISIBLE_MINIMUM

-							switch(G.HUDType)
-								if(SECHUD)
-									process_sec_hud(H,1)
-								if(MEDHUD)
-									process_med_hud(H,1)
-								if(ANTAGHUD)
-									process_antag_hud(H)
+							//switch(G.HUDType)
+							//	if(SECHUD)
+							//		process_sec_hud(H,1)
+							//	if(MEDHUD)
+							//		process_med_hud(H,1)
+							//	if(ANTAGHUD)
+							//		process_antag_hud(H)

 		if(H.vision_type)
 			H.see_in_dark = max(H.see_in_dark, H.vision_type.see_in_dark, darksight)
@@ -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)
@@ -54,7 +54,7 @@
 	update_canmove()

 	if(client)
-		regular_hud_updates() //THIS DOESN'T FUCKING UPDATE SHIT
+		//regular_hud_updates() //THIS DOESN'T FUCKING UPDATE SHIT
 		handle_regular_hud_updates() //IT JUST REMOVES FUCKING HUD IMAGES
 	if(get_nations_mode())
 		process_nations()
@@ -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()
@@ -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)
@@ -11,30 +11,7 @@
 		src << "<span class='notice'>You can ventcrawl! Use alt+click on vents to quickly travel about the station.</span>"
 	//Should update regardless of if we can ventcrawl, since we can end up in pipes in other ways.
 	update_pipe_vision()
-	
+
 	update_interface()

-	//Round specific stuff like hud updates
-	if(ticker && ticker.mode)
-		var/ref = "\ref[mind]"
-		switch(ticker.mode.name)
-			if("revolution")
-				if((mind in ticker.mode.revolutionaries) || (src.mind in ticker.mode:head_revolutionaries))
-					ticker.mode.update_rev_icons_added(src.mind)
-			if("cult")
-				if(mind in ticker.mode:cult)
-					ticker.mode.update_cult_icons_added(src.mind)
-			if("nuclear emergency")
-				if(mind in ticker.mode:syndicates)
-					ticker.mode.update_all_synd_icons()
-			if("mutiny")
-				var/datum/game_mode/mutiny/mode = get_mutiny_mode()
-				if(mode)
-					mode.update_all_icons()
-			if("vampire")
-				if((ref in ticker.mode.vampire_thralls) || (mind in ticker.mode.vampire_enthralled))
-					ticker.mode.update_vampire_icons_added(mind)
-			if("shadowling")
-				if((mind in ticker.mode.shadowling_thralls) || (mind in ticker.mode.shadows))
-					ticker.mode.update_shadow_icons_added(src.mind)
 	return .
@@ -82,10 +82,12 @@ var/list/ai_verbs_default = list(
 	var/turf/waypoint //Holds the turf of the currently selected waypoint.
 	var/waypoint_mode = 0 //Waypoint mode is for selecting a turf via clicking.

-	var/obj/item/borg/sight/hud/sec/sechud = null
-	var/obj/item/borg/sight/hud/med/healthhud = null
+	//var/obj/item/borg/sight/hud/sec/sechud = null
+	//var/obj/item/borg/sight/hud/med/healthhud = null

 	var/arrivalmsg = "$name, $rank, has arrived on the station."
+	med_hud = DATA_HUD_MEDICAL_BASIC
+	sec_hud = DATA_HUD_SECURITY_BASIC

 /mob/living/silicon/ai/proc/add_ai_verbs()
 	src.verbs |= ai_verbs_default
@@ -175,19 +177,9 @@ 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
+	shuttle_caller_list += src
 	..()
-	return

 /mob/living/silicon/ai/proc/on_mob_init()
 	src << "<B>You are playing the station's AI. The AI cannot move, but can interact with many objects while viewing them (through cameras).</B>"
@@ -229,6 +221,8 @@ var/list/ai_verbs_default = list(

 /mob/living/silicon/ai/Destroy()
 	ai_list -= src
+	shuttle_caller_list -= src
+	shuttle_master.autoEvac()
 	qdel(eyeobj) // No AI, no Eye
 	return ..()

@@ -374,11 +368,6 @@ var/list/ai_verbs_default = list(

 	call_shuttle_proc(src, input)

-	// hack to display shuttle timer
-	if(emergency_shuttle.online())
-		var/obj/machinery/computer/communications/C = locate() in machines
-		if(C)
-			C.post_status("shuttle")
 	return

 /mob/living/silicon/ai/proc/ai_cancel_call()
@@ -12,36 +12,8 @@
 	see_in_dark = 8
 	see_invisible = SEE_INVISIBLE_LEVEL_TWO

-	var/callshuttle = 0
-
-	for(var/obj/machinery/computer/communications/commconsole in world)
-		if((commconsole.z in config.admin_levels))
-			continue
-		if(istype(commconsole.loc,/turf))
-			break
-		callshuttle++
-
-	for(var/obj/item/weapon/circuitboard/communications/commboard in world)
-		if((commboard.z in config.admin_levels))
-			continue
-		if(istype(commboard.loc,/turf) || istype(commboard.loc,/obj/item/weapon/storage))
-			break
-		callshuttle++
-
-	for(var/mob/living/silicon/ai/shuttlecaller in player_list)
-		if((shuttlecaller.z in config.admin_levels))
-			continue
-		if(!shuttlecaller.stat && shuttlecaller.client && istype(shuttlecaller.loc,/turf))
-			break
-		callshuttle++
-
-	if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction" || sent_strike_team)
-		callshuttle = 0
-
-	if(callshuttle == 3) //if all three conditions are met
-		emergency_shuttle.call_evac()
-		log_game("All the AIs, comm consoles and boards are destroyed. Shuttle called.")
-		message_admins("All the AIs, comm consoles and boards are destroyed. Shuttle called.", 1)
+	shuttle_caller_list -= src
+	shuttle_master.autoEvac()

 	if(explosive)
 		spawn(10)
@@ -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()
@@ -165,6 +158,9 @@
 			health = 100 - getOxyLoss() - getToxLoss() - getBruteLoss()
 		else
 			health = 100 - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss()
+		diag_hud_set_status()
+		diag_hud_set_health()
+

 /mob/living/silicon/ai/proc/lacks_power()
 	var/turf/T = get_turf(src)
@@ -1,10 +1,10 @@
 /mob/living/silicon/pai/Life()
 	. = ..()
 	if(.)
-		if(secHUD == 1)
-			process_sec_hud(src, 1)
-		if(medHUD == 1)
-			process_med_hud(src, 1)
+		//if(secHUD == 1)
+		//	process_sec_hud(src, 1)
+		////if(medHUD == 1)
+		//	process_med_hud(src, 1)
 		if(silence_time)
 			if(world.timeofday >= silence_time)
 				silence_time = null
@@ -460,7 +460,9 @@

 	toggle(mob/living/silicon/pai/user)
 		user.secHUD = !user.secHUD
-
+		user.remove_med_sec_hud()
+		if(user.secHUD)
+			user.add_sec_hud()
 	is_active(mob/living/silicon/pai/user)
 		return user.secHUD

@@ -471,6 +473,9 @@

 	toggle(mob/living/silicon/pai/user)
 		user.medHUD = !user.medHUD
+		user.remove_med_sec_hud()
+		if(user.medHUD)
+			user.add_med_hud()

 	is_active(mob/living/silicon/pai/user)
 		return user.medHUD
@@ -71,6 +71,7 @@
 		stat = UNCONSCIOUS
 		update_headlamp(1)
 		Paralyse(3)
+	diag_hud_set_borgcell()

 /mob/living/silicon/robot/handle_regular_status_updates()

@@ -95,6 +96,7 @@
 	if(.) //alive
 		if(health <= config.health_threshold_dead)
 			death()
+			diag_hud_set_status()
 			return

 		if(!istype(src, /mob/living/silicon/robot/drone))
@@ -119,6 +121,8 @@
 		else
 			stat = CONSCIOUS

+		diag_hud_set_health()
+		diag_hud_set_status()
 	else //dead
 		eye_blind = 1

@@ -224,15 +228,15 @@
 			cells.icon_state = "charge-empty"


-/mob/living/silicon/robot/handle_regular_hud_updates()
-	if(!client)
-		return
-
-	switch(sensor_mode)
-		if(SEC_HUD)
-			process_sec_hud(src,1)
-		if(MED_HUD)
-			process_med_hud(src,1)
+/*/mob/living/silicon/robot/handle_regular_hud_updates()
+//	if(!client)
+//		return
+//
+//	switch(sensor_mode)
+//		if(SEC_HUD)
+//			process_sec_hud(src,1)
+//		if(MED_HUD)
+//			process_med_hud(src,1)

 	if(syndicate)
 		if(ticker.mode.name == "traitor")
@@ -251,6 +255,7 @@

 	..()
 	return 1
+	*/



@@ -80,6 +80,8 @@ var/list/robot_verbs_default = list(

 	var/updating = 0 //portable camera camerachunk update

+	hud_possible = list(SPECIALROLE_HUD, DIAG_STAT_HUD, DIAG_HUD, DIAG_BATT_HUD,NATIONS_HUD)
+
 	var/jetpackoverlay = 0
 	var/magpulse = 0

@@ -141,15 +143,7 @@ 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)

 /mob/living/silicon/robot/proc/init(var/alien=0)
@@ -719,6 +713,7 @@ var/list/robot_verbs_default = list(
 			//This will mean that removing and replacing a power cell will repair the mount, but I don't care at this point. ~Z
 			C.brute_damage = 0
 			C.electronics_damage = 0
+			diag_hud_set_borgcell()

 	else if (istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/device/multitool))
 		if (wiresexposed)
@@ -959,6 +954,7 @@ var/list/robot_verbs_default = list(
 			user << "You remove \the [cell]."
 			cell = null
 			update_icons()
+			diag_hud_set_borgcell()

 	if(!opened && (!istype(user, /mob/living/silicon)))
 		if (user.a_intent == I_HELP)
@@ -8,7 +8,7 @@
 	var/list/stating_laws = list()// Channels laws are currently being stated on
 	var/list/alarms_to_show = list()
 	var/list/alarms_to_clear = list()
-	var/list/hud_list[10]
+	//var/list/hud_list[10]
 	var/list/speech_synthesizer_langs = list()	//which languages can be vocalized by the speech synthesizer
 	var/list/alarm_handlers = list() // List of alarm handlers this silicon is registered to
 	var/designation = ""
@@ -19,19 +19,28 @@
 	var/speak_query = "queries"
 	var/pose //Yes, now AIs can pose too.

-	var/sensor_mode = 0 //Determines the current HUD.
+	//var/sensor_mode = 0 //Determines the current HUD.

 	var/next_alarm_notice
 	var/list/datum/alarm/queued_alarms = new()

-	#define SEC_HUD 1 //Security HUD mode
-	#define MED_HUD 2 //Medical HUD mode
+	hud_possible = list(SPECIALROLE_HUD, DIAG_STAT_HUD, DIAG_HUD,NATIONS_HUD)
+
+
+	var/med_hud = DATA_HUD_MEDICAL_ADVANCED //Determines the med hud to use
+	var/sec_hud = DATA_HUD_SECURITY_ADVANCED //Determines the sec hud to use
+	var/d_hud = DATA_HUD_DIAGNOSTIC //There is only one kind of diag hud
+
 	var/local_transmit //If set, can only speak to others of the same type within a short range.
 	var/obj/item/device/radio/common_radio

 /mob/living/silicon/New()
 	silicon_mob_list |= src
 	..()
+	var/datum/atom_hud/data/diagnostic/diag_hud = huds[DATA_HUD_DIAGNOSTIC]
+	diag_hud.add_to_hud(src)
+	diag_hud_set_status()
+	diag_hud_set_health()
 	add_language("Galactic Common")
 	init_subsystems()

@@ -140,10 +149,10 @@

 // this function displays the shuttles ETA in the status panel if the shuttle has been called
 /mob/living/silicon/proc/show_emergency_shuttle_eta()
-	if(emergency_shuttle)
-		var/eta_status = emergency_shuttle.get_status_panel_eta()
-		if(eta_status)
-			stat(null, eta_status)
+	if(shuttle_master.emergency.mode >= SHUTTLE_RECALL)
+		var/timeleft = shuttle_master.emergency.timeLeft()
+		if(timeleft > 0)
+			stat(null, "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]")



@@ -252,17 +261,41 @@
 /mob/living/silicon/binarycheck()
 	return 1

+/mob/living/silicon/proc/remove_med_sec_hud()
+	var/datum/atom_hud/secsensor = huds[sec_hud]
+	var/datum/atom_hud/medsensor = huds[med_hud]
+	var/datum/atom_hud/diagsensor = huds[d_hud]
+	secsensor.remove_hud_from(src)
+	medsensor.remove_hud_from(src)
+	diagsensor.remove_hud_from(src)
+
+/mob/living/silicon/proc/add_sec_hud()
+	var/datum/atom_hud/secsensor = huds[sec_hud]
+	secsensor.add_hud_to(src)
+
+/mob/living/silicon/proc/add_med_hud()
+	var/datum/atom_hud/medsensor = huds[med_hud]
+	medsensor.add_hud_to(src)
+
+/mob/living/silicon/proc/add_diag_hud()
+	var/datum/atom_hud/diagsensor = huds[d_hud]
+	diagsensor.add_hud_to(src)
+
+
 /mob/living/silicon/proc/toggle_sensor_mode()
-	var/sensor_type = input("Please select sensor type.", "Sensor Integration", null) in list("Security", "Medical","Disable")
+	var/sensor_type = input("Please select sensor type.", "Sensor Integration", null) in list("Security", "Medical","Diagnostic","Disable")
+	remove_med_sec_hud()
 	switch(sensor_type)
 		if ("Security")
-			sensor_mode = SEC_HUD
+			add_sec_hud()
 			src << "<span class='notice'>Security records overlay enabled.</span>"
 		if ("Medical")
-			sensor_mode = MED_HUD
+			add_med_hud()
 			src << "<span class='notice'>Life signs monitor overlay enabled.</span>"
+		if ("Diagnostic")
+			add_diag_hud()
+			src << "<span class='notice'>Robotics diagnostic overlay enabled.</span>"
 		if ("Disable")
-			sensor_mode = 0
 			src << "Sensor augmentations disabled."

 /mob/living/silicon/proc/receive_alarm(var/datum/alarm_handler/alarm_handler, var/datum/alarm/alarm, was_raised)
@@ -111,10 +111,10 @@
 	..()
 	statpanel("Status")

-	if(emergency_shuttle)
-		var/eta_status = emergency_shuttle.get_status_panel_eta()
-		if(eta_status)
-			stat(null, eta_status)
+	if(shuttle_master.emergency.mode >= SHUTTLE_RECALL)
+		var/timeleft = shuttle_master.emergency.timeLeft()
+		if(timeleft > 0)
+			stat(null, "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]")

 	if (client.statpanel == "Status")
 		stat("Chemicals", chemicals)
@@ -131,7 +131,7 @@
 			if("head")
 				if(inventory_head)
 					if(inventory_head.flags & NODROP)
-						usr << "<span = 'warning'>\The [inventory_head] is stuck too hard to [src] for you to remove!</span>"
+						usr << "<span class='warning'>\The [inventory_head] is stuck too hard to [src] for you to remove!</span>"
 						return
 					name = real_name
 					desc = initial(desc)
@@ -150,7 +150,7 @@
 			if("back")
 				if(inventory_back)
 					if(inventory_back.flags & NODROP)
-						usr << "<span = 'warning'>\The [inventory_back] is stuck too hard to [src] for you to remove!</span>"
+						usr << "<span class='warning'>\The [inventory_back] is stuck too hard to [src] for you to remove!</span>"
 						return
 					inventory_back.loc = src.loc
 					inventory_back = null
@@ -129,13 +129,14 @@
 	var/input = stripped_input(src, "Please enter a message to tell your summoner.", "Guardian", "")
 	if(!input) return

+
 	for(var/mob/M in mob_list)
 		if(M == summoner)
 			M << "<span class='changeling'><i>[src]:</i> [input]</span>"
+			log_say("Guardian Communication: [key_name(src)] -> [key_name(M)] : [input]")
 		else if (M in dead_mob_list)
 			M << "<span class='changeling'><i>Guardian Communication from <b>[src]</b> ([ghost_follow_link(src, ghost=M)]): [input]</i>"
 	src << "<span class='changeling'><i>[src]:</i> [input]</span>"
-	log_say("Guardian Communication: [src.real_name]/[src.key] : [input]")

 /mob/living/simple_animal/hostile/guardian/proc/ToggleMode()
 	src << "<span class='danger'><B>You dont have another mode!</span></B>"
@@ -153,10 +154,11 @@
 			var/mob/living/simple_animal/hostile/guardian/G = M
 			if(G.summoner == src)
 				G << "<span class='changeling'><i>[src]:</i> [input]</span>"
+				log_say("Guardian Communication: [key_name(src)] -> [key_name(G)] : [input]")
+
 		else if (M in dead_mob_list)
 			M << "<span class='changeling'><i>Guardian Communication from <b>[src]</b> ([ghost_follow_link(src, ghost=M)]): [input]</i>"
 	src << "<span class='changeling'><i>[src]:</i> [input]</span>"
-	log_say("Guardian Communication: [src.real_name]/[src.key] : [text]")

 /mob/living/proc/guardian_recall()
 	set name = "Recall Guardian"
@@ -340,8 +342,8 @@

 /mob/living/simple_animal/hostile/guardian/healer/Life()
 	..()
-	regular_hud_updates()
-	process_med_hud(src, 1)
+	var/datum/atom_hud/medsensor = huds[DATA_HUD_MEDICAL_ADVANCED]
+	medsensor.add_hud_to(src)

 /mob/living/simple_animal/hostile/guardian/healer/AttackingTarget()
 	..()
@@ -64,6 +64,9 @@

 		client.screen += client.void

+	//HUD updates (antag hud, etc)
+	//readd this mob's HUDs (antag, med, etc)
+	reload_huds()

 	CallHook("Login", list("client" = src.client, "mob" = src))

@@ -18,8 +18,13 @@
 		dead_mob_list += src
 	else
 		living_mob_list += src
+	prepare_huds()
 	..()

+/atom/proc/prepare_huds()
+	for(var/hud in hud_possible)
+		hud_list[hud] = image('icons/mob/hud.dmi', src, "")
+
 /mob/proc/generate_name()
 	return name

@@ -106,7 +111,21 @@
 	for(var/mob/M in get_mobs_in_view(range, src))
 		if(self_message && M==src)
 			msg = self_message
-		M.show_message( msg, 2, deaf_message, 1)
+		M.show_message(msg, 2, deaf_message, 1)
+	
+	// based on say code
+	var/omsg = replacetext(message, "<B>[src]</B> ", "")
+	var/list/listening_obj = new
+	for(var/atom/movable/A in view(range, src))
+		if(istype(A, /mob))
+			var/mob/M = A
+			for(var/obj/O in M.contents)
+				listening_obj |= O
+		else if(istype(A, /obj))
+			var/obj/O = A
+			listening_obj |= O
+	for(var/obj/O in listening_obj)
+		O.hear_message(src, omsg)

 // Show a message to all mobs in earshot of this atom
 // Use for objects performing audible actions
@@ -1379,6 +1398,10 @@ mob/proc/yank_out_object()
 		spell.action.Grant(src)
 	return

+//override to avoid rotating pixel_xy on mobs
+/mob/shuttleRotate(rotation)
+	dir = angle2dir(rotation+dir2angle(dir))
+
 /mob/proc/handle_ventcrawl()
 	return // Only living mobs can ventcrawl

@@ -131,6 +131,8 @@

 	var/datum/hud/hud_used = null

+	hud_possible = list(SPECIALROLE_HUD)
+
 	var/research_scanner = 0 //For research scanner equipped mobs. Enable to show research data when examining.
 	var/datum/action/scan_mode/scanner = new

@@ -379,14 +379,10 @@
 		var/dat = "<html><body><center>"
 		dat += "Round Duration: [round(hours)]h [round(mins)]m<br>"

-		if(emergency_shuttle) //In case Nanotrasen decides reposess CentComm's shuttles.
-			if(emergency_shuttle.going_to_centcom()) //Shuttle is going to centcomm, not recalled
-				dat += "<font color='red'><b>The station has been evacuated.</b></font><br>"
-			if(emergency_shuttle.online())
-				if (emergency_shuttle.evac)	// Emergency shuttle is past the point of no recall
-					dat += "<font color='red'>The station is currently undergoing evacuation procedures.</font><br>"
-				else						// Crew transfer initiated
-					dat += "<font color='red'>The station is currently undergoing crew transfer procedures.</font><br>"
+		if(shuttle_master.emergency.mode >= SHUTTLE_ESCAPE)
+			dat += "<font color='red'><b>The station has been evacuated.</b></font><br>"
+		else if(shuttle_master.emergency.mode >= SHUTTLE_CALL)
+			dat += "<font color='red'>The station is currently undergoing evacuation procedures.</font><br>"

 		dat += "Choose from the following open positions:<br>"
 		for(var/datum/job/job in job_master.occupations)
@@ -113,7 +113,7 @@

 	// let spirits identify cultists
 	if(ticker.mode)
-		ticker.mode.reset_cult_icons_for_spirit(new_spirit)
+		ticker.mode.add_cult_icon_to_spirit(new_spirit)

 	// highlander test
 	there_can_be_only_one_mask(new_spirit)
@@ -320,7 +320,7 @@

 /mob/proc/safe_respawn(var/MP)
 	if(!MP)
-		return 0	
+		return 0

 	if(ispath(MP, /mob/living/simple_animal/pet/cat))
 		return 1
@@ -347,7 +347,7 @@

 	if(ispath(MP, /mob/living/simple_animal/borer) && !jobban_isbanned(src, "alien") && !jobban_isbanned(src, "Syndicate"))
 		return 1
-		
+
 	if(ispath(MP, /mob/living/simple_animal/diona) && !jobban_isbanned(src, "Dionaea"))
 		return 1