From b08302f7b1cff236c6f0fa92299f867e287f33a7 Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Tue, 19 May 2015 21:11:51 +0200
Subject: [PATCH 1/2] Pulse measuring tweaks.

Now both the pulse checker and target must remain still for the duration of the check.
Previously it may have been possible for dead humans to check the pulse of self and others.
---
 code/modules/mob/living/carbon/human/human.dm | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 3eacc54926..901c7ca6b0 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("<span class='notice'>[usr] kneels down, puts \his hand on [src]'s wrist and begins counting their pulse.</span>",\
 		"You begin counting [src]'s pulse")
 	else
-		usr.visible_message("\blue [usr] begins counting their pulse.",\
+		usr.visible_message("<span class='notice'>[usr] begins counting their pulse.</span>",\
 		"You begin counting your pulse.")
 
 	if(src.pulse)
-		usr << "\blue [self ? "You have a" : "[src] has a"] pulse! Counting..."
+		usr << "<span class='notice'>[self ? "You have a" : "[src] has a"] pulse! Counting...</span>"
 	else
-		usr << "\red [src] has no pulse!"	//it is REALLY UNLIKELY that a dead person would check his own pulse
+		usr << "<span class='danger'>[src] has no pulse!</span>"	//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 << "<span class='notice'>[self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)].</span>"
 	else
-		usr << "\blue [self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)]."
+		usr << "<span class='warning'>You failed to check the pulse. Try again.</span>"
 
 /mob/living/carbon/human/proc/set_species(var/new_species, var/default_colour)
 

From 7b8bcdf4becba1f6bd3d5bf3785bac34da90f9c8 Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Tue, 19 May 2015 21:17:29 +0200
Subject: [PATCH 2/2] Changelog.

---
 html/changelogs/PsiOmegaDelta-PulseCheck.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 html/changelogs/PsiOmegaDelta-PulseCheck.yml

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."
+