diff --git a/code/__DEFINES/mob_defines.dm b/code/__DEFINES/mob_defines.dm
index bc34c47d799..c9f02b2e449 100644
--- a/code/__DEFINES/mob_defines.dm
+++ b/code/__DEFINES/mob_defines.dm
@@ -62,11 +62,6 @@
#define PULSE_THREADY 5 //occurs during hypovolemic shock
//feel free to add shit to lists below
-
-//proc/get_pulse methods
-#define GETPULSE_HAND 0 //less accurate (hand)
-#define GETPULSE_TOOL 1 //more accurate (med scanner, sleeper, etc)
-
//Reagent Metabolization flags, defines the type of reagents that affect this mob
#define PROCESS_ORG 1 //Only processes reagents with "ORGANIC" or "ORGANIC | SYNTHETIC"
#define PROCESS_SYN 2 //Only processes reagents with "SYNTHETIC" or "ORGANIC | SYNTHETIC"
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 1d3206bd22b..fd36bd11c03 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -220,7 +220,7 @@
// I'm not sure WHY you'd want to put a simple_animal in a sleeper, but precedent is precedent
// Runtime is aptly named, isn't she?
if(ishuman(occupant) && !(NO_BLOOD in occupant.dna.species.species_traits))
- occupantData["pulse"] = occupant.get_pulse(GETPULSE_TOOL)
+ occupantData["pulse"] = occupant.get_pulse()
occupantData["hasBlood"] = 1
occupantData["bloodLevel"] = round(occupant.blood_volume)
occupantData["bloodMax"] = occupant.max_blood
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index e35c125f33c..1e6afac677b 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -265,7 +265,7 @@
bloodData["hasBlood"] = TRUE
bloodData["volume"] = occupant.blood_volume
bloodData["percent"] = round(((occupant.blood_volume / BLOOD_VOLUME_NORMAL)*100))
- bloodData["pulse"] = occupant.get_pulse(GETPULSE_TOOL)
+ bloodData["pulse"] = occupant.get_pulse()
bloodData["bloodLevel"] = occupant.blood_volume
bloodData["bloodMax"] = occupant.max_blood
occupantData["blood"] = bloodData
diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm
index 33f31f8b4eb..0157838c26c 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -115,7 +115,7 @@
if(ishuman(occupant) && !(NO_BLOOD in occupant.dna.species.species_traits))
var/mob/living/carbon/human/H = occupant
- occupantData["pulse"] = occupant.get_pulse(GETPULSE_TOOL)
+ occupantData["pulse"] = occupant.get_pulse()
occupantData["hasBlood"] = 1
occupantData["bloodLevel"] = round(occupant.blood_volume)
occupantData["bloodMax"] = H.max_blood
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index a25f84f7421..0ca3929c975 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -256,7 +256,7 @@ REAGENT SCANNER
else
to_chat(user, "Blood level [blood_percent] %, [H.blood_volume] cl, type: [blood_type]")
- to_chat(user, "Subject's pulse: [H.get_pulse(GETPULSE_TOOL)] bpm.")
+ to_chat(user, "Subject's pulse: [H.get_pulse()] bpm.")
var/implant_detect
for(var/obj/item/organ/internal/O in H.internal_organs)
if(O.is_robotic())
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 0f066bc96ce..77d82c1a8cc 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -846,28 +846,25 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
return null
//generates realistic-ish pulse output based on preset levels
-/mob/living/carbon/proc/get_pulse(method) //method 0 is for hands, 1 is for machines, more accurate
- var/temp = 0 //see setup.dm:694
+/mob/living/carbon/proc/get_pulse()
+ var/temp = 0
switch(pulse)
if(PULSE_NONE)
return "0"
if(PULSE_SLOW)
temp = rand(40, 60)
- return num2text(method ? temp : temp + rand(-10, 10))
+ return num2text(temp)
if(PULSE_NORM)
temp = rand(60, 90)
- return num2text(method ? temp : temp + rand(-10, 10))
+ return num2text(temp)
if(PULSE_FAST)
temp = rand(90, 120)
- return num2text(method ? temp : temp + rand(-10, 10))
+ return num2text(temp)
if(PULSE_2FAST)
temp = rand(120, 160)
- return num2text(method ? temp : temp + rand(-10, 10))
+ return num2text(temp)
if(PULSE_THREADY)
- return method ? ">250" : "extremely weak and fast, patient's artery feels like a thread"
-// output for machines^ ^^^^^^^output for people^^^^^^^^^
-
-
+ return ">250"
/mob/living/carbon/proc/canBeHandcuffed()
return FALSE
diff --git a/code/modules/mob/living/carbon/human/human_mob.dm b/code/modules/mob/living/carbon/human/human_mob.dm
index f9ceb08ff1a..9b6d126828b 100644
--- a/code/modules/mob/living/carbon/human/human_mob.dm
+++ b/code/modules/mob/living/carbon/human/human_mob.dm
@@ -1226,44 +1226,6 @@
dna.real_name = name
return name
-/mob/living/carbon/human/verb/check_pulse()
- set category = null
- set name = "Check pulse"
- set desc = "Approximately count somebody's pulse. Requires you to stand still at least 6 seconds."
- set src in view(1)
- var/self = 0
-
- if (!ishuman(src))
- to_chat(usr, "You do not know how to check someone's pulse!")
- return
-
- if(usr.stat == 1 || usr.restrained() || !isliving(usr) || usr.is_dead()) return
-
- if(usr == src)
- self = 1
- if(!self)
- usr.visible_message("[usr] kneels down, puts [usr.p_their()] hand on [src]'s wrist and begins counting [p_their()] pulse.",\
- "You begin counting [src]'s pulse")
- else
- usr.visible_message("[usr] begins counting [p_their()] pulse.",\
- "You begin counting your pulse.")
-
- if(src.pulse)
- to_chat(usr, "[self ? "You have a" : "[src] has a"] pulse! Counting...")
- else
- to_chat(usr, "[src] has no pulse!")//it is REALLY UNLIKELY that a dead person would check his own pulse
-
- return
-
- to_chat(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()
- to_chat(usr, "You moved while counting. Try again.")
- else
- to_chat(usr, "[self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)].")
-
-
/mob/living/carbon/human/proc/change_dna(datum/dna/new_dna, include_species_change = FALSE, keep_flavor_text = FALSE)
if(include_species_change)
set_species(new_dna.species.type, retain_damage = TRUE, transformation = TRUE, keep_missing_bodyparts = TRUE)
@@ -2179,7 +2141,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
set category = "IC"
update_flavor_text()
-
+
/mob/living/carbon/human/proc/apply_offstation_roles(source)
SIGNAL_HANDLER
mind.offstation_role = TRUE