From 83d3e392aeaea4e2899b3a59878e387e08bef566 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Fri, 18 Mar 2016 20:40:54 -0400
Subject: [PATCH] Revert "OMG CONFLICT R GRIFFING ME HALP"

This reverts commit fd65c752bf1543e86827025f814884e15720a076.
---
 code/modules/surgery/organs/organ_internal.dm | 67 +++++--------------
 1 file changed, 16 insertions(+), 51 deletions(-)

diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 5ea3682a02f..abe2107821e 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -9,23 +9,20 @@
 	var/slot
 	vital = 0
 	var/organ_action_name = null
-	var/non_primary = 0
 
 /obj/item/organ/internal/New(var/mob/living/carbon/holder)
 	if(istype(holder))
 		insert(holder)
 	..()
 
-/obj/item/organ/internal/proc/insert(mob/living/carbon/M, special = 0, var/dont_remove_slot = 0)
+
+/obj/item/organ/internal/proc/insert(mob/living/carbon/M, special = 0)
 	if(!iscarbon(M) || owner == M)
 		return
 
 	var/obj/item/organ/internal/replaced = M.get_organ_slot(slot)
 	if(replaced)
-		if(dont_remove_slot)
-			non_primary = 1
-		else
-			replaced.remove(M, special = 1)
+		replaced.remove(M, special = 1)
 
 	owner = M
 
@@ -46,6 +43,7 @@
 
 /obj/item/organ/internal/remove(mob/living/carbon/M, special = 0)
 	owner = null
+
 	if(M)
 		M.internal_organs -= src
 		if(vital && !special)
@@ -126,64 +124,31 @@
 
 
 // Brain is defined in brain_item.dm.
-
 /obj/item/organ/internal/heart
 	name = "heart"
 	icon_state = "heart-on"
 	organ_tag = "heart"
 	parent_organ = "chest"
-	slot = "heart"
-	origin_tech = "biotech=3"
-	var/beating = 1
 	dead_icon = "heart-off"
-	var/icon_base = "heart"
+	vital = 1
+	var/beating = 0
 
 /obj/item/organ/internal/heart/update_icon()
 	if(beating)
-		icon_state = "[icon_base]-on"
+		icon_state = "heart-on"
 	else
-		icon_state = "[icon_base]-off"
-
-/obj/item/organ/internal/heart/remove(mob/living/carbon/M, special = 0)
-	..()
-	if(ishuman(M))
-		var/mob/living/carbon/human/H = M
-		if(H.stat == DEAD || H.heart_attack)
-			Stop()
-			return
-		if(!special)
-			H.heart_attack = 1
-
-	spawn(120)
-		if(!owner)
-			Stop()
-
-/obj/item/organ/internal/heart/attack_self(mob/user)
-	..()
-	if(!beating)
-		Restart()
-		spawn(80)
-			if(!owner)
-				Stop()
-
+		icon_state = "heart-off"
 
 /obj/item/organ/internal/heart/insert(mob/living/carbon/M, special = 0)
 	..()
-	if(ishuman(M) && beating)
-		var/mob/living/carbon/human/H = M
-		if(H.heart_attack)
-			H.heart_attack = 0
-			return
-
-/obj/item/organ/internal/heart/proc/Stop()
-	beating = 0
-	update_icon()
-	return 1
-
-/obj/item/organ/internal/heart/proc/Restart()
 	beating = 1
 	update_icon()
-	return 1
+
+/obj/item/organ/internal/heart/remove(mob/living/carbon/M, special = 0)
+	..()
+	spawn(120)
+		beating = 0
+		update_icon()
 
 /obj/item/organ/internal/heart/prepare_eat()
 	var/obj/S = ..()
@@ -381,7 +346,7 @@
 
 /obj/item/organ/internal/shadowtumor/New()
 	..()
-	processing_objects.Add(src)
+	processing_objects |= src
 
 /obj/item/organ/internal/shadowtumor/Destroy()
 	processing_objects.Remove(src)
@@ -414,7 +379,7 @@
 
 /obj/item/organ/internal/honktumor/New()
 	..()
-	processing_objects.Add(src)
+	processing_objects |= src
 
 /obj/item/organ/internal/honktumor/insert(mob/living/carbon/M, special = 0)
 	..()