Fixes organ damage and pulse (#7521)

Fixes organ damage and pulse
This commit is contained in:
Matt Atlas
2019-11-27 23:15:11 +02:00
committed by Erki
parent 173822fad7
commit f088260110
6 changed files with 50 additions and 7 deletions
@@ -228,7 +228,7 @@
spawn (0)
user.visible_message("<b>[user]</b> checks [src]'s pulse.", "You check [src]'s pulse.")
if (do_mob(user, src, 15))
if(is_pulse_present() == PULSE_NONE)
if(!is_pulse_present())
to_chat(user, "<span class='deadsay'>[T.He] [T.has] no pulse[src.client ? "" : " and [T.his] soul has departed"]...</span>")
else
to_chat(user, "<span class='deadsay'>[T.He] [T.has] a pulse!</span>")
@@ -97,10 +97,6 @@
..()
handle_regeneration()
/obj/item/organ/internal/proc/heal_damage(amount)
if (can_recover())
damage = between(0, damage - round(amount, 0.1), max_damage)
/obj/item/organ/internal/proc/handle_regeneration()
if(!damage || BP_IS_ROBOTIC(src) || !owner || owner.chem_effects[CE_TOXIN])
return
+4
View File
@@ -246,6 +246,10 @@
/obj/item/organ/proc/rejuvenate()
damage = 0
/obj/item/organ/proc/heal_damage(amount)
if (can_recover())
damage = between(0, damage - round(amount, 0.1), max_damage)
/obj/item/organ/proc/is_broken()
return (damage >= min_broken_damage || (status & ORGAN_CUT_AWAY) || (status & ORGAN_BROKEN))
+1 -1
View File
@@ -344,7 +344,7 @@
droplimb(0, DROPLIMB_EDGE)
/obj/item/organ/external/proc/heal_damage(brute, burn, internal = 0, robo_repair = 0)
/obj/item/organ/external/heal_damage(brute, burn, internal = 0, robo_repair = 0)
if(status & ORGAN_ROBOT && !robo_repair)
return
+2 -1
View File
@@ -74,7 +74,8 @@
if(I.robotic < 2)
user.visible_message("<span class='notice'>[user] treats damage to [target]'s [I.name] with [tool_name].</span>", \
"<span class='notice'>You treat damage to [target]'s [I.name] with [tool_name].</span>" )
I.damage = 0
var/organ_damage = I.damage
I.heal_damage(organ_damage)
var/obj/item/organ/internal/brain/sponge = target.internal_organs_by_name[BP_BRAIN]
if(sponge && istype(I, sponge))
target.cure_all_traumas(cure_type = CURE_SURGERY)