From 8ec4abe6e1bd69a33edf4ea7044aecb57592a870 Mon Sep 17 00:00:00 2001
From: uporotiy <uporotiy@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Wed, 11 May 2011 20:06:24 +0000
Subject: [PATCH] I accidentally a memory leak. Anyhow, HUDs' memory leak
 fixed, also security HUD added (only shows current ID assignment for now,
 gotta figure out why it doesn't want to show the arrest/prisoner status).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1569 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/defines/obj/clothing/glasses.dm         |  16 ++++++--
 code/game/jobs/access.dm                     |  19 ++++++++-
 code/modules/mob/living/carbon/human/life.dm |  40 +++++++++++++++----
 icons/mob/eyes.dmi                           | Bin 4832 -> 4980 bytes
 icons/mob/hud.dmi                            | Bin 645 -> 1788 bytes
 icons/obj/clothing/glasses.dmi               | Bin 3469 -> 3783 bytes
 maps/tgstation.2.0.7.dmm                     |   6 +--
 7 files changed, 67 insertions(+), 14 deletions(-)

diff --git a/code/defines/obj/clothing/glasses.dm b/code/defines/obj/clothing/glasses.dm
index d6de1488699e9..3a4c119d8e07e 100644
--- a/code/defines/obj/clothing/glasses.dm
+++ b/code/defines/obj/clothing/glasses.dm
@@ -59,11 +59,21 @@
 	icon_state = "thermoncle"
 	flags = null //doesn't protect eyes because it's a monocle, duh
 
-/obj/item/clothing/glasses/healthscanner
+/obj/item/clothing/glasses/hud
+	name = "HUD"
+	desc = "A heads-up display that provides important info in (almost) real time."
+	flags = null //doesn't protect eyes because it's a monocle, duh
+
+/obj/item/clothing/glasses/hud/health
 	name = "Health Scanner HUD"
 	desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
-	icon_state = "healthscanner"
-	flags = null //doesn't protect eyes because it's a monocle, duh
+	icon_state = "healthhud"
+	var/list/icon/current = list() //the current hud icons
+
+/obj/item/clothing/glasses/hud/security
+	name = "Security HUD"
+	desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status."
+	icon_state = "securityhud"
 	var/list/icon/current = list() //the current hud icons
 
 /proc/RoundHealth(health)
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index 85db305b3ba82..d74f121c54019 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -364,4 +364,21 @@
 	return list("Assistant", "Station Engineer", "Shaft Miner", "Detective", "Medical Doctor", "Captain", "Security Officer", "Warden",
 				"Geneticist", "Scientist", "Head of Security", "Head of Personnel", "Atmospheric Technician",
 				"Chaplain", "Barman", "Chemist", "Janitor", "Clown", "Mime", "Chef", "Roboticist", "Quartermaster",
-				"Chief Engineer", "Research Director", "Botanist", "Librarian", "Lawyer", "Virologist", "Cargo Technician", "Chief Medical Officer")
\ No newline at end of file
+				"Chief Engineer", "Research Director", "Botanist", "Librarian", "Lawyer", "Virologist", "Cargo Technician", "Chief Medical Officer")
+
+/obj/proc/GetJobName()
+	if (!istype(src, /obj/item/device/pda) && !istype(src,/obj/item/weapon/card/id))
+		return
+
+	var/jobName
+
+	if(istype(src, /obj/item/device/pda))
+		if(src:id)
+			jobName = src:id:assignment
+	if(istype(src, /obj/item/weapon/card/id))
+		jobName = src:assignment
+
+	if(jobName in get_all_jobs())
+		return jobName
+	else
+		return "Unknown"
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index f136c5e2ef84a..cdb1ae3a563e1 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -746,7 +746,7 @@
 
 			if(client)
 				for(var/image/hud in client.images)
-					if(copytext(hud.icon_state,6) == "health") //ugly, but icon comparison is worse, I believe
+					if(copytext(hud.icon_state,4) == "hud") //ugly, but icon comparison is worse, I believe
 						del(hud)
 
 			if (src.stat == 2 || src.mutations & XRAY)
@@ -795,19 +795,45 @@
 				src.sight |= SEE_OBJS
 				if (!src.druggy)
 					src.see_invisible = 0
