Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.

code/datums/datacore.dm

@@ -155,7 +155,7 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 	temp = new /icon(icobase, "head_[g]")
 	preview_icon.Blend(temp, ICON_OVERLAY)
 
-	for(var/datum/organ/external/E in H.organs)
+	for(var/obj/item/organ/external/E in H.organs)
 		if(E.status & ORGAN_CUT_AWAY || E.status & ORGAN_DESTROYED) continue
 		temp = new /icon(icobase, "[E.name]")
 		if(E.status & ORGAN_ROBOT)

code/datums/datumvars.dm

@@ -865,7 +865,7 @@ client
 			usr << "This can only be done to instances of type /mob/living/carbon"
 			return
 
-		var/new_organ = input("Please choose an organ to add.","Organ",null) as null|anything in typesof(/datum/organ/internal)-/datum/organ/internal
+		var/new_organ = input("Please choose an organ to add.","Organ",null) as null|anything in typesof(/obj/item/organ)-/obj/item/organ
 		if(!new_organ) return
 
 		if(!M)
@@ -878,7 +878,7 @@ client
 
 		if(istype(M,/mob/living/carbon/human))
 			var/mob/living/carbon/human/H = M
-			var/datum/organ/internal/I = new new_organ(H)
+			var/obj/item/organ/I = new new_organ(H)
 
 			var/organ_slot = input(usr, "Which slot do you want the organ to go in ('default' for default)?")  as text|null
 
@@ -888,12 +888,7 @@ client
 			if(organ_slot != "default")
 				organ_slot = sanitize(copytext(organ_slot,1,MAX_MESSAGE_LEN))
 			else
-				if(I.removed_type)
-					var/obj/item/organ/O = new I.removed_type()
-					organ_slot = O.organ_tag
-					del(O)
-				else
-					organ_slot = "unknown organ"
+				organ_slot = "unknown organ"
 
 			if(H.internal_organs_by_name[organ_slot])
 				usr << "[H] already has an organ in that slot."

code/datums/diseases/appendicitis.dm

@@ -46,7 +46,7 @@
 			H << "\red Your abdomen is a world of pain!"
 			H.Weaken(10)
 
-			var/datum/organ/external/groin = H.get_organ("groin")
+			var/obj/item/organ/external/groin = H.get_organ("groin")
 			var/datum/wound/W = new /datum/wound/internal_bleeding(20)
 			H.adjustToxLoss(25)
 			groin.wounds += W

code/datums/mind.dm

@@ -72,7 +72,7 @@ datum/mind
 				current.remove_changeling_powers()
 				current.verbs -= /datum/changeling/proc/EvolutionMenu
 			current.mind = null
-			
+
 			nanomanager.user_transferred(current, new_character) // transfer active NanoUI instances to new user
 		if(new_character.mind)		//remove any mind currently in our new body's mind variable
 			new_character.mind.current = null
@@ -505,7 +505,7 @@ datum/mind
 			switch(href_list["implant"])
 				if("remove")
 					for(var/obj/item/weapon/implant/loyalty/I in H.contents)
-						for(var/datum/organ/external/organs in H.organs)
+						for(var/obj/item/organ/external/organs in H.organs)
 							if(I in organs.implants)
 								I.Del()
 								break