this shit dosen't even compile yet...

code/datums/datumvars.dm

@@ -1006,7 +1006,7 @@ client
 			usr << "This can only be done to instances of type /mob/living/carbon"
 			return
 
-		var/obj/item/organ/rem_organ = input("Please choose an organ to remove.","Organ",null) as null|anything in M.internal_organs
+		var/obj/item/organ/internal/rem_organ = input("Please choose an organ to remove.","Organ",null) as null|anything in M.internal_organs
 
 		if(!M)
 			usr << "Mob doesn't exist anymore"
@@ -1017,7 +1017,7 @@ client
 			return
 
 		usr << "Removed [rem_organ] from [M]."
-		rem_organ.removed()
+		rem_organ.Remove(M)
 		message_admins("[key_name_admin(usr)] has removed the organ [rem_organ] from [key_name_admin(M)]")
 		log_admin("[key_name(usr)] has removed the organ [rem_organ] from [key_name(M)]")
 		qdel(rem_organ)

code/datums/spells/inflict_handler.dm

@@ -28,9 +28,11 @@
 			if("gib_brain")
 				if(ishuman(target))
 					var/mob/living/carbon/C = target
-					if(C.brain_op_stage != 4) // Their brain is already taken out
-						var/obj/item/organ/brain/B = new(C.loc)
+					var/obj/item/organ/internal/brain/B = C_target.get_int_organ(/obj/item/organ/internal/brain)//do we has brains?
+					if(B)
+						B.loc = get_turf(C_target)
 						B.transfer_identity(C)
+						C_target.internal_organs -= B
 				target.gib()
 			if("disintegrate")
 				target.dust()

code/datums/spells/summonitem.dm

@@ -24,7 +24,7 @@
 		if(!marked_item) //linking item to the spell
 			message = "<span class='notice'>"
 			for(var/obj/item in hand_items)
-				if(istype(item, /obj/item/organ/brain)) //Yeah, sadly this doesn't work due to the organ system.
+				if(istype(item, /obj/item/organ/internal/brain)) //Yeah, sadly this doesn't work due to the organ system.
 					break
 				marked_item = 		item
 				message += "You mark [item] for recall.</span>"