From de8c10e6c7c1a4e82d96468bc2cff820ab068836 Mon Sep 17 00:00:00 2001
From: PatchouliKnowledge <eredale@mail.ru>
Date: Wed, 5 Aug 2015 01:08:52 +0300
Subject: [PATCH] Merge conflicts pls go

---
 code/datums/diseases/appendicitis.dm | 4 ++--
 code/modules/surgery/appendectomy.dm | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/datums/diseases/appendicitis.dm b/code/datums/diseases/appendicitis.dm
index 288c580559b..cf71a660a34 100644
--- a/code/datums/diseases/appendicitis.dm
+++ b/code/datums/diseases/appendicitis.dm
@@ -12,7 +12,7 @@
 	disease_flags = CAN_CARRY|CAN_RESIST
 	spread_flags = NON_CONTAGIOUS
 	visibility_flags = HIDDEN_PANDEMIC
-	required_organs = list(/obj/item/organ/appendix)
+	required_organs = list(/obj/item/organ/internal/appendix)
 
 /datum/disease/appendicitis/stage_act()
 	..()
@@ -21,7 +21,7 @@
 			if(prob(5))
 				affected_mob.emote("cough")
 		if(2)
-			var/obj/item/organ/appendix/A = affected_mob.getorgan(/obj/item/organ/appendix)
+			var/obj/item/organ/internal/appendix/A = affected_mob.getorgan(/obj/item/organ/internal/appendix)
 			if(A)
 				A.inflamed = 1
 				A.update_icon()
diff --git a/code/modules/surgery/appendectomy.dm b/code/modules/surgery/appendectomy.dm
index 5e16f64a0c4..380e5173551 100644
--- a/code/modules/surgery/appendectomy.dm
+++ b/code/modules/surgery/appendectomy.dm
@@ -2,15 +2,15 @@
 	name = "appendectomy"
 	steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/incise, /datum/surgery_step/extract_appendix, /datum/surgery_step/close)
 	species = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
-	location = "groin"
-	requires_organic_chest = 1
+	possible_locs = list("groin")
 
 
 //extract appendix
 /datum/surgery_step/extract_appendix
+	name = "extract appendix"
 	accept_hand = 1
 	time = 64
-	var/obj/item/organ/appendix/A = null
+	var/obj/item/organ/internal/appendix/A = null
 
 /datum/surgery_step/extract_appendix/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	A = locate() in target.internal_organs
@@ -23,7 +23,7 @@
 	if(A)
 		user.visible_message("[user] successfully removes [target]'s appendix!", "<span class='notice'>You successfully removes [target]'s appendix.</span>")
 		A.loc = get_turf(target)
-		target.internal_organs -= A
+		A.Remove(target)
 		for(var/datum/disease/appendicitis in target.viruses)
 			appendicitis.cure()
 		target.resistances += /datum/disease/appendicitis