-			else if (istype(glasses, /obj/item/clothing/glasses/healthscanner))
+			else if (istype(glasses, /obj/item/clothing/glasses/hud/security))
+				if(client)
+					var/icon/tempHud = 'hud.dmi'
+					for(var/mob/living/carbon/human/perp in view(src))
+						if(perp.wear_id)
+							client.images += image(tempHud,perp,"hud[ckey(perp:wear_id:GetJobName())]")
+							for (var/datum/data/record/E in data_core.general)
+								var/perpname = "wot"
+								if(istype(perp.wear_id,/obj/item/weapon/card/id))
+									perpname = perp.wear_id:registered
+								else if(istype(perp.wear_id,/obj/item/device/pda))
+									var/obj/item/device/pda/tempPda = perp.wear_id
+									perpname = tempPda.owner
+								world << "[perpname]"
+								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*"))
+											client.images += image(tempHud,perp,"hudwanted")
+											break
+										else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Incarcerated"))
+											client.images += image(tempHud,perp,"hudprisoner")
+											break
+						else
+							client.images += image(tempHud,perp,"hudunknown")
+				if (!src.druggy)
+					src.see_invisible = 0
+			else if (istype(glasses, /obj/item/clothing/glasses/hud/health))
 				if(client)
 					var/icon/tempHud = 'hud.dmi'
 					for(var/mob/living/carbon/human/patient in view(src))
-						client.images += image(tempHud,patient,RoundHealth(patient.health))
+						client.images += image(tempHud,patient,"hud[RoundHealth(patient.health)]")
 						if(patient.stat == 2)
-							client.images += image(tempHud,patient,"healthdead")
+							client.images += image(tempHud,patient,"huddead")
 						else if(patient.alien_egg_flag)
-							client.images += image(tempHud,patient,"healthxeno")
+							client.images += image(tempHud,patient,"hudxeno")
 						else if(patient.virus)
-							client.images += image(tempHud,patient,"healthill")
+							client.images += image(tempHud,patient,"hudill")
 						else
-							client.images += image(tempHud,patient,"healthy")
+							client.images += image(tempHud,patient,"hudhealthy")
 				if (!src.druggy)
 					src.see_invisible = 0
 
diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi
index d8c4e544a54a8bf075c3cc14f4fbe0992bb6c44c..ecebb787f9985ed184a03c4cd921693bfaba8c76 100644
GIT binary patch
delta 4478
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
G)&BrbL&%^2

literal 4832
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
HUF81&5ck#I

diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
index 38f3e5213ae1667892186f19e22e0c7ab1780daf..dcce261c23a7b3cfc9f50478e013fa41f62cefec 100644
GIT binary patch
literal 1788
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

