Legion hearts stop beating when becoming inert

Also readded the statistical tracking that got taken out during the
dismemberment merge, I assume accidentally.
This commit is contained in:
Jack Edge
2016-05-21 13:23:58 +01:00
parent 3838037c97
commit dc5c609cf5
3 changed files with 18 additions and 5 deletions
@@ -77,7 +77,7 @@
name = "demon heart"
desc = "Still it beats furiously, emanating an aura of utter hate."
icon = 'icons/obj/surgery.dmi'
icon_state = "demon_heart"
icon_state = "demon_heart-on"
origin_tech = "combat=5;biotech=8"
/obj/item/organ/heart/demon/update_icon()
@@ -248,10 +248,15 @@
..()
spawn(2400)
if(!owner && !preserved)
inert = 1
desc = "The remains of a hivelord that have become useless, having been left alone too long after being harvested."
go_inert()
else
preserved = 1
preserved = TRUE
feedback_add_details("hivelord_core", "[src.type]|implanted")
/obj/item/organ/hivelord_core/proc/go_inert()
inert = TRUE
desc = "The remains of a hivelord that have become useless, having been left alone too long after being harvested."
feedback_add_details("hivelord_core", "[src.type]|inert")
/obj/item/organ/hivelord_core/ui_action_click()
var/spawn_amount = 1
@@ -295,8 +300,10 @@
return
if(H != user)
H.visible_message("[user] forces [H] to apply [src]... they quickly regenerate all injuries!")
feedback_add_details("hivelord_core","[src.type]|used|other")
else
user << "<span class='notice'>You start to smear [src] on yourself. It feels and smells disgusting, but you feel amazingly refreshed in mere moments.</span>"
feedback_add_details("hivelord_core","[src.type]|used|self")
H.revive(full_heal = 1)
qdel(src)
..()
@@ -832,7 +839,13 @@
name = "legion's heart"
desc = "A demonic, still beating heart... its healing properties will soon become inert if not used quickly."
icon = 'icons/obj/surgery.dmi'
icon_state = "demon_heart"
icon_state = "demon_heart-on"
/obj/item/organ/hivelord_core/legion/go_inert()
. = ..()
desc = "[src] has become inert, it beats no more and is useless for \
healing injures."
icon_state = "demon_heart-off"
/obj/item/weapon/legion_skull
name = "legion's head"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB