From 46ad32ad8f53ccd1025cbe01c8650a053ce768a3 Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Thu, 15 Jan 2015 18:27:52 +1300 Subject: [PATCH 1/3] AI/borg med HUD fix - Fixes bug causing AI's and borgs with medical sensor augmentation set to not see med huds - Status icon displayed if suit sensors set to binary or higher - Health bar displayed if suit sensors set to vitals or higher - Wearable med huds will always display all info, including mounted borg huds --- code/defines/procs/hud.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/defines/procs/hud.dm b/code/defines/procs/hud.dm index 04afb6c63e..c9bcaeea1b 100644 --- a/code/defines/procs/hud.dm +++ b/code/defines/procs/hud.dm @@ -12,12 +12,12 @@ proc/process_med_hud(var/mob/M, var/local_scanner, var/mob/Alt) if(P.Mob.see_invisible < patient.invisibility) continue - if(!(local_scanner || hassensorlevel(P, SUIT_SENSOR_VITAL))) + if(!(local_scanner || hassensorlevel(patient, SUIT_SENSOR_BINARY))) continue - P.Client.images += patient.hud_list[HEALTH_HUD] - if(local_scanner) - P.Client.images += patient.hud_list[STATUS_HUD] + P.Client.images += patient.hud_list[STATUS_HUD] + if(local_scanner || hassensorlevel(patient, SUIT_SENSOR_VITAL)) + P.Client.images += patient.hud_list[HEALTH_HUD] //Security HUDs. Pass a value for the second argument to enable implant viewing or other special features. proc/process_sec_hud(var/mob/M, var/advanced_mode, var/mob/Alt) From e5ab434d1d51f53491b8a22cd8e7dacd95211da9 Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Thu, 15 Jan 2015 21:18:58 +1300 Subject: [PATCH 2/3] Reverted health status hud icon from AI overlay --- code/defines/procs/hud.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/defines/procs/hud.dm b/code/defines/procs/hud.dm index c9bcaeea1b..be678b8397 100644 --- a/code/defines/procs/hud.dm +++ b/code/defines/procs/hud.dm @@ -12,12 +12,12 @@ proc/process_med_hud(var/mob/M, var/local_scanner, var/mob/Alt) if(P.Mob.see_invisible < patient.invisibility) continue - if(!(local_scanner || hassensorlevel(patient, SUIT_SENSOR_BINARY))) + if(!(local_scanner || hassensorlevel(patient, SUIT_SENSOR_VITAL))) continue - P.Client.images += patient.hud_list[STATUS_HUD] - if(local_scanner || hassensorlevel(patient, SUIT_SENSOR_VITAL)) - P.Client.images += patient.hud_list[HEALTH_HUD] + P.Client.images += patient.hud_list[HEALTH_HUD] + if(local_scanner) + P.Client.images += patient.hud_list[STATUS_HUD] //Security HUDs. Pass a value for the second argument to enable implant viewing or other special features. proc/process_sec_hud(var/mob/M, var/advanced_mode, var/mob/Alt) From 5fc035bffc43f9123bb53ebf8f51f7b6161911c7 Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Thu, 15 Jan 2015 21:21:13 +1300 Subject: [PATCH 3/3] Ghost labeller fix No you cant stick labels on ghosts --- code/modules/paperwork/handlabeler.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 3722d586e4..fe519e01d4 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -33,6 +33,9 @@ if(issilicon(A)) user << "The label refuses to stick to [A.name]." return + if(isobserver(A)) + user << "[src] passes through [A.name]." + return if(istype(A, /obj/item/weapon/reagent_containers/glass)) user << "The label can't stick to the [A.name]. (Try using a pen)" return