delta 637
zcmV-@0)qYg4TS|biBL{Q4GJ0x0000DNk~Le0001h0001h2m=5B0QBII`2YX_bx=%H
zMZmzohlht#bV5TzLoWa?kwF!IDmx*2D}VRTUpr$9PGSpUTnc1J2VI;IZHW&pIR?43
z4KgnU)0hn}A_ICq1%wy^fdT@?007l+3OyeJ$Up{94gpUA0eb)dga81*z`#lX06z-*
z8UO$Q0d!JMQvg8b*k%9#0IYgcSad{Xb7OL8aCB*JZU6vyoKseCa&`BA^iy#0_2eo`
zEh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+BQ-InB%@M^i!&v&
zs2C_>$i<mfl$e_eVWX+b%*i2AWlCyd3Xw`HQuFeORBC8oK%`0wVilSZtI&j4g+``C
z`-WJBM5@DK9x(1xQgaf2D}hW?9aD5ox_AOrS;5uM1)Qz`?5e9%UBwSY00037Nkl<Z
zc%1FiYfr*37>41(*yy@d1;hh*KqdbFpJ>^X@a9e1#F31U`^vsOU+#3RF_WH&nf9W4
z(Tnc0UUZ+7WmT1BG+;XKL<0(22R0fobFOKe8xqjY!xs;zJE;JFf8$dDRp<XFP=_P1
z$pGh@VF7KM49K5AlMER83+&+p5_iCdg5)n4d<ioF;Q)N<5}M2_G?`auGOy5NULgPg
z0011_N@~B8)V`3^zLa#pO3(rKC)R5n@bKsHKnFZ^o_}3p00000005)gNNV3oYJZW`
z{wnE!x8VIq2kdq{A18Fcr=SDAgi8zn00000V03#)?S*vyfNwzuSm7E20000002s>;
X3`;QEJEbOT00000NkvXXu0mjfqTl>*

diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index 3af65d9c262fd593e16de9df7874f3730a2eac4e..21e45acb3a9a09cc3e45da9a1cbd15a5fd2ca740 100644
GIT binary patch
literal 3783
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
E0c@G<TL1t6

literal 3469
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

diff --git a/maps/tgstation.2.0.7.dmm b/maps/tgstation.2.0.7.dmm
index 9020a4b14bd54..8ec701374f6d0 100644
--- a/maps/tgstation.2.0.7.dmm
+++ b/maps/tgstation.2.0.7.dmm
@@ -577,7 +577,7 @@
 "ale" = (/obj/machinery/atmospherics/pipe/manifold{dir = 4},/turf/simulated/floor,/area/security/warden)
 "alf" = (/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/security/warden)
 "alg" = (/obj/stool/chair{dir = 4},/obj/landmark/start{name = "Warden"},/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_x = 25; pixel_y = 20},/turf/simulated/floor,/area/security/warden)
-"alh" = (/obj/table/reinforced,/obj/machinery/door/window/westright{name = "Warden's Desk"; req_access_txt = "3"},/obj/machinery/door/window/eastleft{name = "Warden's Desk"},/obj/window/reinforced,/obj/item/clothing/mask/gas/emergency,/obj/item/clothing/glasses/thermal,/turf/simulated/floor,/area/security/warden)
+"alh" = (/obj/table/reinforced,/obj/machinery/door/window/westright{name = "Warden's Desk"; req_access_txt = "3"},/obj/machinery/door/window/eastleft{name = "Warden's Desk"},/obj/window/reinforced,/obj/item/clothing/mask/gas/emergency,/obj/item/clothing/glasses/thermal,/obj/item/clothing/glasses/hud/security,/turf/simulated/floor,/area/security/warden)
 "ali" = (/turf/simulated/floor{icon_state = "red"; dir = 9},/area/security/main)
 "alj" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "red"; dir = 1},/area/security/main)
 "alk" = (/turf/simulated/floor{icon_state = "red"; dir = 1},/area/security/main)
@@ -3510,7 +3510,7 @@
 "bpz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/item/device/radio/intercom{pixel_y = 25},/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery)
 "bpA" = (/obj/machinery/computer/operating,/obj/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery)
 "bpB" = (/obj/machinery/door_control{id = "Obshutter"; name = "Observation Door Control"; pixel_y = 25},/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery)
-"bpC" = (/obj/table{icon_state = "tabledir"; dir = 8},/obj/item/weapon/scalpel,/obj/item/clothing/glasses/healthscanner,/obj/item/clothing/glasses/healthscanner,/obj/item/clothing/glasses/healthscanner,/obj/item/clothing/glasses/healthscanner,/obj/item/clothing/glasses/healthscanner,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery)
+"bpC" = (/obj/table{icon_state = "tabledir"; dir = 8},/obj/item/weapon/scalpel,/obj/item/clothing/glasses/hud/health,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery)
 "bpD" = (/obj/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Obshutter"; name = "Observation Shutters"; opacity = 0},/obj/window/reinforced{dir = 8},/obj/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/medical/surgery)
 "bpE" = (/obj/stool/chair{dir = 8},/obj/item/device/radio/intercom{pixel_y = 25},/obj/machinery/camera{c_tag = "Surgery Observation"},/turf/simulated/floor{icon_state = "dark"},/area/medical/surgery)
 "bpF" = (/turf/simulated/floor{icon_state = "dark"},/area/medical/surgery)
@@ -4131,7 +4131,7 @@
 "bBw" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/secure_closet/personal/patient,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/medical/genetics)
 "bBx" = (/obj/machinery/light{dir = 8},/obj/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bBy" = (/obj/grille,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 1},/obj/window/reinforced{dir = 8},/obj/window/reinforced,/turf/simulated/floor/plating,/area/medical/cmo)
-"bBz" = (/obj/table{dir = 5; icon_state = "tabledir"},/obj/item/weapon/reagent_containers/hypospray,/obj/item/clothing/glasses/healthscanner,/turf/simulated/floor{icon_state = "white"},/area/medical/cmo)
+"bBz" = (/obj/table{dir = 5; icon_state = "tabledir"},/obj/item/weapon/reagent_containers/hypospray,/obj/item/clothing/glasses/hud/health,/turf/simulated/floor{icon_state = "white"},/area/medical/cmo)
 "bBA" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/cmo)
 "bBB" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/machinery/requests_console{department = "Chief Medical Officer's Office"; departmentType = 5; name = "CMO RC"; pixel_y = -30},/obj/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor{icon_state = "white"},/area/medical/cmo)
 "bBC" = (/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor{icon_state = "white"},/area/medical/cmo)