diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 7bd7570560..b79f4b269d 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1061,30 +1061,28 @@
set src in view(1)
var/self = 0
- if(usr.stat == 1 || usr.restrained() || !isliving(usr)) return
+ if(usr.stat || usr.restrained() || !isliving(usr)) return
if(usr == src)
self = 1
if(!self)
- usr.visible_message("\blue [usr] kneels down, puts \his hand on [src]'s wrist and begins counting their pulse.",\
+ usr.visible_message("[usr] kneels down, puts \his hand on [src]'s wrist and begins counting their pulse.",\
"You begin counting [src]'s pulse")
else
- usr.visible_message("\blue [usr] begins counting their pulse.",\
+ usr.visible_message("[usr] begins counting their pulse.",\
"You begin counting your pulse.")
if(src.pulse)
- usr << "\blue [self ? "You have a" : "[src] has a"] pulse! Counting..."
+ usr << "[self ? "You have a" : "[src] has a"] pulse! Counting..."
else
- usr << "\red [src] has no pulse!" //it is REALLY UNLIKELY that a dead person would check his own pulse
+ usr << "[src] has no pulse!" //it is REALLY UNLIKELY that a dead person would check his own pulse
return
- usr << "Don't move until counting is finished."
- var/time = world.time
- sleep(60)
- if(usr.l_move_time >= time) //checks if our mob has moved during the sleep()
- usr << "You moved while counting. Try again."
+ usr << "You must [self ? "" : "both"] stand until counting is finished."
+ if(do_mob(usr, src, 60))
+ usr << "[self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)]."
else
- usr << "\blue [self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)]."
+ usr << "You failed to check the pulse. Try again."
/mob/living/carbon/human/proc/set_species(var/new_species, var/default_colour)
diff --git a/html/changelogs/PsiOmegaDelta-PulseCheck.yml b/html/changelogs/PsiOmegaDelta-PulseCheck.yml
new file mode 100644
index 0000000000..4bc80dd2af
--- /dev/null
+++ b/html/changelogs/PsiOmegaDelta-PulseCheck.yml
@@ -0,0 +1,6 @@
+author: PsiOmegaDelta
+delete-after: True
+
+changes:
+ - tweak: "Both the pulse taker and target must now remain still for the duration of the check or it will fail."
+