cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kills Check Pulse (#22501)

Browse Source 
* unchecks verbs

* removes method
This commit is contained in:
Luc
2023-10-01 11:41:39 +01:00
committed by GitHub
parent e0002c620f
commit e757638648
7 changed files with 12 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon.dm
+7 -10
View File
@@ -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
code/modules/mob/living/carbon/human/human_mob.dm
+1 -39
View File
@@ -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, "<span class='notice'>You do not know how to check someone's pulse!</span>")
return
if(usr.stat == 1 || usr.restrained() || !isliving(usr) || usr.is_dead()) return
if(usr == src)
self = 1
if(!self)
usr.visible_message("<span class='notice'>[usr] kneels down, puts [usr.p_their()] hand on [src]'s wrist and begins counting [p_their()] pulse.</span>",\
"You begin counting [src]'s pulse")
else
usr.visible_message("<span class='notice'>[usr] begins counting [p_their()] pulse.</span>",\
"You begin counting your pulse.")
if(src.pulse)
to_chat(usr, "<span class='notice'>[self ? "You have a" : "[src] has a"] pulse! Counting...</span>")
else
to_chat(usr, "<span class='warning'>[src] has no pulse!</span>")//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, "<span class='notice'>[self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)].</span>")
/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