diff --git a/code/game/objects/items/devices/scanners/guide.dm b/code/game/objects/items/devices/scanners/guide.dm
index 6b40efd24f8..d41116754a8 100644
--- a/code/game/objects/items/devices/scanners/guide.dm
+++ b/code/game/objects/items/devices/scanners/guide.dm
@@ -1,15 +1,15 @@
-/obj/item/device/healthanalyzer
- var/guide = FALSE
-
/obj/item/device/healthanalyzer/verb/toggle_guide()
+ name = "Toggle Guidance"
+ desc = "Toggles whether or not \the [src] will provide guidance and instruction in addition to scanning."
guide = !guide
to_chat(usr, "You toggle \the [src]'s guidance system.")
/obj/item/device/healthanalyzer/guide
name = "Instructional health analyzer"
- desc = "It shows extra information to medical personel!"
+ desc = "A hand-held body scanner able to distinguish vital signs of the subject. It shows extra information to medical personnel!"
guide = TRUE
+ icon_state = "health-g"
/obj/item/device/healthanalyzer/proc/guide(var/mob/living/carbon/human/M, mob/living/user)
@@ -23,7 +23,7 @@
playsound(src, 'sound/effects/pop.ogg', 50, FALSE)
else
playsound(src, 'sound/machines/defib_failed.ogg', 50, 0)
-
+ return
if(!ishuman(M))
return
@@ -68,7 +68,7 @@
if(infection)
dat += "Infection - Give Spaceacilin. If severe, overdose on Spaceacilin and monitor until well.
"
if((M.getBrainLoss() >= 1 && advscan >= 2 && showadvscan == 1) || M.getBrainLoss() >= 10)
- dat += "Brain damage - Commence brain repair surgery, apply Alkysine, or universal organ-repair chemicals. (i.e. Peridaxon)
"
+ dat += "Brain damage - Commence brain repair surgery, apply Alkysine, or universal organ-repair chemicals. (i.e. Peridaxon)
"
if(M.radiation || M.accumulated_rads)
dat += "Radiation - Give Hyroanlin or Arithazine. Monitor for genetic damage.
"
if(organ && (advscan >= 1 && showadvscan == 1))
diff --git a/code/game/objects/items/devices/scanners/health.dm b/code/game/objects/items/devices/scanners/health.dm
index f925c087694..18c23fe0cb6 100644
--- a/code/game/objects/items/devices/scanners/health.dm
+++ b/code/game/objects/items/devices/scanners/health.dm
@@ -15,12 +15,20 @@
var/mode = 1;
var/advscan = 0
var/showadvscan = 1
+ var/guide = FALSE
/obj/item/device/healthanalyzer/New()
if(advscan >= 1)
verbs += /obj/item/device/healthanalyzer/proc/toggle_adv
..()
+/obj/item/device/healthanalyzer/examine(mob/user)
+ . = ..()
+ if(guide)
+ . += "Guidance is currently enabled."
+ else
+ . += "Guidance is currently disabled."
+
/obj/item/device/healthanalyzer/do_surgery(mob/living/M, mob/living/user)
if(user.a_intent != I_HELP) //in case it is ever used as a surgery tool
return ..()
@@ -344,4 +352,4 @@
origin_tech = list(TECH_MAGNET = 7, TECH_BIO = 8)
icon_state = "health3"
-#undef DEFIB_TIME_LIMIT //VOREStation addition
\ No newline at end of file
+#undef DEFIB_TIME_LIMIT //VOREStation addition
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index 9672e0feb11..35911a76e86 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm
index 7da9931c34b..008bb083f74 100644
--- a/maps/groundbase/gb-z2.dmm
+++ b/maps/groundbase/gb-z2.dmm
@@ -14810,6 +14810,9 @@
departmentType = 2;
pixel_y = 30
},
+/obj/item/device/healthanalyzer/guide,
+/obj/item/device/healthanalyzer/guide,
+/obj/structure/table/glass,
/turf/simulated/floor/tiled/white,
/area/groundbase/medical/triage)
"Po" = (
diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm
index 4d0c51c494f..be8004e3e97 100644
--- a/maps/stellar_delight/stellar_delight2.dmm
+++ b/maps/stellar_delight/stellar_delight2.dmm
@@ -15330,6 +15330,8 @@
/obj/structure/sign/poster{
dir = 8
},
+/obj/item/device/healthanalyzer/guide,
+/obj/item/device/healthanalyzer/guide,
/turf/simulated/floor/tiled/eris/white/bluecorner,
/area/stellardelight/deck2/triage)
"HN" = (
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index c10d0cadb06..4c0ac58041c 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -19327,6 +19327,8 @@
/obj/effect/floor_decal/corner/paleblue/border,
/obj/effect/floor_decal/borderfloorwhite/corner2,
/obj/effect/floor_decal/corner/paleblue/bordercorner2,
+/obj/structure/table/glass,
+/obj/item/device/healthanalyzer/guide,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/triage)
"aFD" = (
@@ -19804,6 +19806,8 @@
/obj/machinery/camera/network/medbay{
dir = 1
},
+/obj/item/device/healthanalyzer/guide,
+/obj/structure/table/glass,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/triage)
"aGn" = (