diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 4792557d707..ca959131e69 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -270,8 +270,8 @@
if(user.a_intent == I_HELP)
var/obj/item/organ/organ = M.get_organ(user.zone_sel.selecting)
if(organ)
- user.visible_message(SPAN_NOTICE("[user] places [src] against [M]'s [organ.name] and listens attentively."),
- "You place [src] against [M]'s [organ.name]. You hear [english_list(organ.listen())].")
+ user.visible_message(SPAN_NOTICE("[user] places \the [src] against [M]'s [organ.name] and listens attentively."),
+ EXAMINE_BLOCK("You place \the [src] against [M]'s [organ.name]. You hear [english_list(organ.listen())]."))
return
return ..(M,user)
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 3972b7b01be..513c20baf6f 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -18,15 +18,15 @@
var/mob/living/carbon/human/H = user
if(H.has_stethoscope_active())
var/obj/item/organ/organ = src.get_organ(user.zone_sel.selecting)
- if(organ)
+ if(organ && do_mob(user, src, 1.5 SECONDS))
user.visible_message("[user] checks [src] with a stethoscope.", "You check [src] with the stethoscope on your person.")
- to_chat(user, SPAN_NOTICE("You place the stethoscope against [src]'s [organ.name]. You hear [english_list(organ.listen())]."))
+ to_chat(user, EXAMINE_BLOCK("You place the stethoscope against [src]'s [organ.name]. You hear [english_list(organ.listen())]."))
else
to_chat(user, SPAN_WARNING("[src] is missing that limb!"))
else if(src.stat && !(src.species.flags & NO_BLOOD))
user.visible_message("[user] checks [src]'s pulse.", "You check [src]'s pulse.")
- if(do_mob(user, src, 15))
+ if(do_mob(user, src, 2 SECONDS))
if(pulse() == PULSE_NONE || (status_flags & FAKEDEATH))
to_chat(user, "[get_pronoun("He")] [get_pronoun("has")] no pulse.")
else
diff --git a/html/changelogs/fluffyghost-stethoscopeexamineblock.yml b/html/changelogs/fluffyghost-stethoscopeexamineblock.yml
new file mode 100644
index 00000000000..0b9fc5d839f
--- /dev/null
+++ b/html/changelogs/fluffyghost-stethoscopeexamineblock.yml
@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: FluffyGhost
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - tweak: "The stethoscope message, for the user, is now inside an examine block."
+ - tweak: "Tuned the delay a little, so the display is not immediate, as you'd need a moment to determine the breathing and heart status."