From 6a6e09b15cccd6b3709703e39e33404e12bfb7fb Mon Sep 17 00:00:00 2001
From: = <=>
Date: Mon, 30 Mar 2015 08:19:30 +1030
Subject: [PATCH] Updating the organ addition proc.

---
 code/datums/datumvars.dm | 30 ++++--------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index 5c0f282501a..34d89807bd0 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -865,31 +865,8 @@ client
 			usr << "Mob already has that organ."
 			return
 
-		if(istype(M,/mob/living/carbon/human))
-			var/mob/living/carbon/human/H = M
-			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
-
-			if(!organ_slot)
-				return
-
-			if(organ_slot != "default")
-				organ_slot = sanitize(copytext(organ_slot,1,MAX_MESSAGE_LEN))
-			else
-				organ_slot = "unknown organ"
-
-			if(H.internal_organs_by_name[organ_slot])
-				usr << "[H] already has an organ in that slot."
-				del(I)
-				return
-
-			H.internal_organs |= I
-			H.internal_organs_by_name[organ_slot] = I
-			usr << "Added new [new_organ] to [H] as slot [organ_slot]."
-		else
-			new new_organ(M)
-			usr << "Added new [new_organ] to [M]."
+		new new_organ(M)
+	
 
 	else if(href_list["remorgan"])
 		if(!check_rights(R_SPAWN))	return
@@ -899,7 +876,7 @@ client
 			usr << "This can only be done to instances of type /mob/living/carbon"
 			return
 
-		var/rem_organ = input("Please choose an organ to remove.","Organ",null) as null|anything in M.internal_organs
+		var/obj/item/organ/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"
@@ -910,6 +887,7 @@ client
 			return
 
 		usr << "Removed [rem_organ] from [M]."
+		rem_organ.removed()
 		del(rem_organ)
 
 	else if(href_list["fix_nano"])