From b92e5a4ccba299316db6ede29b41a2ea7d887790 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Tue, 22 Dec 2015 06:23:12 -0500
Subject: [PATCH] fixes

---
 code/modules/mob/dead/observer/observer.dm    | 52 +++++++++++++------
 .../living/silicon/pai/software_modules.dm    |  1 +
 nano/templates/pai_bioscan.tmpl               |  3 ++
 3 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 37f92547f98..7ae9f75cd82 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -28,7 +28,6 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
 	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
@@ -254,19 +253,34 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	return 1
 
 
+/mob/dead/observer/proc/show_me_the_hud(hud_index)
+	var/datum/atom_hud/H = huds[hud_index]
+	H.add_hud_to(src)
+	data_hud_seen = hud_index
+
 /mob/dead/observer/verb/toggle_medHUD()
 	set category = "Ghost"
-	set name = "Toggle MedicHUD"
+	set name = "Toggle Medic/Sec/DiagHUD"
 	set desc = "Toggles the medical HUD."
 	if(!client)
 		return
-	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 = 0
+	if(data_hud_seen) //remove old huds
+		var/datum/atom_hud/H = huds[data_hud_seen]
+		H.remove_hud_from(src)
+
+	switch(data_hud_seen) //give new huds
+		if(0)
+			show_me_the_hud(DATA_HUD_SECURITY_BASIC)
+			src << "<span class='notice'>Security HUD set.</span>"
+		if(DATA_HUD_SECURITY_BASIC)
+			show_me_the_hud(DATA_HUD_MEDICAL_ADVANCED)
+			src << "<span class='notice'>Medical HUD set.</span>"
+		if(DATA_HUD_MEDICAL_ADVANCED)
+			show_me_the_hud(DATA_HUD_DIAGNOSTIC)
+			src << "<span class='notice'>Diagnostic HUD set.</span>"
+		if(DATA_HUD_DIAGNOSTIC)
+			data_hud_seen = 0
+			src << "<span class='notice'>HUDs disabled.</span>"
 
 
 /mob/dead/observer/verb/toggle_antagHUD()
@@ -291,13 +305,21 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(!M.has_enabled_antagHUD && !check_rights(R_ADMIN|R_MOD,0))
 		M.has_enabled_antagHUD = 1
 
-	var/datum/atom_hud/A = huds[DATA_HUD_SECURITY_ADVANCED]
-	var/adding_hud = (usr in A.hudusers) ? 0 : 1
+	//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)
-	usr << "AntagHud Toggled [adding_hud ? "ON" : "OFF"]"
-
+		if(istype(H, /datum/atom_hud/antag))// || istype(H, /datum/atom_hud/data/human/security/advanced))
+			if(!M.antagHUD)
+			//(adding_hud) ? H.add_hud_to(usr) : H.remove_hud_from(usr)
+				H.add_hud_to(usr)
+			else
+				H.remove_hud_from(usr)
+	if(!M.antagHUD)
+		usr << "AntagHud Toggled ON"
+		M.antagHUD = 1
+	else
+		usr << "AntagHud Toggled OFF"
+		M.antagHUD = 0
 
 /mob/dead/observer/proc/dead_tele(A in ghostteleportlocs)
 	set category = "Ghost"
diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm
index da92258aaba..11e3abaf7e8 100644
--- a/code/modules/mob/living/silicon/pai/software_modules.dm
+++ b/code/modules/mob/living/silicon/pai/software_modules.dm
@@ -579,6 +579,7 @@
 		if(isliving(held))
 			data["holder"] = held
 			data["health"] = "[held.stat > 1 ? "dead" : "[held.health]% healthy"]"
+			data["brute"] = "[held.getBruteLoss() > 50 ? "<font color=#FF5555>" : "<font color=#55FF55>"][held.getBruteLoss()]</font>"
 			data["oxy"] = "[held.getOxyLoss() > 50 ? "<font color=#FF5555>" : "<font color=#55FF55>"][held.getOxyLoss()]</font>"
 			data["tox"] = "[held.getToxLoss() > 50 ? "<font color=#FF5555>" : "<font color=#55FF55>"][held.getToxLoss()]</font>"
 			data["burn"] = "[held.getFireLoss() > 50 ? "<font color=#FF5555>" : "<font color=#55FF55>"][held.getFireLoss()]</font>"
diff --git a/nano/templates/pai_bioscan.tmpl b/nano/templates/pai_bioscan.tmpl
index e4dd0046371..921588045a1 100644
--- a/nano/templates/pai_bioscan.tmpl
+++ b/nano/templates/pai_bioscan.tmpl
@@ -10,6 +10,9 @@ code/modules/mob/living/silicon/pai/software_modules.dm
 		<div class="itemContent">
 			Health Status : 	{{:data.health}}
 		</div>
+
+		<div class="itemContent">
+			Brute Damage : 		{{:data.brute}}
 		<div class="itemContent">
 			Oxygen Content : 	{{:data.oxy}}
 		<div class="itemContent">