This commit is contained in:
Fox McCloud
2018-07-09 05:45:01 -04:00
parent 6e9104650e
commit 9463807ac2
5 changed files with 42 additions and 18 deletions
+7
View File
@@ -32,8 +32,15 @@
return
Stop()
/obj/item/organ/internal/heart/necrotize()
..()
Stop()
/obj/item/organ/internal/heart/attack_self(mob/user)
..()
if(status & ORGAN_DEAD)
to_chat(user, "<span class='warning'>You can't restart a dead heart.</span>")
return
if(!beating)
Restart()
spawn(80)
+13 -13
View File
@@ -73,13 +73,11 @@
blood_DNA = list()
blood_DNA[dna.unique_enzymes] = dna.b_type
/obj/item/organ/proc/necrotize(update_sprite=TRUE)
if(is_robotic())
return
/obj/item/organ/proc/necrotize(update_sprite = TRUE)
damage = max_damage
status |= ORGAN_DEAD
processing_objects -= src
if(dead_icon)
if(dead_icon && !is_robotic())
icon_state = dead_icon
if(owner && vital)
owner.death()
@@ -221,21 +219,23 @@
/obj/item/organ/proc/receive_damage(amount, silent = 0)
if(tough)
return
if(is_robotic())
damage = between(0, damage + (amount * 0.8), max_damage)
else
damage = between(0, damage + amount, max_damage)
damage = between(0, damage + amount, max_damage)
//only show this if the organ is not robotic
if(owner && parent_organ && amount > 0)
var/obj/item/organ/external/parent = owner.get_organ(parent_organ)
if(parent && !silent)
owner.custom_pain("Something inside your [parent.name] hurts a lot.")
//only show this if the organ is not robotic
if(owner && parent_organ && amount > 0)
var/obj/item/organ/external/parent = owner.get_organ(parent_organ)
if(parent && !silent)
owner.custom_pain("Something inside your [parent.name] hurts a lot.")
//check if we've hit max_damage
if(damage >= max_damage)
necrotize()
/obj/item/organ/proc/heal_internal_damage(amount, robo_repair = FALSE)
if(is_robotic() && !robo_repair)
return
damage = max(damage - amount, 0)
/obj/item/organ/proc/robotize() //Being used to make robutt hearts, etc
status &= ~ORGAN_BROKEN
status &= ~ORGAN_SPLINTED