Merge pull request #49124 from kriskog/timeofdeath

Defib tod cleanup
This commit is contained in:
Jordan Brown
2020-02-04 11:10:04 -05:00
committed by GitHub
3 changed files with 0 additions and 9 deletions
-4
View File
@@ -262,10 +262,6 @@ GLOBAL_LIST_INIT(pda_styles, sortList(list(MONO, VT, ORBITRON, SHARE)))
#define MAP_MAXY 5
#define MAP_MAXZ 6
// Defib stats
#define DEFIB_TIME_LIMIT 900
#define DEFIB_TIME_LOSS 60
// Diagonal movement
#define FIRST_DIAG_STEP 1
#define SECOND_DIAG_STEP 2
-3
View File
@@ -76,9 +76,6 @@
if(!(M.failed_last_breath || M.losebreath))
lung_strength = "healthy"
if(M.stat == DEAD && heart && world.time - M.timeofdeath < DEFIB_TIME_LIMIT * 10)
heart_strength = "<span class='boldannounce'>a faint, fluttery</span>"
var/diagnosis = (body_part == BODY_ZONE_CHEST ? "You hear [heart_strength] pulse and [lung_strength] respiration." : "You faintly hear [heart_strength] pulse.")
user.visible_message("<span class='notice'>[user] places [src] against [M]'s [body_part] and listens attentively.</span>", "<span class='notice'>You place [src] against [M]'s [body_part]. [diagnosis]</span>")
return
-2
View File
@@ -73,8 +73,6 @@
update_mobility()
med_hud_set_health()
med_hud_set_status()
if(!gibbed && !QDELETED(src))
addtimer(CALLBACK(src, .proc/med_hud_set_status), (DEFIB_TIME_LIMIT * 10) + 1)
stop_pulling()
. = ..()