Cloning no longer stops the heart

Also fixes a runtime regarding emptying an EMP'd clone pod
This commit is contained in:
Crazylemon64
2017-06-04 00:32:03 -07:00
parent e6b021a9fd
commit ca7a156c99
3 changed files with 11 additions and 3 deletions
+5 -1
View File
@@ -327,6 +327,10 @@ var/list/organ_cache = list()
/obj/item/organ/proc/replaced(var/mob/living/carbon/human/target)
return // Nothing uses this, it is always overridden
// A version of `replaced` that "flattens" the process of insertion, making organs "Plug'n'play"
// (Particularly the heart, which stops beating when removed)
/obj/item/organ/proc/safe_replace(var/mob/living/carbon/human/target)
replaced(target)
/obj/item/organ/proc/surgeryize()
return
@@ -370,4 +374,4 @@ I use this so that this can be made better once the organ overhaul rolls out --
// The only thing the official proc does is
//instantiate the list and call this proc
dna.deserialize(data["dna"])
..()
..()
@@ -170,6 +170,10 @@
if(!owner)
Stop()
/obj/item/organ/internal/heart/safe_replace(mob/living/carbon/human/target)
Restart()
..()
/obj/item/organ/internal/heart/proc/Stop()
beating = 0
update_icon()